From 1f994e96e6006cf43f98bd10708404ce9872cc69 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Sat, 24 Aug 2024 23:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E6=96=B0=E5=A2=9E&?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20#=201=E3=80=81=E4=BC=98=E5=8C=96/user/cent?= =?UTF-8?q?er=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=BF=99=E4=B8=AA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9C=81=E5=B8=82=E5=8C=BA=E5=92=8C?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=AD=89=E7=BA=A7=E5=AD=97=E6=AE=B5=202?= =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoutingInspectionOrderController.java | 1 + .../RoutingInspectionOrderServiceImpl.java | 5 ++ .../impl/SystemAuthAdminServiceImpl.java | 58 +++++++++++++++++++ .../hcy/admin/vo/largeData/LargeDataVo.java | 3 +- .../java/com/hcy/common/entity/user/User.java | 1 + .../java/com/hcy/common/enums/RoleEnum.java | 47 +++++++++++++++ .../com/hcy/common/enums/WarehouseEnum.java | 47 +++++++++++++++ .../client/impl/EquipmentServiceImpl.java | 2 +- .../front/service/impl/UserServiceImpl.java | 17 +++++- .../com/hcy/front/vo/user/UserCenterVo.java | 8 +++ .../com/hcy/front/vo/user/UserInfoVo.java | 1 + .../java/com/hcy/front/vo/user/UserVo.java | 1 + 12 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/com/hcy/common/enums/RoleEnum.java create mode 100644 common/src/main/java/com/hcy/common/enums/WarehouseEnum.java diff --git a/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java b/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java index c6390c7..e21cb90 100644 --- a/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java +++ b/admin/src/main/java/com/hcy/admin/controller/order/RoutingInspectionOrderController.java @@ -39,6 +39,7 @@ public class RoutingInspectionOrderController { PageResult list = iRoutingInspectionOrderService.list(pageParam, params); return AjaxResult.success(list); } + /** * 巡检订单详情 * diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java index 1f96640..0c51c14 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/order/impl/RoutingInspectionOrderServiceImpl.java @@ -345,4 +345,9 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde return formatDate + newOrderNo; } } + + //系统自动创建巡检单 + public void autoOrder(){ + + } } 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 24c7917..4b22bad 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 @@ -29,6 +29,9 @@ import com.hcy.common.entity.system.SystemAuthMenu; import com.hcy.common.entity.system.SystemAuthRole; import com.hcy.common.entity.user.User; import com.hcy.common.entity.user.UserAuth; +import com.hcy.common.entity.warehouse.Warehouse; +import com.hcy.common.enums.RoleEnum; +import com.hcy.common.enums.WarehouseEnum; import com.hcy.common.enums.user.SystemAuthRoleEnum; import com.hcy.common.enums.user.UserTypeEnum; import com.hcy.common.exception.OperateException; @@ -38,6 +41,7 @@ import com.hcy.common.mapper.system.SystemAuthMenuMapper; import com.hcy.common.mapper.system.SystemAuthRoleMapper; import com.hcy.common.mapper.user.UserAuthMapper; import com.hcy.common.mapper.user.UserMapper; +import com.hcy.common.mapper.warehouse.WarehouseMapper; import com.hcy.common.utils.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -83,6 +87,9 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { @Resource UserAuthMapper userAuthMapper; + @Resource + WarehouseMapper warehouseMapper; + /** * 根据账号查找管理员 * @@ -379,6 +386,57 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { model.setEmail(systemAuthAdminParam.getEmail()); model.setTechnicalGrade(systemAuthAdminParam.getTechnicalGrade()); systemAuthAdminMapper.insert(model); + //获取管理员id + Long adminId = model.getId().longValue(); + //新增用户的时候，角色是检修员或维修员，就在检修员仓库或者维修员仓库下新增一个仓库 + Integer role = Integer.valueOf(systemAuthAdminParam.getRole()); //获取角色 + Map regionMap = regionService.getRegionMap(); + String province = regionMap.get(model.getProvinceId()); + String city = regionMap.get(model.getCityId()); + String district = regionMap.get(model.getDistrictId()); + + if(role == RoleEnum.OVERHAUL_RESULT.getStatus()){ + Warehouse warehouse = new Warehouse(); + warehouse.setPid(Long.valueOf(WarehouseEnum.MAINTANCE_WAREHOUSE.getStatus())); //仓库上级id + warehouse.setWarehouseName(systemAuthAdminParam.getNickname()); //仓库名称 + warehouse.setWarehouseCoding(systemAuthAdminParam.getNickname() + "-" + systemAuthAdminParam.getPhone()); // 仓库编码 + warehouse.setWarehouseAddress(province + city + district); // 仓库地址 + warehouseMapper.insert(warehouse); + //获取仓库id + Long warehouseId = warehouse.getId().longValue(); + //获取小程序用户id + SystemAuthAdmin authAdmin = systemAuthAdminMapper.selectOne( + new QueryWrapper() + .eq("id", adminId) + .eq("is_delete", 0)); + User user= userMapper.selectOne( + new QueryWrapper() + .eq("id", authAdmin.getUserId()) + .eq("is_delete", 0)); + user.setWarehouseId(warehouseId); + userMapper.updateById(user);//绑定仓库 + + }else if(role == RoleEnum.MAINTENANCE_MAN.getStatus()){ + Warehouse warehouse = new Warehouse(); + warehouse.setPid(Long.valueOf(WarehouseEnum.REPAIR_WAREHOUSE.getStatus())); //仓库上级id + warehouse.setWarehouseName(systemAuthAdminParam.getNickname()); //仓库名称 + warehouse.setWarehouseCoding(systemAuthAdminParam.getNickname() + "-" + systemAuthAdminParam.getPhone()); // 仓库编码 + warehouse.setWarehouseAddress(province + city + district); // 仓库地址 + warehouseMapper.insert(warehouse); + //获取仓库id + Long warehouseId = warehouse.getId().longValue(); + //获取小程序用户id + SystemAuthAdmin authAdmin = systemAuthAdminMapper.selectOne( + new QueryWrapper() + .eq("id", adminId) + .eq("is_delete", 0)); + User user= userMapper.selectOne( + new QueryWrapper() + .eq("id", authAdmin.getUserId()) + .eq("is_delete", 0)); + user.setWarehouseId(warehouseId); + userMapper.updateById(user);//绑定仓库 + } } /** diff --git a/admin/src/main/java/com/hcy/admin/vo/largeData/LargeDataVo.java b/admin/src/main/java/com/hcy/admin/vo/largeData/LargeDataVo.java index 4256350..b6f27a9 100644 --- a/admin/src/main/java/com/hcy/admin/vo/largeData/LargeDataVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/largeData/LargeDataVo.java @@ -14,9 +14,8 @@ public class LargeDataVo implements Serializable { private Integer clientSum; //客户总数 private Integer equipmentSum; //设备总数 - private Integer orderSum; //工单总数 private Integer todayOrderSum; //今日工单总数 - + private Integer orderSum; //工单总数 private Integer doneOrderSum; //已完成订单数 private Integer underOverhaulOrderSum; //检修中订单数 private Integer underWarrantyOrderSum; //保修中订单数 diff --git a/common/src/main/java/com/hcy/common/entity/user/User.java b/common/src/main/java/com/hcy/common/entity/user/User.java index 672c792..b053edc 100644 --- a/common/src/main/java/com/hcy/common/entity/user/User.java +++ b/common/src/main/java/com/hcy/common/entity/user/User.java @@ -44,4 +44,5 @@ public class User implements Serializable { private Integer receiveOrderStatus; //接单状态（0=休假/停止接单中 1=作业中 2=可接单） private String longitude; // 经度 private String latitude; // 纬度 + private Long warehouseId; // 仓库id } diff --git a/common/src/main/java/com/hcy/common/enums/RoleEnum.java b/common/src/main/java/com/hcy/common/enums/RoleEnum.java new file mode 100644 index 0000000..ac18658 --- /dev/null +++ b/common/src/main/java/com/hcy/common/enums/RoleEnum.java @@ -0,0 +1,47 @@ +package com.hcy.common.enums; + +import com.google.common.collect.Maps; + +import java.util.Map; + +public enum RoleEnum { + // 角色名称： 6=检修员 7=维修员 + OVERHAUL_RESULT(6, "检修员"), + MAINTENANCE_MAN(7, "维修员"); + + private final int status; + private final String desc; + + RoleEnum(int status, String desc) { + this.status = status; + this.desc = desc; + } + + /** + * 获取状态码 + * + * @return Long + * @author fzr + */ + public int getStatus() { + return this.status; + } + + /** + * 获取提示 + * + * @return String + * @author fzr + */ + public String getDesc() { + return this.desc; + } + + public static Map getMap() { + Map map = Maps.newHashMap(); + for (RoleEnum codeEnum : RoleEnum.values()) { + map.put(codeEnum.status, codeEnum.desc); + } + return map; + } +} diff --git a/common/src/main/java/com/hcy/common/enums/WarehouseEnum.java b/common/src/main/java/com/hcy/common/enums/WarehouseEnum.java new file mode 100644 index 0000000..b04c874 --- /dev/null +++ b/common/src/main/java/com/hcy/common/enums/WarehouseEnum.java @@ -0,0 +1,47 @@ +package com.hcy.common.enums; + +import com.google.common.collect.Maps; + +import java.util.Map; + +public enum WarehouseEnum { + // 仓库名称：检修员仓、维修员仓 + MAINTANCE_WAREHOUSE(4, "检修员"), + REPAIR_WAREHOUSE(1, "维修员"); + + private final Integer status; + private final String desc; + + WarehouseEnum(Integer status, String desc) { + this.status = status; + this.desc = desc; + } + + /** + * 获取状态码 + * + * @return Long + * @author fzr + */ + public Integer getStatus() { + return this.status; + } + + /** + * 获取提示 + * + * @return String + * @author fzr + */ + public String getDesc() { + return this.desc; + } + + public static Map getMap() { + Map map = Maps.newHashMap(); + for (WarehouseEnum codeEnum : WarehouseEnum.values()) { + map.put(codeEnum.status, codeEnum.desc); + } + return map; + } +} diff --git a/front/src/main/java/com/hcy/front/service/client/impl/EquipmentServiceImpl.java b/front/src/main/java/com/hcy/front/service/client/impl/EquipmentServiceImpl.java index 7088298..34c1913 100644 --- a/front/src/main/java/com/hcy/front/service/client/impl/EquipmentServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/client/impl/EquipmentServiceImpl.java @@ -43,7 +43,7 @@ public class EquipmentServiceImpl implements IEquipmentService { * 设备管理详情 * * @author hcy - * @param id 主键参数 + * @param number 主键参数 * @return Equipment */ @Override diff --git a/front/src/main/java/com/hcy/front/service/impl/UserServiceImpl.java b/front/src/main/java/com/hcy/front/service/impl/UserServiceImpl.java index 567e2f7..7d0c496 100644 --- a/front/src/main/java/com/hcy/front/service/impl/UserServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/impl/UserServiceImpl.java @@ -31,6 +31,7 @@ import com.hcy.common.utils.*; import com.hcy.front.FrontThreadLocal; import com.hcy.front.config.FrontConfig; import com.hcy.front.service.IUserService; +import com.hcy.front.service.region.IDevRegionService; import com.hcy.front.validate.user.NewUserUpdateValidate; import com.hcy.front.validate.user.UserParam; import com.hcy.front.vo.user.UserCenterVo; @@ -71,6 +72,9 @@ public class UserServiceImpl extends ServiceImpl implements IU @Resource SystemAuthRoleMapper systemAuthRoleMapper; + @Resource + private IDevRegionService regionService; + /** * 个人中心 * @@ -96,7 +100,18 @@ public class UserServiceImpl extends ServiceImpl implements IU }else{ vo.setAvatar(UrlUtil.toAbsoluteUrl(user.getAvatar())); } - + //省市区和技术等级字段 + SystemAuthAdmin authAdmin = systemAuthAdminMapper.selectOne(new QueryWrapper() + .eq("user_id", userId) + .last("limit 1")); + vo.setProvinceId(authAdmin.getProvinceId()); + vo.setCityId(authAdmin.getCityId()); + vo.setDistrictId(authAdmin.getDistrictId()); + vo.setTechnicalGrade(authAdmin.getTechnicalGrade()); + Map regionMap = regionService.getRegionMap(); + vo.setProvince(regionMap.get(vo.getProvinceId())); + vo.setCity(regionMap.get(vo.getCityId())); + vo.setDistrict(regionMap.get(vo.getDistrictId())); //设置客户id ClientContacts clientContacts = clientContactsMapper.selectOne(new LambdaQueryWrapper() .eq(ClientContacts::getIsDelete, GlobalConstant.NOT_DELETE) diff --git a/front/src/main/java/com/hcy/front/vo/user/UserCenterVo.java b/front/src/main/java/com/hcy/front/vo/user/UserCenterVo.java index cb77f82..a4fc361 100644 --- a/front/src/main/java/com/hcy/front/vo/user/UserCenterVo.java +++ b/front/src/main/java/com/hcy/front/vo/user/UserCenterVo.java @@ -24,5 +24,13 @@ public class UserCenterVo implements Serializable { private Long clientId; //客户id private Map roleMap; //角色信息 key:id value:name private Integer receiveOrderStatus; //接单状态（0=休假/停止接单中 1=作业中 2=可接单） + private Long provinceId; //省id + private Long cityId; //市id + private Long districtId; //区id + private String province; //省 + private String city; //市 + private String district; //区 + private String technicalGrade; // 技术等级 + private Integer warehouseId; // 仓库id } diff --git a/front/src/main/java/com/hcy/front/vo/user/UserInfoVo.java b/front/src/main/java/com/hcy/front/vo/user/UserInfoVo.java index 7d17b93..da45e54 100644 --- a/front/src/main/java/com/hcy/front/vo/user/UserInfoVo.java +++ b/front/src/main/java/com/hcy/front/vo/user/UserInfoVo.java @@ -27,6 +27,7 @@ public class UserInfoVo implements Serializable { private String openid; private String createTime; private int integral; //积分 + private Integer warehouseId; // 仓库id public void setSex(Integer sex) { switch (sex) { diff --git a/front/src/main/java/com/hcy/front/vo/user/UserVo.java b/front/src/main/java/com/hcy/front/vo/user/UserVo.java index 99b3aaa..0366c28 100644 --- a/front/src/main/java/com/hcy/front/vo/user/UserVo.java +++ b/front/src/main/java/com/hcy/front/vo/user/UserVo.java @@ -51,6 +51,7 @@ public class UserVo implements Serializable { private String unBindTime; private String userNo; //分销用户编号 + private Integer warehouseId; // 仓库id public void setSex(Integer sex) { switch (sex) {