加入状态同步时间

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

@@ -22,10 +22,7 @@ import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 从订单中同步业主信息至设备中间表
@@ -168,6 +165,7 @@ public class TranslateOwnerToMachine implements Runnable {
         Map paramInfo = new HashMap();
         paramInfo.put("machineId", tmpMachineDto.getMachineId());
         paramInfo.put("objId", ownerDto.getMemberId());
+        paramInfo.put("statusCd", "0");
 
         int count = machineTranslateServiceDaoImpl.queryMachineTranslatesCount(paramInfo);
         if (count > 0) {
@@ -196,6 +194,7 @@ public class TranslateOwnerToMachine implements Runnable {
         info.put("objId", ownerDto.getMemberId());
         info.put("state", "10000");
         info.put("communityId", ownerDto.getCommunityId());
+        info.put("updateTime", new Date());
         machineTranslateServiceDaoImpl.updateMachineTranslate(info);
 
     }

WebService/src/main/resources/components/machinePackage/machineTranslate-manage/machineTranslateManage.html

@@ -75,11 +75,11 @@
                         <tr>
                             <th class="text-center">同步ID</th>
                             <th class="text-center">设备编码</th>
-                            <th class="text-center">设备ID</th>
                             <th class="text-center">对象类型</th>
                             <th class="text-center">对象名称</th>
                             <th class="text-center">对象Id</th>
                             <th class="text-center">状态</th>
+                            <th class="text-center">同步时间</th>
                             <th class="text-center">操作</th>
 
 
@@ -89,11 +89,11 @@
                         <tr v-for="machineTranslate in machineTranslateManageInfo.machineTranslates">
                             <td class="text-center">{{machineTranslate.machineTranslateId}}</td>
                             <td class="text-center">{{machineTranslate.machineCode}}</td>
-                            <td class="text-center">{{machineTranslate.machineId}}</td>
                             <td class="text-center">{{machineTranslate.typeCdName}}</td>
                             <td class="text-center">{{machineTranslate.objName}}</td>
                             <td class="text-center">{{machineTranslate.objId}}</td>
                             <td class="text-center">{{machineTranslate.stateName}}</td>
+                            <td class="text-center">{{machineTranslate.updateTime}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineTranslateDto.java

@@ -25,6 +25,7 @@ public class MachineTranslateDto extends PageDto implements Serializable {
     private String state;
     private String stateName;
     private String communityId;
+    private String updateTime;
 
 
     private Date createTime;
@@ -128,4 +129,12 @@ public class MachineTranslateDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
 }

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

@@ -15,6 +15,7 @@ public class ApiMachineTranslateDataVo implements Serializable {
     private String state;
     private String stateName;
     private String createTime;
+    private String updateTime;
 
     public String getMachineTranslateId() {
         return machineTranslateId;
@@ -95,4 +96,12 @@ public class ApiMachineTranslateDataVo implements Serializable {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
 }

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

@@ -19,8 +19,12 @@
              t.status_cd= #{statusCd},
         </if>
         <if test="state !=null and state != ''">
-             t.state= #{state}
+             t.state= #{state},
         </if>
+        <if test="updateTime !=null ">
+            t.update_time= #{updateTime}
+        </if>
+
         where 1=1
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -81,6 +85,8 @@ machine_id,machine_code,operate,type_cd,machine_translate_id,obj_id,obj_name,sta
             and t.b_id= #{bId}
         </if>
 
+
+
     </select>
 
 
@@ -167,7 +173,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
+        order by t.update_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>