设备详情2

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

@@ -2,10 +2,14 @@ package com.zksy.web.controller.manhole;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.base.domain.EquipmentBase;
 import com.zksy.base.domain.EquipmentStatus;
 import com.zksy.base.domain.EquipmentType;
+import com.zksy.base.manhole.domain.ManholeData;
+import com.zksy.base.manhole.service.ManholeDataService;
 import com.zksy.base.service.EquipmentBaseService;
 import com.zksy.base.service.EquipmentStatusService;
 import com.zksy.base.service.EquipmentTypeService;
@@ -21,6 +25,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 窨井盖监测系统-监测设备信息管理Controller
  * 
@@ -41,6 +47,9 @@ public class ManholeDeviceController extends BaseController
     @Autowired
     private EquipmentTypeService equipmentTypeService;
 
+    @Autowired
+    private ManholeDataService manholeDataService;
+
     /**
      * 分页查询监测设备台账列表
      */
@@ -73,11 +82,26 @@ public class ManholeDeviceController extends BaseController
             outDTO.setCurrentStatus(equipmentStatus.getCurrentStatus());
             outDTO.setAlarmStatus(equipmentStatus.getAlarmStatus());
             outDTO.setOnlineStatus(equipmentStatus.getOnlineStatus());
+            outDTO.setStatusUpdateTime(equipmentStatus.getStatusUpdateTime());
         }
+        // 查询设备类别名称
         EquipmentType equipmentType = equipmentTypeService.getById(outDTO.getEquipmentTypeId());
         if(equipmentType != null){
             outDTO.setEquipmentTypeName(equipmentType.getTypeName());
         }
+        // 查询设备监测状态
+        List<ManholeData> manholeDataList = manholeDataService.list(new LambdaQueryWrapper<ManholeData>()
+                .eq(ManholeData::getImeiCardNumber, outDTO.getEquipmentCode())
+                .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());
+        }
         return AjaxResult2.success(outDTO);
     }
 

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentStatus.java

@@ -8,7 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -71,5 +70,6 @@ public class EquipmentStatus {
     /**
      * 状态更新时间
      */
-    private LocalDateTime statusUpdateTime;
+    @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/base/service/impl/EquipmentStatusServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -210,7 +210,7 @@ public class EquipmentStatusServiceImpl extends ServiceImpl<EquipmentStatusMappe
         //校验当前状态记录是否存在
         boolean update = this.lambdaUpdate()
                 .set(EquipmentStatus::getCurrentStatus, inDTO.getCurrentStatus())
-                .set(EquipmentStatus::getStatusUpdateTime, LocalDateTime.now())
+                .set(EquipmentStatus::getStatusUpdateTime, new Date())
                 .eq(EquipmentStatus::getEquipmentId, inDTO.getEquipmentId())
                 .update();
         return update;

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

@@ -1,11 +1,13 @@
 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;
 
 /**
  * 获取监测设备台账详情-入参
@@ -26,6 +28,28 @@ public class EquipmentBaseOutDTO extends EquipmentBase implements Serializable {
     @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 = "水位报警状态（0正常，1报警）")
+    private String waterLevelAlarmStatus;
 }