bug修复及优化

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/PlanController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.demo.entity.AddrCategory;
 import com.ruoyi.demo.entity.bo.CallBackBean;
 import com.ruoyi.demo.entity.bo.PlanAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
@@ -143,7 +144,7 @@ public class PlanController {
     }
     // 下拉框——获取省市区地区码
     @GetMapping("/getAddrCategory")
-    public R getAddrCategory(){
-        return R.ok(planService.getAddrCategory());
+    public R getAddrCategory(String code,String level){
+        return R.ok(planService.getAddrCategoryLevel(code,level));
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Equipment.java

@@ -54,6 +54,7 @@ public class Equipment {
 
     public Equipment(EquipmentVo equipmentVo) {
         this.equipmentName = equipmentVo.getEquipmentName();
+        this.equipmentCode = equipmentVo.getEquipmentCode();
         this.addrInfo = equipmentVo.getAddrInfo();
         this.addrCode = equipmentVo.getAddrCode();
         this.lat = equipmentVo.getLat();

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/EquipmentBo.java

@@ -9,13 +9,14 @@ import java.time.LocalDateTime;
 public class EquipmentBo {
     private String equipmentId;
     private String equipmentName;
+    private String equipmentCode;
     private String addrInfo;
     private String addrCode;
     private String addrCodeInfo;
     private BigDecimal lat;
     private BigDecimal lng;
-    private String state;
-    private String onState;
+    private Integer state;
+    private Integer onState;
     private Integer planCounnt;
     private String storeId;
     private String manufacturers;
@@ -29,10 +30,13 @@ public class EquipmentBo {
     public EquipmentBo(Equipment equipment) {
         this.equipmentId = equipment.getEquipmentId();
         this.equipmentName = equipment.getEquipmentName();
+        this.equipmentCode = equipment.getEquipmentCode();
         this.addrInfo = equipment.getAddrInfo();
         this.addrCode = equipment.getAddrCode();
         this.lat = equipment.getLat();
         this.lng = equipment.getLng();
+        this.state = equipment.getState();
+        this.onState = equipment.getOnState();
         this.storeId = equipment.getStoreId();
         this.manufacturers = equipment.getManufacturers();
         this.maintainName = equipment.getMaintainName();

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/AppVo.java

@@ -12,23 +12,23 @@ import java.time.LocalDateTime;
 
 @Data
 public class AppVo {
-    @NotBlank(groups = {EditGroup.class, QueryGroup.class})
+    @NotBlank(groups = {EditGroup.class, QueryGroup.class},message = "appkey不能为空")
     private String appkey;
 
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "appLogo不能为空")
     private String appLogo;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "app名称不能为空")
     private String appName;
     private String appIntroduce;
 
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "commercialId不能为空")
     private String commercialId;
 
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "商户名称不能为空")
     private String commercialName;
 
     private Integer state;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "回调地址不能为空")
     private String callBack;
     private String appSecret;
     private String prove1;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/EquipmentVo.java

@@ -13,23 +13,23 @@ import java.time.LocalDateTime;
 
 @Data
 public class EquipmentVo {
-    @NotBlank(groups = {EditGroup.class, QueryGroup.class})
+    @NotBlank(groups = {EditGroup.class, QueryGroup.class},message = "equipmentId不能为空")
     private String equipmentId;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "设备名称不能为空")
     private String equipmentName;
 
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "设备编码不能为空")
     private String equipmentCode;
 
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "地址信息不能为空")
     private String addrInfo;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "addrCode不能为空")
     private String addrCode;
     private String addrCodeInfo;
 
     private BigDecimal lat;
     private BigDecimal lng;
-    @NotNull(groups = {AddGroup.class, EditGroup.class})
+    @NotNull(groups = {AddGroup.class, EditGroup.class},message = "状态设置不能为空")
     private Integer state;
     private Integer onState;
     private String storeId;
@@ -40,9 +40,9 @@ public class EquipmentVo {
     private int pageNum = 1;
     private int pageSize = 10;
 
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "维护人员不能为空")
     private String maintainName;
-    @NotBlank(groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "维护人员联系方式不能为空")
     private String maintainTelephone;
     private LocalDateTime enterTime;
     private LocalDateTime updateTime;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanItemVo.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 
 @Data
 public class PlanItemVo {
-    @NotBlank(groups = {EditGroup.class})
+    @NotBlank(groups = {EditGroup.class},message = "itemId不能为空")
     private String itemId;
     private String equipmentId;
     private String equipmentName;
@@ -18,7 +18,7 @@ public class PlanItemVo {
     private String addrCode;
     private String addrCodeInfo;
     private String qrCode;
-    @NotNull(groups = {EditGroup.class})
+    @NotNull(groups = {EditGroup.class},message = "排序不能为空")
     private Integer sort;
 
     public PlanItemVo(){}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/StoreVo.java

@@ -12,13 +12,13 @@ import java.time.LocalDateTime;
 
 @Data
 public class StoreVo {
-    @NotBlank(groups={EditGroup.class})
+    @NotBlank(groups={EditGroup.class},message = "storeId不能为空")
     private String storeId;
-    @NotBlank(groups={AddGroup.class, EditGroup.class})
+    @NotBlank(groups={AddGroup.class, EditGroup.class},message = "店铺名称不能为空")
     private String storeName;
-    @NotBlank(groups={AddGroup.class, EditGroup.class})
+    @NotBlank(groups={AddGroup.class, EditGroup.class},message = "地区信息不能为空")
     private String addrInfo;
-    @NotBlank(groups={AddGroup.class, EditGroup.class})
+    @NotBlank(groups={AddGroup.class, EditGroup.class},message = "addrCode不能为空")
     private String addrCode;
     private String addrCodeInfo;
 
@@ -32,9 +32,9 @@ public class StoreVo {
     private int pageNum = 1;
     private int pageSize = 10;
 
-    @NotBlank(groups={AddGroup.class, EditGroup.class})
+    @NotBlank(groups={AddGroup.class, EditGroup.class},message = "principalName不能为空")
     private String principalName;
-    @NotBlank(groups={AddGroup.class, EditGroup.class})
+    @NotBlank(groups={AddGroup.class, EditGroup.class},message = "principalTelephone不能为空")
     private String principalTelephone;
 
 

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/PlanItemMapper.java

@@ -16,5 +16,5 @@ public interface PlanItemMapper extends BaseMapper<PlanItem> {
 
     IPage<PlanItemBo> getEuipmentPlanList(IPage<?> pag, @Param(Constants.WRAPPER) Wrapper<PlanItemBo> queryWrapper);
 
-    Integer getEuipmentPlanCont(QueryWrapper<PlanItemBo> queryWrapper);
+    Integer getEuipmentPlanCont(@Param(Constants.WRAPPER) QueryWrapper<PlanItemBo> queryWrapper);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/PlanService.java

@@ -26,7 +26,7 @@ public interface PlanService {
     PageInfo<List<PlanPushListVo>> getPlanPushList(PlanBo bo);
     PageInfo<List<PlanPushStatisticsListVo>> getPlanPushStatisticsList(PlanBo bo);
     PlanHomeVo getPlanTotal();
-
+    List<AddrCategory> getAddrCategoryLevel(String code,String level);
     List<AddrCategory> getAddrCategory();
     PageInfo<List<Equipment>> getEquipments(PlanBo bo);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -156,8 +156,6 @@ public class EquipmentServiceImpl implements EquipmentService {
     public EquipmentBo getEquipment(String equipmentId) {
         Equipment equipment = equipmentMapper.selectById(equipmentId);
         EquipmentBo equipmentBo = new EquipmentBo(equipment);
-        equipmentBo.setState(equipmentStateMap.get(equipment.getState()));
-        equipmentBo.setOnState(equipmentOnStateMap.get(equipment.getOnState()));
         return equipmentBo;
     }
 
@@ -298,30 +296,33 @@ public class EquipmentServiceImpl implements EquipmentService {
         List<String> collect = equipmentPage.getRecords().stream().map(item -> {
             return item.getEquipmentId();
         }).collect(Collectors.toList());
-        QueryWrapper<PlanItem> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.select("equipment_id","count(*) as sort");
-        queryWrapper1.in("equipment_id",collect);
-        queryWrapper1.groupBy("equipment_id");
-        List<PlanItem> planItems = planItemMapper.selectList(queryWrapper1);
-        HashMap<String, Integer> hashMap = new HashMap<>();
-        for (PlanItem planItem : planItems) {
-            hashMap.put(planItem.getEquipmentId(),planItem.getSort());
-        }
 
-        //组装
+        HashMap<String, Integer> hashMap = new HashMap<>();
         List<EquipmentBo> result = new ArrayList<>();
-        for (Equipment equipment1 : equipmentPage.getRecords()) {
-            EquipmentBo equipmentBo = new EquipmentBo(equipment1);
-            equipmentBo.setState(equipmentStateMap.get(equipment1.getState()));
-            equipmentBo.setOnState(equipmentOnStateMap.get(equipment1.getOnState()));
-            Integer integer = hashMap.get(equipmentBo.getEquipmentId());
-            if (integer == null){
-                equipmentBo.setPlanCounnt(0);
-            }else {
-                equipmentBo.setPlanCounnt(integer);
+        if(!collect.isEmpty()){
+            QueryWrapper<PlanItem> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.select("equipment_id","count(*) as sort");
+            queryWrapper1.in("equipment_id",collect);
+            queryWrapper1.groupBy("equipment_id");
+            List<PlanItem> planItems = planItemMapper.selectList(queryWrapper1);
+            for (PlanItem planItem : planItems) {
+                hashMap.put(planItem.getEquipmentId(),planItem.getSort());
+            }
+
+            //组装
+            for (Equipment equipment1 : equipmentPage.getRecords()) {
+                EquipmentBo equipmentBo = new EquipmentBo(equipment1);
+                Integer integer = hashMap.get(equipmentBo.getEquipmentId());
+                if (integer == null){
+                    equipmentBo.setPlanCounnt(0);
+                }else {
+                    equipmentBo.setPlanCounnt(integer);
+                }
+                result.add(equipmentBo);
             }
-            result.add(equipmentBo);
         }
+
+
         HashMap<String, Object> objectObjectHashMap = new HashMap<>();
         equipmentPage.setRecords(null);
         objectObjectHashMap.put("page",equipmentPage);

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -356,6 +356,32 @@ public class PlanServiceImpl implements PlanService {
         return addrCategoryMapper.selectList(null);
     }
 
+    @Override
+    public List<AddrCategory> getAddrCategoryLevel(String code,String level) {
+        if ("province".equals(level)){
+            QueryWrapper<AddrCategory> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("city","");
+            return addrCategoryMapper.selectList(queryWrapper);
+        }else if("city".equals(level)){
+            QueryWrapper<AddrCategory> queryWrapper = new QueryWrapper<>();
+            queryWrapper.likeRight("addr_code",code.substring(0,2));
+            queryWrapper.and(categoryQueryWrapper -> {
+                categoryQueryWrapper.eq("district", "").and(addrCategoryQueryWrapper -> {
+                    addrCategoryQueryWrapper.ne("city", "");
+                });
+            });
+            return addrCategoryMapper.selectList(queryWrapper);
+        }else if("zone".equals(level)){
+            QueryWrapper<AddrCategory> queryWrapper = new QueryWrapper<>();
+            queryWrapper.likeRight("addr_code",code.substring(0,4));
+            queryWrapper.and(categoryQueryWrapper -> {
+                categoryQueryWrapper.ne("district", "");
+            });
+            return addrCategoryMapper.selectList(queryWrapper);
+        }
+        return null;
+    }
+
     @Override
     public PageInfo<List<Equipment>> getEquipments(PlanBo bo) {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);