整合(v3.0)

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

@@ -10,9 +10,13 @@ import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.Plan;
 import com.ruoyi.demo.entity.PlanItem;
+import com.ruoyi.demo.entity.bo.EquipmentBo;
 import com.ruoyi.demo.entity.bo.PlanItemBo;
+import com.ruoyi.demo.entity.bo.StateBo;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.entity.vo.PlanItemVo;
+import com.ruoyi.demo.enums.EquipmentOnStateEnum;
+import com.ruoyi.demo.enums.EquipmentStateEnum;
 import com.ruoyi.demo.service.EquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -20,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -58,7 +63,7 @@ public class EquipmentController {
      */
     @GetMapping("/getEquipment")
     public R getEquipment(@NotBlank String equipmentId){
-        Equipment equipment = equipmentService.getEquipment(equipmentId);
+        EquipmentBo equipment = equipmentService.getEquipment(equipmentId);
         return R.ok(equipment);
     }
 
@@ -166,4 +171,38 @@ public class EquipmentController {
         int count = equipmentService.getEquipmentCount();
         return R.ok(count);
     }
+
+    /**
+     * 获取设备授权状态（下拉框）
+     * @return
+     */
+    @GetMapping("/getEquipmentState")
+    public R getEquipmentState(){
+        EquipmentStateEnum[] values = EquipmentStateEnum.values();
+        ArrayList<StateBo> list = new ArrayList<>();
+        for (EquipmentStateEnum value : values) {
+            StateBo stateBo = new StateBo();
+            stateBo.setState(value.getState());
+            stateBo.setName(value.getName());
+            list.add(stateBo);
+        }
+        return R.ok(list);
+    }
+
+    /**
+     * 获取设备在线状态（下拉框）
+     * @return
+     */
+    @GetMapping("/getEquipmentOnState")
+    public R getEquipmentOnState(){
+        EquipmentOnStateEnum[] values = EquipmentOnStateEnum.values();
+        ArrayList<StateBo> list = new ArrayList<>();
+        for (EquipmentOnStateEnum value : values) {
+            StateBo stateBo = new StateBo();
+            stateBo.setState(value.getState());
+            stateBo.setName(value.getName());
+            list.add(stateBo);
+        }
+        return R.ok(list);
+    }
 }

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

@@ -14,8 +14,8 @@ public class EquipmentBo {
     private String addrCodeInfo;
     private BigDecimal lat;
     private BigDecimal lng;
-    private Integer state;
-    private Integer onState;
+    private String state;
+    private String onState;
     private Integer planCounnt;
     private String storeId;
     private String manufacturers;
@@ -33,8 +33,6 @@ public class EquipmentBo {
         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/bo/StateBo.java

@@ -0,0 +1,9 @@
+package com.ruoyi.demo.entity.bo;
+
+import lombok.Data;
+
+@Data
+public class StateBo {
+    int state;
+    String name;
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/enums/EquipmentOnStateEnum.java

@@ -0,0 +1,31 @@
+package com.ruoyi.demo.enums;
+
+public enum EquipmentOnStateEnum {
+    ON_LINE(0,"在线"),
+    OFF_LINE(1,"失联");
+
+    private int state;
+    private String name;
+
+
+    EquipmentOnStateEnum(int state,String name) {
+        this.state = state;
+        this.name = name;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/enums/EquipmentStateEnum.java

@@ -0,0 +1,33 @@
+package com.ruoyi.demo.enums;
+
+
+public enum EquipmentStateEnum {
+    ON_POWER(0,"开启"),
+    OFF_POWER(1,"关闭"),
+    MAINTAIN_POWER(2,"维修中");
+
+    private int state;
+    private String name;
+
+
+    EquipmentStateEnum(int state,String name) {
+        this.state = state;
+        this.name = name;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/init/BenyunCoreInit.java

@@ -2,12 +2,17 @@ package com.ruoyi.demo.init;
 
 import com.ruoyi.demo.constant.RedisInitContant;
 import com.ruoyi.demo.entity.AddrCategory;
+import com.ruoyi.demo.enums.EquipmentOnStateEnum;
+import com.ruoyi.demo.enums.EquipmentStateEnum;
 import com.ruoyi.demo.mapper.AddrCategoryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import javax.annotation.PostConstruct;
+import java.util.HashMap;
+
 @Configuration
 public class BenyunCoreInit {
     @Autowired
@@ -16,7 +21,6 @@ public class BenyunCoreInit {
     @Autowired
     RedisTemplate redisTemplate;
 
-
     @PostConstruct
     public void initAddrCodeMap() {
         if(redisTemplate.hasKey(RedisInitContant.INIT_ADDR_CODE_MAP))
@@ -28,4 +32,22 @@ public class BenyunCoreInit {
         System.out.println("AddrCodeMap已完成");
     }
 
+    @Bean("equipmentStateMap")
+    public HashMap<Integer,String> getEquipmentStateMap(){
+        HashMap<Integer, String> equipmentStateMap = new HashMap<>();
+        for (EquipmentStateEnum value : EquipmentStateEnum.values()) {
+            equipmentStateMap.put(value.getState(),value.getName());
+        }
+        return equipmentStateMap;
+    }
+
+    @Bean("equipmentOnStateMap")
+    public HashMap<Integer,String> getEquipmentOnStateMap(){
+        HashMap<Integer, String> equipmentOnStateMap = new HashMap<>();
+        for (EquipmentOnStateEnum value : EquipmentOnStateEnum.values()) {
+            equipmentOnStateMap.put(value.getState(),value.getName());
+        }
+        return equipmentOnStateMap;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Equipment;
 import com.ruoyi.demo.entity.PlanItem;
+import com.ruoyi.demo.entity.bo.EquipmentBo;
 import com.ruoyi.demo.entity.bo.PlanItemBo;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.entity.vo.PlanItemVo;
@@ -17,7 +18,7 @@ public interface EquipmentService {
 
     void updateEquipment(EquipmentVo equipmentVo);
 
-    Equipment getEquipment(String equipmentId);
+    EquipmentBo getEquipment(String equipmentId);
 
     void deleteEquipment(String[] equipmentIds);
 

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

@@ -15,12 +15,14 @@ import com.ruoyi.demo.entity.bo.PlanBo;
 import com.ruoyi.demo.entity.bo.PlanItemBo;
 import com.ruoyi.demo.entity.vo.EquipmentVo;
 import com.ruoyi.demo.entity.vo.PlanItemVo;
+import com.ruoyi.demo.enums.EquipmentStateEnum;
 import com.ruoyi.demo.mapper.EquipmentMapper;
 import com.ruoyi.demo.mapper.PlanItemMapper;
 import com.ruoyi.demo.mapper.PlanMapper;
 import com.ruoyi.demo.service.EquipmentService;
 import com.ruoyi.demo.utils.InitMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -39,6 +41,13 @@ public class EquipmentServiceImpl implements EquipmentService {
 
     @Autowired
     PlanMapper planMapper;
+    @Autowired
+    @Qualifier("equipmentStateMap")
+    HashMap<Integer,String> equipmentStateMap;
+
+    @Autowired
+    @Qualifier("equipmentOnStateMap")
+    HashMap<Integer,String> equipmentOnStateMap;
     @Override
     public void addEquipment(EquipmentVo equipmentVo) {
         Equipment equipment = new Equipment(equipmentVo);
@@ -82,8 +91,12 @@ public class EquipmentServiceImpl implements EquipmentService {
     }
 
     @Override
-    public Equipment getEquipment(String equipmentId) {
-        return equipmentMapper.selectById(equipmentId);
+    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;
     }
 
     @Override
@@ -216,6 +229,8 @@ public class EquipmentServiceImpl implements EquipmentService {
         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);