修改发送给 DMP时，区域ID的规则

src/main/java/com/care/common/entity/CareRoomGate.java

@@ -39,7 +39,7 @@ public class CareRoomGate implements Serializable {
 
     @ApiModelProperty("门ID")
     @TableField("GID")
-    private Integer gid;
+    private String gid;
 
 
     @ApiModelProperty("房间ID")

src/main/java/com/care/installation/service/RoomService.java

@@ -176,7 +176,7 @@ public class RoomService {
 
     public RoomGateVO getRoomGateInfo(String devCode,Integer gid) {
         QueryWrapper<CareRoomGate> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareRoomGate::getRoomId,devCode).eq(CareRoomGate::getGid,gid);
+        queryWrapper.lambda().eq(CareRoomGate::getRoomId,devCode).eq(CareRoomGate:: getGid,gid);
         CareRoomGate careRoomGate = this.careRoomGateService.getOne(queryWrapper);
         if (careRoomGate != null) {
             RoomGateVO roomGateVO = new RoomGateVO();
@@ -485,7 +485,7 @@ public class RoomService {
         List<Map<String,Object>> items = new ArrayList<>();
         list.forEach(roomGateVO ->{
             Map<String,Object> item = new HashMap<>();
-            item.put("entranceId",roomGateVO.getGid());
+            item.put("entranceId",roomGateVO.getRoomId()+"_"+roomGateVO.getGid());
             item.put("roomId",roomGateVO.getRoomId());
             item.put("entranceCode",roomGateVO.getGid());
             item.put("entranceType",1);
@@ -508,7 +508,7 @@ public class RoomService {
         List<Map<String,Object>> items = new ArrayList<>();
         list.forEach(roomRegionVO ->{
             Map<String,Object> item = new HashMap<>();
-            item.put("regionId",roomRegionVO.getRid());
+            item.put("regionId",roomRegionVO.getRoomId()+"_"+roomRegionVO.getRid());
             item.put("roomId",roomRegionVO.getRoomId());
             item.put("regionCode",roomRegionVO.getRid());
             item.put("regionType",roomRegionVO.getCls());

src/main/java/com/care/installation/vo/RoomGateVO.java

@@ -24,7 +24,7 @@ public class RoomGateVO implements Serializable {
 
 
     @ApiModelProperty("门ID")
-    private Integer gid;
+    private String gid;
 
 
     @ApiModelProperty("房间ID")

src/main/resources/application-dev.properties

@@ -44,7 +44,7 @@ mqtt.password=sxkj@1234
 #是否开启mqtt消息接受服务，开启：1，不开启：0
 mqtt.on=1
 #设备激活返回消息超时(秒)
-mqtt.dev.jihuo.timeout=10
+mqtt.dev.jihuo.timeout=30
 
 #设备工作时接受消息的mqtt topic
 #mqtt.topic.work.template=5JPD/monitor/XXXXX/event

src/main/resources/application-prod.properties

@@ -48,7 +48,7 @@ mqtt.password=public
 #是否开启mqtt消息接受服务，开启：1，不开启：0
 mqtt.on=1
 #设备激活返回消息超时(秒)
-mqtt.dev.jihuo.timeout=10
+mqtt.dev.jihuo.timeout=30
 
 #设备工作时接受消息的mqtt topic
 mqtt.topic.work.template=5JPD/monitor/XXXXX/event