From 1d337b77e1c3820b5b96565331f968272bf4aa98 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Thu, 15 Aug 2024 17:20:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E6=96=B0=E5=A2=9E#?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E5=85=B3=E8=81=94=E5=AE=A2?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemConfigurationController.java | 56 +++++++++++++ .../equipment/EquipmentController.java | 17 +++- .../controller/plant/PlantController.java | 13 +++ .../ISystemConfigurationService.java | 33 ++++++++ .../impl/SystemConfigurationServiceImpl.java | 81 +++++++++++++++++++ .../service/equipment/IEquipmentService.java | 6 ++ .../equipment/impl/EquipmentServiceImpl.java | 21 ++++- .../admin/service/plant/IPlantService.java | 6 ++ .../service/plant/impl/PlantServiceImpl.java | 22 +++++ .../impl/SettingProtocolServiceImpl.java | 10 +-- .../impl/SystemAuthAdminServiceImpl.java | 27 +++++++ .../SystemConfigurationParam.java | 67 +++++++++++++++ .../validate/equipment/EquipmentParam.java | 2 +- .../validate/system/SystemAuthAdminParam.java | 6 ++ .../SystemConfigurationDetailVo.java | 27 +++++++ .../SystemConfigurationListVo.java | 27 +++++++ .../admin/vo/equipment/EquipmentDetailVo.java | 2 +- .../admin/vo/equipment/EquipmentListVo.java | 2 +- .../admin/vo/system/SystemAuthAdminVo.java | 10 +++ common/pom.xml | 4 + .../configuration/SystemConfiguration.java | 30 +++++++ .../common/entity/equipment/Equipment.java | 2 +- .../common/entity/system/SystemAuthAdmin.java | 5 ++ .../SystemConfigurationMapper.java | 12 +++ .../java/com/hcy/common/utils/QRCodeUtil.java | 1 - 25 files changed, 475 insertions(+), 14 deletions(-) create mode 100644 admin/src/main/java/com/hcy/admin/controller/configuration/SystemConfigurationController.java create mode 100644 admin/src/main/java/com/hcy/admin/service/configuration/ISystemConfigurationService.java create mode 100644 admin/src/main/java/com/hcy/admin/service/configuration/impl/SystemConfigurationServiceImpl.java create mode 100644 admin/src/main/java/com/hcy/admin/validate/configuration/SystemConfigurationParam.java create mode 100644 admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationDetailVo.java create mode 100644 admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationListVo.java create mode 100644 common/src/main/java/com/hcy/common/entity/configuration/SystemConfiguration.java create mode 100644 common/src/main/java/com/hcy/common/mapper/configuration/SystemConfigurationMapper.java diff --git a/admin/src/main/java/com/hcy/admin/controller/configuration/SystemConfigurationController.java b/admin/src/main/java/com/hcy/admin/controller/configuration/SystemConfigurationController.java new file mode 100644 index 0000000..e530104 --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/controller/configuration/SystemConfigurationController.java @@ -0,0 +1,56 @@ +package com.hcy.admin.controller.configuration; + +import com.hcy.admin.config.aop.Log; +import com.hcy.admin.service.configuration.ISystemConfigurationService; +import com.hcy.admin.validate.configuration.SystemConfigurationParam; +import com.hcy.admin.validate.common.PageParam; +import com.hcy.admin.vo.configuration.SystemConfigurationListVo; +import com.hcy.admin.vo.configuration.SystemConfigurationDetailVo; +import com.hcy.common.core.AjaxResult; +import com.hcy.common.core.PageResult; +import com.hcy.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * 系统配置管理管理 + */ +@RestController +@RequestMapping("api/configuration") +public class SystemConfigurationController { + + @Resource + ISystemConfigurationService iSystemConfigurationService; + + /** + * 系统配置管理详情 + * + * @author hcy + * @return Object + */ + @GetMapping("/detail") + public Object detail() { + SystemConfigurationDetailVo detail = iSystemConfigurationService.detail(); + return AjaxResult.success(detail); + } + + /** + * 系统配置管理编辑 + * + * @author hcy + * @param systemConfigurationParam 参数 + * @return Object + */ + @Log(title = "系统配置管理编辑") + @PostMapping("/edit") + public Object edit(@RequestBody SystemConfigurationParam systemConfigurationParam) { + iSystemConfigurationService.edit(systemConfigurationParam); + return AjaxResult.success(); + } + + + +} diff --git a/admin/src/main/java/com/hcy/admin/controller/equipment/EquipmentController.java b/admin/src/main/java/com/hcy/admin/controller/equipment/EquipmentController.java index 5306a4f..2d3707c 100644 --- a/admin/src/main/java/com/hcy/admin/controller/equipment/EquipmentController.java +++ b/admin/src/main/java/com/hcy/admin/controller/equipment/EquipmentController.java @@ -117,8 +117,23 @@ public class EquipmentController { * @param number * @throws IOException */ - @PostMapping("generate/v2") + @GetMapping("generate/v2") public String generateV2(String number) { + System.out.println(number); return QRCodeUtil.createQRCodeToOutputStream(number); } + + /** + * 关联客户 + * + * @author hcy + * @param equipmentParam 参数 + * @return Object + */ + @Log(title = "关联客户") + @PostMapping("/relevancyClient") + public Object relevancyClient(@RequestBody EquipmentParam equipmentParam) { + iEquipmentService.relevancyClient(equipmentParam); + return AjaxResult.success(); + } } diff --git a/admin/src/main/java/com/hcy/admin/controller/plant/PlantController.java b/admin/src/main/java/com/hcy/admin/controller/plant/PlantController.java index c1e01d8..3736335 100644 --- a/admin/src/main/java/com/hcy/admin/controller/plant/PlantController.java +++ b/admin/src/main/java/com/hcy/admin/controller/plant/PlantController.java @@ -13,6 +13,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -121,4 +122,16 @@ public class PlantController { iPlantService.plantUnbound(plantParam); return AjaxResult.success(); } + + /** + * 获取全部工厂 + * + * @author hcy + * @return Object + */ + @GetMapping("/allList") + public Object allList() { + List plantListVos = iPlantService.allList(); + return AjaxResult.success(plantListVos); + } } diff --git a/admin/src/main/java/com/hcy/admin/service/configuration/ISystemConfigurationService.java b/admin/src/main/java/com/hcy/admin/service/configuration/ISystemConfigurationService.java new file mode 100644 index 0000000..a136ade --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/service/configuration/ISystemConfigurationService.java @@ -0,0 +1,33 @@ +package com.hcy.admin.service.configuration; + +import com.hcy.admin.validate.common.PageParam; +import com.hcy.admin.validate.configuration.SystemConfigurationParam; +import com.hcy.admin.vo.configuration.SystemConfigurationListVo; +import com.hcy.admin.vo.configuration.SystemConfigurationDetailVo; +import com.hcy.common.core.PageResult; + +import java.util.Map; + +/** + * 系统配置管理服务接口类 + */ +public interface ISystemConfigurationService { + + + /** + * 系统配置管理详情 + * + * @author hcy + * @return SystemConfiguration + */ + SystemConfigurationDetailVo detail(); + + /** + * 系统配置管理编辑 + * + * @author hcy + * @param systemConfigurationParam 参数 + */ + void edit(SystemConfigurationParam systemConfigurationParam); + +} diff --git a/admin/src/main/java/com/hcy/admin/service/configuration/impl/SystemConfigurationServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/configuration/impl/SystemConfigurationServiceImpl.java new file mode 100644 index 0000000..38b6704 --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/service/configuration/impl/SystemConfigurationServiceImpl.java @@ -0,0 +1,81 @@ +package com.hcy.admin.service.configuration.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; +import com.hcy.admin.service.configuration.ISystemConfigurationService; +import com.hcy.admin.validate.common.PageParam; +import com.hcy.admin.validate.configuration.SystemConfigurationParam; +import com.hcy.admin.vo.configuration.SystemConfigurationListVo; +import com.hcy.admin.vo.configuration.SystemConfigurationDetailVo; +import com.hcy.common.core.PageResult; +import com.hcy.common.entity.configuration.SystemConfiguration; +import com.hcy.common.mapper.configuration.SystemConfigurationMapper; +import com.hcy.common.utils.ArrayUtil; +import com.hcy.common.utils.TimeUtil; +import com.hcy.common.utils.UrlUtil; +import com.hcy.common.config.GlobalConfig; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 系统配置管理实现类 + */ +@Service +public class SystemConfigurationServiceImpl implements ISystemConfigurationService { + + @Resource + SystemConfigurationMapper systemConfigurationMapper; + + /** + * 系统配置管理详情 + * + * @author hcy + * @return SystemConfiguration + */ + @Override + public SystemConfigurationDetailVo detail() { + SystemConfiguration model = systemConfigurationMapper.selectOne( + new QueryWrapper() + .eq("id", 1) + .last("limit 1")); + + SystemConfigurationDetailVo vo = new SystemConfigurationDetailVo(); + BeanUtils.copyProperties(model, vo); + return vo; + } + + /** + * 系统配置管理编辑 + * + * @author hcy + * @param systemConfigurationParam 参数 + */ + @Override + public void edit(SystemConfigurationParam systemConfigurationParam) { + SystemConfiguration model = systemConfigurationMapper.selectOne( + new QueryWrapper() + .eq("id", 1) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setRepairerLocation(systemConfigurationParam.getRepairerLocation()); + model.setRepairerMaxMileage(systemConfigurationParam.getRepairerMaxMileage()); + model.setRepairerAutoOrderTime(systemConfigurationParam.getRepairerAutoOrderTime()); + model.setRepairerRemind(systemConfigurationParam.getRepairerRemind()); + model.setRepairerCommissionRate(systemConfigurationParam.getRepairerCommissionRate()); + model.setMaintenanceLocation(systemConfigurationParam.getMaintenanceLocation()); + model.setMaintenanceMaxMileage(systemConfigurationParam.getMaintenanceMaxMileage()); + model.setMaintenanceAutoOrderTime(systemConfigurationParam.getMaintenanceAutoOrderTime()); + model.setMaintenanceRemind(systemConfigurationParam.getMaintenanceRemind()); + model.setMaintenanceCommissionRate(systemConfigurationParam.getMaintenanceCommissionRate()); + systemConfigurationMapper.updateById(model); + } + +} diff --git a/admin/src/main/java/com/hcy/admin/service/equipment/IEquipmentService.java b/admin/src/main/java/com/hcy/admin/service/equipment/IEquipmentService.java index 52bbaed..49c6803 100644 --- a/admin/src/main/java/com/hcy/admin/service/equipment/IEquipmentService.java +++ b/admin/src/main/java/com/hcy/admin/service/equipment/IEquipmentService.java @@ -62,4 +62,10 @@ public interface IEquipmentService { * @param ids */ void stateEdit(List ids); + + /** + * 关联客户 + * @param equipmentParam + */ + void relevancyClient(EquipmentParam equipmentParam); } diff --git a/admin/src/main/java/com/hcy/admin/service/equipment/impl/EquipmentServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/equipment/impl/EquipmentServiceImpl.java index d5c2c9f..e0b6070 100644 --- a/admin/src/main/java/com/hcy/admin/service/equipment/impl/EquipmentServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/equipment/impl/EquipmentServiceImpl.java @@ -142,7 +142,7 @@ public class EquipmentServiceImpl implements IEquipmentService { Assert.notNull(model, "数据不存在!"); model.setId(equipmentParam.getId()); - model.setUserId(equipmentParam.getUserId()); + model.setClientId(equipmentParam.getClientId()); model.setModuleId(equipmentParam.getModuleId()); model.setNumber(equipmentParam.getNumber()); model.setName(equipmentParam.getName()); @@ -210,4 +210,23 @@ public class EquipmentServiceImpl implements IEquipmentService { } + /** + * 关联客户 + * + * @param equipmentParam + */ + @Override + public void relevancyClient(EquipmentParam equipmentParam) { + Equipment model = equipmentMapper.selectOne( + new QueryWrapper() + .eq("id", equipmentParam.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + model.setClientId(equipmentParam.getClientId());//用户id + model.setUpdateTime(System.currentTimeMillis() / 1000); + equipmentMapper.updateById(model); + } + } diff --git a/admin/src/main/java/com/hcy/admin/service/plant/IPlantService.java b/admin/src/main/java/com/hcy/admin/service/plant/IPlantService.java index 62f0ddf..ffea96e 100644 --- a/admin/src/main/java/com/hcy/admin/service/plant/IPlantService.java +++ b/admin/src/main/java/com/hcy/admin/service/plant/IPlantService.java @@ -68,4 +68,10 @@ public interface IPlantService { * @param plantParam */ void plantUnbound(PlantParam plantParam); + + /** + * 获取全部工厂 + * @return + */ + List allList(); } diff --git a/admin/src/main/java/com/hcy/admin/service/plant/impl/PlantServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/plant/impl/PlantServiceImpl.java index 45cd20d..0e443cc 100644 --- a/admin/src/main/java/com/hcy/admin/service/plant/impl/PlantServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/plant/impl/PlantServiceImpl.java @@ -292,4 +292,26 @@ public class PlantServiceImpl implements IPlantService { plantMapper.updateById(model); } + /** + * 获取全部工厂 + * + * @return + */ + @Override + public List allList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + + List plants = plantMapper.selectList(queryWrapper); + List list = new LinkedList<>(); + for(Plant item : plants) { + PlantListVo vo = new PlantListVo(); + BeanUtils.copyProperties(item, vo); + list.add(vo); + } + + return list; + } + } diff --git a/admin/src/main/java/com/hcy/admin/service/setting/impl/SettingProtocolServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/setting/impl/SettingProtocolServiceImpl.java index 9d255e2..28734ca 100644 --- a/admin/src/main/java/com/hcy/admin/service/setting/impl/SettingProtocolServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/setting/impl/SettingProtocolServiceImpl.java @@ -23,12 +23,9 @@ public class SettingProtocolServiceImpl implements ISettingProtocolService { */ @Override public Map> detail() { - String service = ConfigUtil.get("protocol", "service", "{\"name\":\"\",\"content\":\"\"}"); - String privacy = ConfigUtil.get("protocol", "privacy", "{\"name\":\"\",\"content\":\"\"}"); - + String contract = ConfigUtil.get("protocol", "contract", "{\"name\":\"\",\"content\":\"\"}"); Map> map = new LinkedHashMap<>(); - map.put("service", ToolsUtil.jsonToMap(service)); - map.put("privacy", ToolsUtil.jsonToMap(privacy)); + map.put("contract", ToolsUtil.jsonToMap(contract)); return map; } @@ -40,8 +37,7 @@ public class SettingProtocolServiceImpl implements ISettingProtocolService { */ @Override public void save(Map params) { - ConfigUtil.set("protocol","service", JSON.toJSONString(params.get("service"))); - ConfigUtil.set("protocol","privacy", JSON.toJSONString(params.get("privacy"))); + ConfigUtil.set("protocol","contract", JSON.toJSONString(params.get("contract"))); } } diff --git a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java index 88d772c..8e9c12e 100644 --- a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -10,6 +10,7 @@ import com.github.yulichang.query.MPJQueryWrapper; import com.google.common.collect.Lists; import com.hcy.admin.AdminThreadLocal; import com.hcy.admin.config.AdminConfig; +import com.hcy.admin.service.region.IDevRegionService; import com.hcy.admin.service.system.ISystemAuthAdminService; import com.hcy.admin.service.system.ISystemAuthPermService; import com.hcy.admin.service.system.ISystemAuthRoleService; @@ -57,6 +58,9 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { @Resource PlantMapper plantMapper; + @Resource + IDevRegionService regionService; + /** * 根据账号查找管理员 * @@ -251,6 +255,19 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); + Plant model = plantMapper.selectOne( + new QueryWrapper() + .eq("id", sysAdmin.getPlantId()) + .eq("is_delete", 0) + .last("limit 1")); + if(model != null){ + vo.setPlantName(model.getName()); //工厂名 + } + + Map regionMap = regionService.getRegionMap(); + vo.setProvince(regionMap.get(sysAdmin.getProvinceId())); + vo.setCity(regionMap.get(sysAdmin.getCityId())); + vo.setDistrict(regionMap.get(sysAdmin.getDistrictId())); return vo; } @@ -295,6 +312,11 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { model.setPassword(pwd); model.setSalt(salt); model.setSort(systemAuthAdminParam.getSort()); + model.setPhone(systemAuthAdminParam.getPhone()); + model.setPlantId(systemAuthAdminParam.getPlantId()); + model.setProvinceId(systemAuthAdminParam.getProvinceId()); + model.setCityId(systemAuthAdminParam.getCityId()); + model.setDistrictId(systemAuthAdminParam.getDistrictId()); model.setIsMultipoint(systemAuthAdminParam.getIsMultipoint()); model.setIsDisable(systemAuthAdminParam.getIsDisable()); model.setCreateTime(System.currentTimeMillis() / 1000); @@ -344,6 +366,11 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { model.setAvatar(UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar())); model.setRole(systemAuthAdminParam.getId() == 1 ? 0 : systemAuthAdminParam.getRole()); model.setSort(systemAuthAdminParam.getSort()); + model.setPhone(systemAuthAdminParam.getPhone()); + model.setPlantId(systemAuthAdminParam.getPlantId()); + model.setProvinceId(systemAuthAdminParam.getProvinceId()); + model.setCityId(systemAuthAdminParam.getCityId()); + model.setDistrictId(systemAuthAdminParam.getDistrictId()); model.setIsMultipoint(systemAuthAdminParam.getIsMultipoint()); model.setIsDisable(systemAuthAdminParam.getIsDisable()); model.setUpdateTime(System.currentTimeMillis() / 1000); diff --git a/admin/src/main/java/com/hcy/admin/validate/configuration/SystemConfigurationParam.java b/admin/src/main/java/com/hcy/admin/validate/configuration/SystemConfigurationParam.java new file mode 100644 index 0000000..95b0d7d --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/validate/configuration/SystemConfigurationParam.java @@ -0,0 +1,67 @@ +package com.hcy.admin.validate.configuration; + + +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import lombok.Data; +import javax.validation.constraints.*; +import java.io.Serializable; + +/** + * 系统配置管理参数 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class SystemConfigurationParam implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface create{} + public interface update{} + public interface delete{} + + private Long id; + + @NotNull(message = "repairerLocation参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "repairerLocation参数值不能少于0", groups = {create.class, update.class}) + private Integer repairerLocation; + + @NotNull(message = "repairerMaxMileage参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "repairerMaxMileage参数值不能少于0", groups = {create.class, update.class}) + private Integer repairerMaxMileage; + + @NotNull(message = "repairerAutoOrderTime参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "repairerAutoOrderTime参数值不能少于0", groups = {create.class, update.class}) + private Integer repairerAutoOrderTime; + + @NotNull(message = "repairerRemind参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "repairerRemind参数值不能少于0", groups = {create.class, update.class}) + private Integer repairerRemind; + + @NotNull(message = "repairerCommissionRate参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "repairerCommissionRate参数值不能少于0", groups = {create.class, update.class}) + private Integer repairerCommissionRate; + + @NotNull(message = "maintenanceLocation参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "maintenanceLocation参数值不能少于0", groups = {create.class, update.class}) + private Integer maintenanceLocation; + + @NotNull(message = "maintenanceMaxMileage参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "maintenanceMaxMileage参数值不能少于0", groups = {create.class, update.class}) + private Integer maintenanceMaxMileage; + + @NotNull(message = "maintenanceAutoOrderTime参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "maintenanceAutoOrderTime参数值不能少于0", groups = {create.class, update.class}) + private Integer maintenanceAutoOrderTime; + + @NotNull(message = "maintenanceRemind参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "maintenanceRemind参数值不能少于0", groups = {create.class, update.class}) + private Integer maintenanceRemind; + + @NotNull(message = "maintenanceCommissionRate参数缺失", groups = {create.class, update.class}) + @DecimalMin(value = "0", message = "maintenanceCommissionRate参数值不能少于0", groups = {create.class, update.class}) + private Integer maintenanceCommissionRate; + +} diff --git a/admin/src/main/java/com/hcy/admin/validate/equipment/EquipmentParam.java b/admin/src/main/java/com/hcy/admin/validate/equipment/EquipmentParam.java index 9ad6840..8a92fe4 100644 --- a/admin/src/main/java/com/hcy/admin/validate/equipment/EquipmentParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/equipment/EquipmentParam.java @@ -27,7 +27,7 @@ public class EquipmentParam implements Serializable { private Long id; @DecimalMin(value = "0", message = "userId参数值不能少于0", groups = {create.class, update.class}) - private Long userId; + private Long clientId; @DecimalMin(value = "0", message = "moduleId参数值不能少于0", groups = {create.class, update.class}) private Long moduleId; diff --git a/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java b/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java index 9c86830..fb83ef2 100644 --- a/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/system/SystemAuthAdminParam.java @@ -68,4 +68,10 @@ public class SystemAuthAdminParam implements Serializable { private String avatar = ""; + private String phone; // 联系电话 + private Integer plantId; // 管辖工厂 + private Long provinceId; //省id + private Long cityId; //市id + private Long districtId; //区id + } diff --git a/admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationDetailVo.java new file mode 100644 index 0000000..6b9bce1 --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationDetailVo.java @@ -0,0 +1,27 @@ +package com.hcy.admin.vo.configuration; + +import lombok.Data; + +import java.io.Serializable; + +/** + * SystemConfigurationVo + */ +@Data +public class SystemConfigurationDetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; // 主键id + private Integer repairerLocation; // 检修员位置（每隔几分钟刷新） + private Integer repairerMaxMileage; // 检修员自动抢单最大公里数（公里） + private Integer repairerAutoOrderTime; // 检修员自动抢单时间（分钟） + private Integer repairerRemind; // 检修员系统提醒客服（0=开启，1=关闭） + private Integer repairerCommissionRate; // 检修员提成比例 + private Integer maintenanceLocation; // 维修员位置（每隔几分钟刷新） + private Integer maintenanceMaxMileage; // 维修员自动抢单最大公里数（公里） + private Integer maintenanceAutoOrderTime; // 维修员自动抢单时间（分钟） + private Integer maintenanceRemind; // 维修员系统提现客服（0=开启，1-关闭） + private Integer maintenanceCommissionRate; // 维修员提成比例 + +} diff --git a/admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationListVo.java b/admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationListVo.java new file mode 100644 index 0000000..1d2021a --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/vo/configuration/SystemConfigurationListVo.java @@ -0,0 +1,27 @@ +package com.hcy.admin.vo.configuration; + +import lombok.Data; + +import java.io.Serializable; + +/** + * SystemConfigurationVo + */ +@Data +public class SystemConfigurationListVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; // 主键id + private Integer repairerLocation; // 检修员位置（每隔几分钟刷新） + private Integer repairerMaxMileage; // 检修员自动抢单最大公里数（公里） + private Integer repairerAutoOrderTime; // 检修员自动抢单时间（分钟） + private Integer repairerRemind; // 检修员系统提醒客服（0=开启，1=关闭） + private Integer repairerCommissionRate; // 检修员提成比例 + private Integer maintenanceLocation; // 维修员位置（每隔几分钟刷新） + private Integer maintenanceMaxMileage; // 维修员自动抢单最大公里数（公里） + private Integer maintenanceAutoOrderTime; // 维修员自动抢单时间（分钟） + private Integer maintenanceRemind; // 维修员系统提现客服（0=开启，1-关闭） + private Integer maintenanceCommissionRate; // 维修员提成比例 + +} diff --git a/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentDetailVo.java index bc63d35..f6026c3 100644 --- a/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentDetailVo.java @@ -13,7 +13,7 @@ public class EquipmentDetailVo implements Serializable { private static final long serialVersionUID = 1L; private Long id; // 主键id - private Long userId; // 用户id + private Long clientId; // 用户id private Long moduleId; // 模块id private String number; // 设备编号 private String name; // 设备名称 diff --git a/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentListVo.java b/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentListVo.java index 92a623e..d815eb6 100644 --- a/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/equipment/EquipmentListVo.java @@ -13,7 +13,7 @@ public class EquipmentListVo implements Serializable { private static final long serialVersionUID = 1L; private Long id; // 主键id - private Long userId; // 用户id + private Long clientId; // 用户id private Long moduleId; // 模块id private String number; // 设备编号 private String name; // 设备名称 diff --git a/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java b/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java index 8ef2e31..29683ef 100644 --- a/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/system/SystemAuthAdminVo.java @@ -20,6 +20,14 @@ public class SystemAuthAdminVo implements Serializable { private String avatar; // 头像 private String dept; // 部门 private String role; // 角色 + private String phone; // 联系电话 + private Integer plantId; // 管辖工厂 + private Long provinceId; //省id + private Long cityId; //市id + private Long districtId; //区id + private String province; //省 + private String city; //市 + private String district; //区 private Integer isMultipoint; // 多端登录: [0=否, 1=是] private Integer isDisable; // 是否禁用: [0=否, 1=是] private String lastLoginIp; // 最后登录IP @@ -27,4 +35,6 @@ public class SystemAuthAdminVo implements Serializable { private String createTime; // 创建时间 private String updateTime; // 更新时间 + private String plantName; //工厂名 + } diff --git a/common/pom.xml b/common/pom.xml index b9539d1..e45fb63 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -263,6 +263,10 @@ hutool-all 5.2.5 + + org.apache.tomcat.embed + tomcat-embed-core + diff --git a/common/src/main/java/com/hcy/common/entity/configuration/SystemConfiguration.java b/common/src/main/java/com/hcy/common/entity/configuration/SystemConfiguration.java new file mode 100644 index 0000000..e9d1b89 --- /dev/null +++ b/common/src/main/java/com/hcy/common/entity/configuration/SystemConfiguration.java @@ -0,0 +1,30 @@ +package com.hcy.common.entity.configuration; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统配置管理实体 + */ +@Data +public class SystemConfiguration implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + private Long id; // 主键id + private Integer repairerLocation; // 检修员位置（每隔几分钟刷新） + private Integer repairerMaxMileage; // 检修员自动抢单最大公里数（公里） + private Integer repairerAutoOrderTime; // 检修员自动抢单时间（分钟） + private Integer repairerRemind; // 检修员系统提醒客服（0=开启，1=关闭） + private Integer repairerCommissionRate; // 检修员提成比例 + private Integer maintenanceLocation; // 维修员位置（每隔几分钟刷新） + private Integer maintenanceMaxMileage; // 维修员自动抢单最大公里数（公里） + private Integer maintenanceAutoOrderTime; // 维修员自动抢单时间（分钟） + private Integer maintenanceRemind; // 维修员系统提现客服（0=开启，1-关闭） + private Integer maintenanceCommissionRate; // 维修员提成比例 + +} \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/entity/equipment/Equipment.java b/common/src/main/java/com/hcy/common/entity/equipment/Equipment.java index e1659dd..629f2c2 100644 --- a/common/src/main/java/com/hcy/common/entity/equipment/Equipment.java +++ b/common/src/main/java/com/hcy/common/entity/equipment/Equipment.java @@ -16,7 +16,7 @@ public class Equipment implements Serializable { @TableId(value="id", type= IdType.AUTO) private Long id; // 主键id - private Long userId; // 用户id + private Long clientId; // 用户id private Long moduleId; // 模块id private String number; // 设备编号 private String name; // 设备名称 diff --git a/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java b/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java index bc4a190..9ef1ee7 100644 --- a/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java +++ b/common/src/main/java/com/hcy/common/entity/system/SystemAuthAdmin.java @@ -25,6 +25,11 @@ public class SystemAuthAdmin implements Serializable { private String salt; // 角色主键 private Integer role; // 加密盐巴 private Integer sort; // 排序编号 + private String phone; // 联系电话 + private Integer plantId; // 管辖工厂 + private Long provinceId; //省id + private Long cityId; //市id + private Long districtId; //区id private Integer isMultipoint; // 多端登录: [0=否, 1=是] private Integer isDisable; // 是否禁用: [0=否, 1=是] private Integer isDelete; // 是否删除: [0=否, 1=是] diff --git a/common/src/main/java/com/hcy/common/mapper/configuration/SystemConfigurationMapper.java b/common/src/main/java/com/hcy/common/mapper/configuration/SystemConfigurationMapper.java new file mode 100644 index 0000000..462f857 --- /dev/null +++ b/common/src/main/java/com/hcy/common/mapper/configuration/SystemConfigurationMapper.java @@ -0,0 +1,12 @@ +package com.hcy.common.mapper.configuration; + +import com.hcy.common.core.basics.IBaseMapper; +import com.hcy.common.entity.configuration.SystemConfiguration; +import org.apache.ibatis.annotations.Mapper; + +/** + * 系统配置管理Mapper + */ +@Mapper +public interface SystemConfigurationMapper extends IBaseMapper { +} diff --git a/common/src/main/java/com/hcy/common/utils/QRCodeUtil.java b/common/src/main/java/com/hcy/common/utils/QRCodeUtil.java index b91ea0d..102a481 100644 --- a/common/src/main/java/com/hcy/common/utils/QRCodeUtil.java +++ b/common/src/main/java/com/hcy/common/utils/QRCodeUtil.java @@ -77,7 +77,6 @@ public class QRCodeUtil { /** * 生成QRCode并输出到输出流，通常用于输出到网页上进行显示 * @param content 二维码内容 - * @param outputStream 输出流 */ public static String createQRCodeToOutputStream(String content) { if (ObjectUtils.isEmpty(content)) {