2025-02-19日需求开发对应接口

src/main/java/com/lqkj/info/entity/EquipmentInfo.java

@@ -1,13 +1,16 @@
 package com.lqkj.info.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.lqkj.common.annotation.Excel;
 import com.lqkj.common.core.model.BaseEntity;
 
+import java.time.LocalDateTime;
+
 /**
  * 设备信息对象 equipment_info
- * 
+ *
  * @author lqkj
  * @date 2024-11-12
  */
@@ -65,61 +68,67 @@ public class EquipmentInfo extends BaseEntity
     /** 园区id */
     private Integer parkId;
 
-    public void setEquipmentId(Integer equipmentId) 
+    /**
+     * 告警时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+    private LocalDateTime warningTime;
+
+    public void setEquipmentId(Integer equipmentId)
     {
         this.equipmentId = equipmentId;
     }
 
-    public Integer getEquipmentId() 
+    public Integer getEquipmentId()
     {
         return equipmentId;
     }
-    public void setTypeId(Integer typeId) 
+    public void setTypeId(Integer typeId)
     {
         this.typeId = typeId;
     }
 
-    public Integer getTypeId() 
+    public Integer getTypeId()
     {
         return typeId;
     }
-    public void setRoomId(Integer roomId) 
+    public void setRoomId(Integer roomId)
     {
         this.roomId = roomId;
     }
 
-    public Integer getRoomId() 
+    public Integer getRoomId()
     {
         return roomId;
     }
-    public void setBuildingId(Integer buildingId) 
+    public void setBuildingId(Integer buildingId)
     {
         this.buildingId = buildingId;
     }
 
-    public Integer getBuildingId() 
+    public Integer getBuildingId()
     {
         return buildingId;
     }
-    public void setAreaId(Integer areaId) 
+    public void setAreaId(Integer areaId)
     {
         this.areaId = areaId;
     }
 
-    public Integer getAreaId() 
+    public Integer getAreaId()
     {
         return areaId;
     }
-    public void setEquipmentName(String equipmentName) 
+    public void setEquipmentName(String equipmentName)
     {
         this.equipmentName = equipmentName;
     }
 
-    public String getEquipmentName() 
+    public String getEquipmentName()
     {
         return equipmentName;
     }
-    public void setLngLat(String lngLat) 
+    public void setLngLat(String lngLat)
     {
         this.lngLat = lngLat;
     }
@@ -128,7 +137,7 @@ public class EquipmentInfo extends BaseEntity
     {
         return lngLat;
     }
-    public void setRasterLngLat(String rasterLngLat) 
+    public void setRasterLngLat(String rasterLngLat)
     {
         this.rasterLngLat = rasterLngLat;
     }
@@ -137,21 +146,21 @@ public class EquipmentInfo extends BaseEntity
     {
         return rasterLngLat;
     }
-    public void setTypeName(String typeName) 
+    public void setTypeName(String typeName)
     {
         this.typeName = typeName;
     }
 
-    public String getTypeName() 
+    public String getTypeName()
     {
         return typeName;
     }
-    public void setStatus(Integer status) 
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public Integer getStatus() 
+    public Integer getStatus()
     {
         return status;
     }
@@ -188,6 +197,14 @@ public class EquipmentInfo extends BaseEntity
         this.parkId = parkId;
     }
 
+    public LocalDateTime getWarningTime() {
+        return warningTime;
+    }
+
+    public void setWarningTime(LocalDateTime warningTime) {
+        this.warningTime = warningTime;
+    }
+
     @Override
     public String toString() {
         return "EquipmentInfo{" +
@@ -207,4 +224,4 @@ public class EquipmentInfo extends BaseEntity
                 ", parkId=" + parkId +
                 '}';
     }
-}
+}

src/main/java/com/lqkj/ioc/controller/SmartParkController.java

@@ -2,6 +2,8 @@ package com.lqkj.ioc.controller;
 
 
 import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.info.entity.EquipmentInfo;
+import com.lqkj.info.service.EquipmentInfoService;
 import com.lqkj.ioc.service.SmartParkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,7 +20,8 @@ public class SmartParkController {
 
     @Autowired
     private SmartParkService smartParkService;
-
+    @Autowired
+    private EquipmentInfoService equipmentInfoService;
 
     @ApiOperation("智慧园区-园区新增入驻情况")
     @GetMapping("/addParkNewTenant/{parkId}")
@@ -32,4 +35,10 @@ public class SmartParkController {
     public ResultUtil getParkFireProtectionInfo(@PathVariable("parkId") Integer parkId){
         return ResultUtil.success(smartParkService.getParkFireProtectionInfo(parkId));
     }
+
+    @ApiOperation("智慧园区-设备管理-设备清单")
+    @GetMapping("/device/list")
+    public ResultUtil getParkFireProtectionInfo(EquipmentInfo equipmentInfo){
+        return ResultUtil.success(equipmentInfoService.selectEquipmentInfoList(equipmentInfo));
+    }
 }

src/main/resources/db/migration/V1_13__20250225.sql

@@ -0,0 +1,4 @@
+ALTER TABLE equipment_info
+    ADD COLUMN warning_time timestamp;
+
+COMMENT ON COLUMN equipment_info.warning_time is '告警时间';

src/main/resources/mapper/info/EquipmentInfoMapper.xml

@@ -19,10 +19,11 @@
 		<result property="deviceStatus"    column="device_status"    />
 		<result property="brand" column="brand"/>
 		<result property="parkId"	column="park_id"/>
+		<result property="warningTime"    column="warning_time"    />
 	</resultMap>
 
 	<sql id="selectEquipmentInfoVo">
-		select equipment_id, type_id, room_id, building_id, area_id, equipment_name, lng_lat, raster_lng_lat, type_name, status, equip_code, device_status, brand, park_id from equipment_info
+		select equipment_id, type_id, room_id, building_id, area_id, equipment_name, lng_lat, raster_lng_lat, type_name, status, equip_code, device_status, brand, park_id,warning_time from equipment_info
 	</sql>
 
 	<select id="selectEquipmentInfoList" parameterType="EquipmentInfo" resultMap="EquipmentInfoResult">
@@ -61,6 +62,7 @@
 		    <if test="deviceStatus != null">device_status,</if>
 		    <if test="brand != null">brand,</if>
 		    <if test="parkId != null">park_id,</if>
+		    <if test="warningTime != null">warning_time,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="typeId != null">#{typeId},</if>
@@ -76,6 +78,7 @@
 		    <if test="deviceStatus != null">#{deviceStatus},</if>
 		    <if test="brand != null">#{brand},</if>
 		    <if test="parkId != null">#{parkId},</if>
+			<if test="warningTime != null">#{warningTime},</if>
 		</trim>
 	</insert>
 
@@ -95,6 +98,7 @@
 		    device_status = #{deviceStatus},
 		    brand = #{brand},
 		    park_id = #{parkId}
+		    <if test="warningTime != null">,warning_time = #{warningTime}</if>
 		</trim>
 		where equipment_id = #{equipmentId}
 	</update>
@@ -109,4 +113,4 @@
 			#{equipmentId}
 		</foreach>
 	</delete>
-</mapper>
+</mapper>