设备列表3

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/manhole/ManholeDeviceController.java

@@ -18,8 +18,11 @@ import com.zksy.common.core.controller.BaseController;
 import com.zksy.common.core.domain.AjaxResult;
 import com.zksy.common.core.domain.AjaxResult2;
 import com.zksy.manhole.dto.in.EquipmentStatusInDTO;
+import com.zksy.manhole.dto.in.ManholeDeviceListInDTO;
 import com.zksy.manhole.dto.in.ManholeDevicePageInDTO;
 import com.zksy.manhole.dto.out.EquipmentBaseOutDTO;
+import com.zksy.manhole.dto.out.EquipmentStatusOutDTO;
+import com.zksy.manhole.dto.out.ManholeDataOutDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +64,18 @@ public class ManholeDeviceController extends BaseController
         return AjaxResult2.success(equipmentBaseService.findManholeDeviceByPage(pageInDTO));
     }
 
+    /**
+     * 查询井盖监测设备列表
+     */
+    @Anonymous
+    @GetMapping(value = "/getManholeDataList")
+    @ApiOperation(value = "查询井盖监测设备列表")
+    public AjaxResult2<List<EquipmentBaseOutDTO>> getManholeDataList(@RequestBody ManholeDeviceListInDTO pageInDTO)
+    {
+        //return AjaxResult2.success(equipmentBaseService.getManholeDataList(pageInDTO));
+        return null;
+    }
+
     /**
      * 获取监测设备台账详情
      */
@@ -79,10 +94,8 @@ public class ManholeDeviceController extends BaseController
                 .eq(EquipmentStatus::getEquipmentId, outDTO.getEquipmentId())
                 .one();
         if(equipmentStatus != null){
-            outDTO.setCurrentStatus(equipmentStatus.getCurrentStatus());
-            outDTO.setAlarmStatus(equipmentStatus.getAlarmStatus());
-            outDTO.setOnlineStatus(equipmentStatus.getOnlineStatus());
-            outDTO.setStatusUpdateTime(equipmentStatus.getStatusUpdateTime());
+            EquipmentStatusOutDTO equipmentStatusOutDTO = BeanUtil.copyProperties(equipmentStatus, EquipmentStatusOutDTO.class);
+            outDTO.setEquipmentStatus(equipmentStatusOutDTO);
         }
         // 查询设备类别名称
         EquipmentType equipmentType = equipmentTypeService.getById(outDTO.getEquipmentTypeId());
@@ -95,12 +108,8 @@ public class ManholeDeviceController extends BaseController
                 .orderByDesc(ManholeData::getCreateTime));
         if(CollUtil.isNotEmpty(manholeDataList)){
             ManholeData manholeData = manholeDataList.get(0);
-            outDTO.setBatteryLevel(manholeData.getBatteryLevel());
-            outDTO.setSignalStrength(manholeData.getSignalStrength());
-            outDTO.setTiltAngle(manholeData.getTiltAngle());
-            outDTO.setActivationStatus(manholeData.getActivationStatus());
-            outDTO.setWaterInfiltrationAlarmStatus(manholeData.getWaterInfiltrationAlarmStatus());
-            outDTO.setWaterLevelAlarmStatus(manholeData.getWaterLevelAlarmStatus());
+            ManholeDataOutDTO manholeDataOutDTO = BeanUtil.copyProperties(manholeData, ManholeDataOutDTO.class);
+            outDTO.setManholeData(manholeDataOutDTO);
         }
         return AjaxResult2.success(outDTO);
     }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/EquipmentBaseServiceImpl.java

@@ -21,6 +21,8 @@ import com.zksy.base.service.EquipmentBaseService;
 import com.zksy.common.exception.ServiceException;
 import com.zksy.manhole.dto.in.ManholeDevicePageInDTO;
 import com.zksy.manhole.dto.out.EquipmentBaseOutDTO;
+import com.zksy.manhole.dto.out.EquipmentStatusOutDTO;
+import com.zksy.manhole.dto.out.ManholeDataOutDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -298,21 +300,15 @@ public class EquipmentBaseServiceImpl extends ServiceImpl<EquipmentBaseMapper, E
                 }
                 EquipmentStatus equipmentStatus = EquipmentStatusMap.get(outDTO.getEquipmentId());
                 if(equipmentStatus != null){
-                    outDTO.setCurrentStatus(equipmentStatus.getCurrentStatus());
-                    outDTO.setAlarmStatus(equipmentStatus.getAlarmStatus());
-                    outDTO.setOnlineStatus(equipmentStatus.getOnlineStatus());
-                    outDTO.setStatusUpdateTime(equipmentStatus.getStatusUpdateTime());
+                    EquipmentStatusOutDTO equipmentStatusOutDTO = BeanUtil.copyProperties(equipmentStatus, EquipmentStatusOutDTO.class);
+                    outDTO.setEquipmentStatus(equipmentStatusOutDTO);
                 }
                 if(pageInDTO.getIsQueryManholeData()){
                     manholeDataList = imeiCardNumberMapList.get(outDTO.getEquipmentCode());
                     if(CollUtil.isNotEmpty(manholeDataList)){
                         ManholeData manholeData = manholeDataList.get(0);
-                        outDTO.setBatteryLevel(manholeData.getBatteryLevel());
-                        outDTO.setSignalStrength(manholeData.getSignalStrength());
-                        outDTO.setTiltAngle(manholeData.getTiltAngle());
-                        outDTO.setActivationStatus(manholeData.getActivationStatus());
-                        outDTO.setWaterInfiltrationAlarmStatus(manholeData.getWaterInfiltrationAlarmStatus());
-                        outDTO.setWaterLevelAlarmStatus(manholeData.getWaterLevelAlarmStatus());
+                        ManholeDataOutDTO manholeDataOutDTO = BeanUtil.copyProperties(manholeData, ManholeDataOutDTO.class);
+                        outDTO.setManholeData(manholeDataOutDTO);
                     }
                 }
             }

pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/in/ManholeDeviceListInDTO.java

@@ -0,0 +1,24 @@
+package com.zksy.manhole.dto.in;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 查询井盖监测设备列表-入参
+ *
+ * @author xianggx
+ */
+@Data
+@ApiModel(value = "查询井盖监测设备列表-入参", description = "查询井盖监测设备列表-入参")
+public class ManholeDeviceListInDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "运维状态：1-在用，2-闲置，3-维修，4-报废，5-待入库")
+    private Integer currentStatus;
+
+    @ApiModelProperty("是否查询井盖监测数据：默认不查询")
+    private Boolean isQueryManholeData = false;
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/out/EquipmentBaseOutDTO.java

@@ -1,55 +1,28 @@
 package com.zksy.manhole.dto.out;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zksy.base.domain.EquipmentBase;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
- * 获取监测设备台账详情-入参
+ * 获取监测设备台账详情-出参
  *
  * @author xianggx
  */
 @Data
-@ApiModel(value = "获取监测设备台账详情-入参", description = "获取监测设备台账详情-入参")
+@ApiModel(value = "获取监测设备台账详情-出参", description = "获取监测设备台账详情-出参")
 public class EquipmentBaseOutDTO extends EquipmentBase implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "运维状态：1-在用，2-闲置，3-维修，4-报废，5-待入库")
-    private Integer currentStatus;
-
-    @ApiModelProperty(value = "报警状态（0-正常，1-报警）")
-    private Integer alarmStatus;
-
-    @ApiModelProperty(value = "在线状态（0-离线，1-在线）")
-    private Integer onlineStatus;
-
-    @ApiModelProperty(value = "状态更新时间")
-    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date statusUpdateTime;
-
     @ApiModelProperty("设备类别名称")
     private String equipmentTypeName;
 
-    @ApiModelProperty(value = "电池电量")
-    private String batteryLevel;
-
-    @ApiModelProperty(value = "信号量")
-    private String signalStrength;
-
-    @ApiModelProperty(value = "倾斜角度")
-    private String tiltAngle;
-
-    @ApiModelProperty(value = "激活状态")
-    private String activationStatus;
-
-    @ApiModelProperty(value = "水浸报警状态（0正常，1报警）")
-    private String waterInfiltrationAlarmStatus;
+    @ApiModelProperty(value = "设备状态详情")
+    private EquipmentStatusOutDTO equipmentStatus;
 
-    @ApiModelProperty(value = "水位报警状态（0正常，1报警）")
-    private String waterLevelAlarmStatus;
+    @ApiModelProperty(value = "井盖实时监测数据")
+    private ManholeDataOutDTO manholeData;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/out/EquipmentStatusOutDTO.java

@@ -0,0 +1,33 @@
+package com.zksy.manhole.dto.out;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 设备状态详情-出参
+ *
+ * @author xianggx
+ */
+@Data
+@ApiModel(value = "设备状态详情-出参", description = "设备状态详情-出参")
+public class EquipmentStatusOutDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "运维状态：1-在用，2-闲置，3-维修，4-报废，5-待入库")
+    private Integer currentStatus;
+
+    @ApiModelProperty(value = "报警状态（0-正常，1-报警）")
+    private Integer alarmStatus;
+
+    @ApiModelProperty(value = "在线状态（0-离线，1-在线）")
+    private Integer onlineStatus;
+
+    @ApiModelProperty(value = "状态更新时间")
+    @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date statusUpdateTime;
+}

pipe-network-service/zksy-system/src/main/java/com/zksy/manhole/dto/out/ManholeDataOutDTO.java

@@ -0,0 +1,36 @@
+package com.zksy.manhole.dto.out;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 井盖实时监测数据-出参
+ *
+ * @author xianggx
+ */
+@Data
+@ApiModel(value = "井盖实时监测数据-出参", description = "井盖实时监测数据-出参")
+public class ManholeDataOutDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "电池电量")
+    private String batteryLevel;
+
+    @ApiModelProperty(value = "信号量")
+    private String signalStrength;
+
+    @ApiModelProperty(value = "倾斜角度")
+    private String tiltAngle;
+
+    @ApiModelProperty(value = "激活状态")
+    private String activationStatus;
+
+    @ApiModelProperty(value = "水浸报警状态（0正常，1报警）")
+    private String waterInfiltrationAlarmStatus;
+
+    @ApiModelProperty(value = "水位报警状态（0正常，1报警）")
+    private String waterLevelAlarmStatus;
+}