安防感知 切换园区功能

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

@@ -7,7 +7,7 @@ import com.lqkj.common.core.model.BaseEntity;
 
 /**
  * 电梯信息对象 elevator_info
- * 
+ *
  * @author lqkj
  * @date 2024-11-12
  */
@@ -51,57 +51,67 @@ public class ElevatorInfo extends BaseEntity
     /** 连接状态 */
     private Integer connectStatus;
 
-    public void setElevatorId(Integer elevatorId) 
+    /**
+     * 电梯监控地址
+     */
+    private String elevatorUrl;
+
+    /**
+     * 园区id
+     */
+    private Integer parkId;
+
+    public void setElevatorId(Integer elevatorId)
     {
         this.elevatorId = elevatorId;
     }
 
-    public Integer getElevatorId() 
+    public Integer getElevatorId()
     {
         return elevatorId;
     }
-    public void setElevatorCode(String elevatorCode) 
+    public void setElevatorCode(String elevatorCode)
     {
         this.elevatorCode = elevatorCode;
     }
 
-    public String getElevatorCode() 
+    public String getElevatorCode()
     {
         return elevatorCode;
     }
-    public void setBuildingId(Integer buildingId) 
+    public void setBuildingId(Integer buildingId)
     {
         this.buildingId = buildingId;
     }
 
-    public Integer getBuildingId() 
+    public Integer getBuildingId()
     {
         return buildingId;
     }
-    public void setStatus(Integer status) 
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public Integer getStatus() 
+    public Integer getStatus()
     {
         return status;
     }
-    public void setElevatorName(String elevatorName) 
+    public void setElevatorName(String elevatorName)
     {
         this.elevatorName = elevatorName;
     }
 
-    public String getElevatorName() 
+    public String getElevatorName()
     {
         return elevatorName;
     }
-    public void setUpkeepNum(Integer upkeepNum) 
+    public void setUpkeepNum(Integer upkeepNum)
     {
         this.upkeepNum = upkeepNum;
     }
 
-    public Integer getUpkeepNum() 
+    public Integer getUpkeepNum()
     {
         return upkeepNum;
     }
@@ -138,6 +148,22 @@ public class ElevatorInfo extends BaseEntity
         this.connectStatus = connectStatus;
     }
 
+    public String getElevatorUrl() {
+        return elevatorUrl;
+    }
+
+    public void setElevatorUrl(String elevatorUrl) {
+        this.elevatorUrl = elevatorUrl;
+    }
+
+    public Integer getParkId() {
+        return parkId;
+    }
+
+    public void setParkId(Integer parkId) {
+        this.parkId = parkId;
+    }
+
     @Override
     public String toString() {
         return "ElevatorInfo{" +
@@ -153,4 +179,4 @@ public class ElevatorInfo extends BaseEntity
                 ", connectStatus=" + connectStatus +
                 '}';
     }
-}
+}

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

@@ -21,21 +21,21 @@ public class SecurityPerceptionController {
 
     @ApiOperation("智慧电梯-电梯基本情况")
     @GetMapping("/getElevatorBasicInfo")
-    public ResultUtil getElevatorBasicInfo(){
-        return ResultUtil.success(securityPerceptionService.getElevatorBasicInfo());
+    public ResultUtil getElevatorBasicInfo(Integer parkId){
+        return ResultUtil.success(securityPerceptionService.getElevatorBasicInfo( parkId));
     }
 
     @ApiOperation("智慧电梯-电梯维修统计")
     @GetMapping("/getElevatorRepairStats")
-    public ResultUtil getElevatorRepairStats(){
-        return ResultUtil.success(securityPerceptionService.getElevatorRepairStats());
+    public ResultUtil getElevatorRepairStats(Integer parkId){
+        return ResultUtil.success(securityPerceptionService.getElevatorRepairStats(parkId));
     }
 
 
     @ApiOperation("智慧电梯-电梯告警分布")
     @GetMapping("/elevatorAlarmDistribution")
-    public ResultUtil elevatorAlarmDistribution(){
-        return ResultUtil.success(securityPerceptionService.elevatorAlarmDistribution());
+    public ResultUtil elevatorAlarmDistribution(Integer parkId){
+        return ResultUtil.success(securityPerceptionService.elevatorAlarmDistribution(parkId));
     }
 
     @ApiOperation("停车场-充电桩使用品牌")

src/main/java/com/lqkj/ioc/mapper/SecurityPerceptionMapper.java

@@ -15,21 +15,27 @@ public interface SecurityPerceptionMapper {
     @Select("SELECT sdd.dict_label, COUNT(ei.elevator_id) " +
             "FROM sys_dict_data sdd " +
             "LEFT JOIN elevator_info ei ON sdd.dict_value::integer = ei.type " +
-            "WHERE sdd.dict_type = 'elevator_type' GROUP BY sdd.dict_label"
+            "WHERE sdd.dict_type = 'elevator_type' " +
+            "AND CASE WHEN #{parkId} IS NOT NULL THEN ei.park_id = #{parkId} ELSE 1=1 END " +
+            " GROUP BY sdd.dict_label"
     )
-    List<Map<String, Object>> getElevatorBasicInfo();
+    List<Map<String, Object>> getElevatorBasicInfo(Integer parkId);
 
     @Select("SELECT sdd.dict_label, COUNT(ei.elevator_id) " +
             "FROM sys_dict_data sdd " +
             "LEFT JOIN elevator_info ei ON sdd.dict_value::integer = ei.status " +
-            "WHERE sdd.dict_type = 'elevator_info_status' GROUP BY sdd.dict_label")
-    List<Map<String, Object>> getElevatorRepairStats();
+            "WHERE sdd.dict_type = 'elevator_info_status' " +
+            "AND CASE WHEN #{parkId} IS NOT NULL THEN ei.park_id = #{parkId} ELSE 1=1 END " +
+            "GROUP BY sdd.dict_label")
+    List<Map<String, Object>> getElevatorRepairStats(Integer parkId);
 
     @Select("SELECT sdd.dict_label, COUNT(ei.elevator_id) " +
             "FROM sys_dict_data sdd " +
             "LEFT JOIN elevator_info ei ON sdd.dict_value::integer = ei.status " +
-            "WHERE sdd.dict_type = 'elevator_info_status' and sdd.dict_value IN ('3', '7', '8') GROUP BY sdd.dict_label")
-    List<Map<String, Object>> elevatorAlarmDistribution();
+            "WHERE sdd.dict_type = 'elevator_info_status' and sdd.dict_value IN ('3', '7', '8') " +
+            "AND CASE WHEN #{parkId} IS NOT NULL THEN ei.park_id = #{parkId} ELSE 1=1 END " +
+            "GROUP BY sdd.dict_label")
+    List<Map<String, Object>> elevatorAlarmDistribution(Integer parkId);
 
     @Select("SELECT sdd.dict_label, COUNT(ei.equipment_id) " +
             "FROM sys_dict_data sdd " +

src/main/java/com/lqkj/ioc/service/SecurityPerceptionService.java

@@ -15,19 +15,19 @@ public class SecurityPerceptionService {
     private SecurityPerceptionMapper securityPerceptionMapper;
 
 
-    public List<Map<String, Object>> getElevatorBasicInfo() {
+    public List<Map<String, Object>> getElevatorBasicInfo(Integer parkId) {
 
-        return securityPerceptionMapper.getElevatorBasicInfo();
+        return securityPerceptionMapper.getElevatorBasicInfo(parkId);
     }
 
-    public List<Map<String, Object>> getElevatorRepairStats() {
+    public List<Map<String, Object>> getElevatorRepairStats(Integer parkId) {
 
-        return securityPerceptionMapper.getElevatorRepairStats();
+        return securityPerceptionMapper.getElevatorRepairStats(parkId);
     }
 
-    public List<Map<String, Object>> elevatorAlarmDistribution() {
+    public List<Map<String, Object>> elevatorAlarmDistribution(Integer parkId) {
 
-        return securityPerceptionMapper.elevatorAlarmDistribution();
+        return securityPerceptionMapper.elevatorAlarmDistribution(parkId);
     }
 
     public List<Map<String, Object>> countChargingStationBrands() {

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

@@ -0,0 +1,8 @@
+ALTER TABLE elevator_info ADD COLUMN elevator_url VARCHAR(255);
+ALTER TABLE elevator_info ADD COLUMN park_id INT4;
+
+
+
+COMMENT ON COLUMN elevator_info.elevator_url IS '监控地址';
+COMMENT ON COLUMN elevator_info.park_id IS '园区';
+

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

@@ -15,10 +15,13 @@
 		<result property="runFloor"    column="run_floors"    />
 		<result property="runTime"    column="run_time"    />
 		<result property="connectStatus"    column="connect_status"    />
+		<result property="elevatorUrl"    column="elevator_url"    />
+		<result property="parkId"    column="park_id"    />
+
 	</resultMap>
 
 	<sql id="selectElevatorInfoVo">
-		select elevator_id, elevator_code, building_id, status, elevator_name, upkeep_num, type, run_floors, run_time, connect_status from elevator_info
+		select elevator_id, elevator_code, building_id, status, elevator_name, upkeep_num, type, run_floors, run_time, connect_status, elevator_url, park_id from elevator_info
 	</sql>
 
 	<select id="selectElevatorInfoList" parameterType="ElevatorInfo" resultMap="ElevatorInfoResult">
@@ -32,6 +35,7 @@
 			<if test="runFloor != null and runFloor != ''"> and run_floors like concat('%', #{runFloor}, '%')</if>
 			<if test="runTime != null and runTime != ''"> and run_time like concat('%', #{runTime}, '%')</if>
 			<if test="connectStatus != null "> and connect_status = #{connectStatus}</if>
+			<if test="parkId != null"> and park_id = #{parkId}</if>
 		</where>
 		order by elevator_id
 
@@ -54,6 +58,8 @@
 		    <if test="runFloor != null and runFloor != ''">run_floors,</if>
 		    <if test="runTime != null and runTime != ''">run_time,</if>
 		    <if test="connectStatus != null">connect_status,</if>
+		    <if test="elevatorUrl != null and elevatorUrl != ''">elevator_url,</if>
+		    <if test="parkId != null">park_id,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="elevatorCode != null and elevatorCode != ''">#{elevatorCode},</if>
@@ -65,6 +71,8 @@
 		    <if test="runFloor != null and runFloor != ''">#{runFloor},</if>
 		    <if test="runTime != null and runTime != ''">#{runTime},</if>
 		    <if test="connectStatus != null">#{connectStatus},</if>
+			<if test="elevatorUrl != null and elevatorUrl != ''">#{elevatorUrl},</if>
+			<if test="parkId != null">#{parkId},</if>
 		</trim>
 	</insert>
 
@@ -79,7 +87,9 @@
 		    type = #{type},
 			run_floors = #{runFloor},
 		    run_time = #{runTime},
-		    connect_status = #{connectStatus}
+		    connect_status = #{connectStatus},
+		    elevator_url = #{elevatorUrl},
+			park_id = #{parkId}
 		</trim>
 		where elevator_id = #{elevatorId}
 	</update>
@@ -94,4 +104,4 @@
 			#{elevatorId}
 		</foreach>
 	</delete>
-</mapper>
+</mapper>