解决 修改设备数据不同步问题

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java

@@ -87,7 +87,7 @@ public class TranslateOwnerToMachine implements Runnable {
                     OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
                     ownerRoomRelDto.setbId(tmpOrderDto.getbId());
                     List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
-                    Assert.listOnlyOne(ownerRoomRelDtos, "数据错误 业主房屋关系未找到，或找到多条");
+                    Assert.listOnlyOne(ownerRoomRelDtos, "数据错误 业主房屋关系未找到，或找到多条" + JSONObject.toJSONString(tmpOrderDto));
                     ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
                 } else {
                     ownerDto.setbId(tmpOrderDto.getbId());

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java

@@ -30,7 +30,7 @@ import java.util.Map;
  */
 public class TranslateOwnerToMachineChangeMachine implements Runnable {
     Logger logger = LoggerFactory.getLogger(TranslateOwnerToMachineChangeMachine.class);
-    public static final long DEFAULT_WAIT_SECOND = 5000 * 6; // 默认30秒执行一次
+    public static final long DEFAULT_WAIT_SECOND = 1000 * 60 ; // 默认30秒执行一次
     public static boolean TRANSLATE_STATE = false;
 
     private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
@@ -74,6 +74,7 @@ public class TranslateOwnerToMachineChangeMachine implements Runnable {
         OrderDto orderDto = new OrderDto();
         List<OrderDto> orderDtos = orderInnerServiceSMOImpl.queryMachineOrders(orderDto);
         for (OrderDto tmpOrderDto : orderDtos) {
+            logger.debug("开始处理订单" + JSONObject.toJSONString(tmpOrderDto));
             try {
                 //根据bId 查询硬件信息
                 machineDto = new MachineDto();
@@ -117,6 +118,7 @@ public class TranslateOwnerToMachineChangeMachine implements Runnable {
             //先根据单元门ID 查询 房屋
             RoomDto roomDto = new RoomDto();
             roomDto.setUnitId(machineDto.getLocationObjId());
+            roomDto.setCommunityId(machineDto.getCommunityId());
             List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
             ownerDto.setRoomIds(getRoomIds(roomDtos));
             ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);

WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html

@@ -76,7 +76,7 @@
                             <th class="text-center">设备类型</th>
                             <th class="text-center">设备位置</th>
                             <th class="text-center">状态</th>
-<!--                            <th class="text-center">设备IP</th>-->
+                            <th class="text-center">时间</th>
 <!--                            <th class="text-center">设备MAC</th>-->
                             <th class="text-center">操作</th>
 
@@ -91,8 +91,8 @@
                             <td class="text-center">{{machine.machineTypeCdName}}</td>
                             <td class="text-center">{{machine.locationObjName}}</td>
                             <td class="text-center">{{machine.stateName}}</td>
-                           <!-- <td class="text-center">{{machine.machineIp}}</td>
-                            <td class="text-center">{{machine.machineMac}}</td>-->
+                           <td class="text-center">{{machine.createTime}}</td>
+                           <!--<td class="text-center">{{machine.machineMac}}</td>-->
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditMachineModel(machine)">修改</button>

java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java

@@ -14,6 +14,7 @@ public class ApiMachineTranslateDataVo implements Serializable {
     private String objId;
     private String state;
     private String stateName;
+    private String createTime;
 
     public String getMachineTranslateId() {
         return machineTranslateId;
@@ -86,4 +87,12 @@ public class ApiMachineTranslateDataVo implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml

@@ -203,7 +203,7 @@
 
                     select cb.b_id bId,co.o_id oId,cb.business_type_cd businessTypeCd  from c_orders co,c_business cb where co.o_id = cb.o_id
                     and cb.business_type_cd in ('110100030001','110100040001','110100050001','111100030001','111100050001')
-                    and cb.status_cd <> 'C1'
+                    and cb.status_cd = 'C'
 
         ]]>
     </select>
@@ -213,7 +213,7 @@
 
                 select cb.b_id bId,co.o_id oId,cb.business_type_cd businessTypeCd  from c_orders co,c_business cb where co.o_id = cb.o_id
                 and cb.business_type_cd in ('200200030001','200200040001','200200050001')
-                and cb.status_cd <> 'C1'
+                and cb.status_cd = 'C'
 
         ]]>
     </select>
@@ -224,7 +224,7 @@
 
                 select cb.b_id bId,co.o_id oId,cb.business_type_cd businessTypeCd  from c_orders co,c_business cb where co.o_id = cb.o_id
                 and cb.business_type_cd in ('240200040001','240200050001')
-                and cb.status_cd <> 'C1'
+                and cb.status_cd = 'C'
 
         ]]>
     </select>

java110-db/src/main/resources/mapper/hardwareAdapation/MachineTranslateServiceDaoImplMapper.xml

@@ -128,7 +128,7 @@ machine_id,machine_code,operate,type_cd,machine_translate_id,obj_id,obj_name,sta
         select t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code machineCode,t.type_cd,t.type_cd
         typeCd,t.machine_translate_id,t.machine_translate_id machineTranslateId,t.obj_id,t.obj_id
         objId,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name objName,t.state,t.community_id,t.community_id
-        communityId,t.b_id,t.b_id bId,td.name typeCdName,td1.name stateName
+        communityId,t.b_id,t.b_id bId,td.name typeCdName,td1.name stateName,t.create_time createTime
         from machine_translate t,t_dict td,t_dict td1
         where 1 =1
         and t.type_cd=td.status_cd
@@ -167,6 +167,7 @@ machine_id,machine_code,operate,type_cd,machine_translate_id,obj_id,obj_name,sta
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>