补充下拉框

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

@@ -128,4 +128,16 @@ public class PlanController {
     public R total(){
         return R.ok(planService.getPlanTotal());
     }
+
+    // 其他
+    // 获取设备信息
+    @GetMapping("/getEquipments")
+    public R getEquipments(PlanBo bo){
+        return R.ok(planService.getEquipments(bo));
+    }
+    // 下拉框——获取省市区地区码
+    @GetMapping("/getAddrCategory")
+    public R getAddrCategory(){
+        return R.ok(planService.getAddrCategory());
+    }
 }

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

@@ -31,4 +31,5 @@ public class PlanBo {
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime endTime;
     private String commercialId;
+    private List<String> addrCodes;
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.demo.service;
 
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.demo.entity.AddrCategory;
+import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.Plan;
 import com.ruoyi.demo.entity.bo.PlanAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
@@ -23,4 +25,7 @@ public interface PlanService {
     PageInfo<List<PlanPushListVo>> getPlanPushList(PlanBo bo);
     PageInfo<List<PlanPushStatisticsListVo>> getPlanPushStatisticsList(PlanBo bo);
     PlanHomeVo getPlanTotal();
+
+    List<AddrCategory> getAddrCategory();
+    PageInfo<List<Equipment>> getEquipments(PlanBo bo);
 }

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

@@ -41,6 +41,10 @@ public class PlanServiceImpl implements PlanService {
     StoreMapper storeMapper;
     @Autowired
     PlanPushStatisticsMapper planPushStatisticsMapper;
+    @Autowired
+    AddrCategoryMapper addrCategoryMapper;
+    @Autowired
+    EquipmentMapper equipmentMapper;
 
     @Override
     public int addPlan(PlanAddBo bo) {
@@ -301,4 +305,22 @@ public class PlanServiceImpl implements PlanService {
         vo.setTotal(planMapper.selectPlanTotal());
         return vo;
     }
+
+    @Override
+    public List<AddrCategory> getAddrCategory() {
+        return addrCategoryMapper.selectList(null);
+    }
+
+    @Override
+    public PageInfo<List<Equipment>> getEquipments(PlanBo bo) {
+        PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
+        QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
+        if (bo.getText() != null)
+            equipmentQueryWrapper.like("equipment_id",bo.getText())
+                .or()
+                .like("equipment_name",bo.getText());
+        if (bo.getAddrCodes() != null)
+            equipmentQueryWrapper.in("addr_code",bo.getAddrCodes());
+        return new PageInfo(equipmentMapper.selectList(equipmentQueryWrapper));
+    }
 }