加入重新同步 工鞥呢

928255095 · 928255095 · commit 024c67a60591 · 2020-12-26T14:25:10.000+08:00
diff --git a/java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java
@@ -50,4 +50,13 @@ public interface IDataBusInnerServiceSMO {
      */
     @RequestMapping(value = "/restartMachine", method = RequestMethod.POST)
     ResultVo restartMachine(@RequestBody JSONObject reqJson);
+
+    /**
+     * <p>重启设备</p>
+     *
+     * @param reqJson 请求信息
+     * @return TaskDto 对象数据
+     */
+    @RequestMapping(value = "/resendIot", method = RequestMethod.POST)
+    ResultVo resendIot(@RequestBody JSONObject reqJson);
 }
diff --git a/service-common/src/main/java/com/java110/common/api/MachineApi.java b/service-common/src/main/java/com/java110/common/api/MachineApi.java
@@ -51,6 +51,21 @@ public ResponseEntity<String> restartMachine(@RequestBody JSONObject reqJson) {
     }
 
 
+    /**
+     * 重新送物联网系统
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /machine/resendIot
+     * @path /app/machine/resendIot
+     */
+    @RequestMapping(value = "/resendIot", method = RequestMethod.POST)
+    public ResponseEntity<String> resendIot(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "machineTranslateId", "未包含同步ID");
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
+        return machineOpenDoorBMOImpl.resendIot(reqJson);
+    }
+
     /**
      * 微信删除消息模板
      *
diff --git a/service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java b/service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java
@@ -36,4 +36,12 @@ public interface IMachineOpenDoorBMO {
      * @return
      */
     ResponseEntity<String> restartMachine(JSONObject reqJson);
+
+    /**
+     * 开门接口类
+     *
+     * @param reqJson 请求报文信息
+     * @return
+     */
+    ResponseEntity<String> resendIot(JSONObject reqJson);
 }
diff --git a/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java
@@ -58,4 +58,10 @@ public ResponseEntity<String> restartMachine(JSONObject reqJson) {
         ResultVo resultVo = dataBusInnerServiceSMOImpl.restartMachine(reqJson);
         return ResultVo.createResponseEntity(resultVo);
     }
+
+    @Override
+    public ResponseEntity<String> resendIot(JSONObject reqJson) {
+        ResultVo resultVo = dataBusInnerServiceSMOImpl.resendIot(reqJson);
+        return ResultVo.createResponseEntity(resultVo);
+    }
 }
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/ReSendIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/ReSendIotAdapt.java
@@ -26,11 +26,15 @@
 /**
  * 重新同步
  *
+ * 当设备信息失败是可以重新送HC物联系统
+ *
+ * 物联网系统 代码地址 https://gitee.com/java110/MicroCommunityThings
+ *
  * 接口协议地址： https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
  *
  * @desc add by 吴学文 15:29
  */
-@Component(value = "openDoorAdapt")
+@Component(value = "reSendIotAdapt")
 public class ReSendIotAdapt extends DatabusAdaptImpl {
 
     @Autowired
diff --git a/service-job/src/main/java/com/java110/job/smo/impl/DataBusInnerServiceSMOImpl.java b/service-job/src/main/java/com/java110/job/smo/impl/DataBusInnerServiceSMOImpl.java
@@ -56,6 +56,13 @@ public ResultVo restartMachine(@RequestBody JSONObject reqJson) {
 
     }
 
+    @Override
+    public ResultVo resendIot(@RequestBody JSONObject reqJson) {
+        IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_START_MACHINE_PROTOCOL, IDatabusAdapt.class);
+        return databusAdaptImpl.reSendToIot(reqJson);
+
+    }
+
     /**
      * 处理业务类
      *

Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,10 @@ public ResponseEntity<String> restartMachine(JSONObject reqJson) {`
`58`	`58`	`ResultVo resultVo = dataBusInnerServiceSMOImpl.restartMachine(reqJson);`
`59`	`59`	`return ResultVo.createResponseEntity(resultVo);`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ @Override`
	`63`	`+ public ResponseEntity<String> resendIot(JSONObject reqJson) {`
	`64`	`+ ResultVo resultVo = dataBusInnerServiceSMOImpl.resendIot(reqJson);`
	`65`	`+ return ResultVo.createResponseEntity(resultVo);`
	`66`	`+ }`
`61`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,13 @@ public ResultVo restartMachine(@RequestBody JSONObject reqJson) {`
`56`	`56`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ @Override`
	`60`	`+ public ResultVo resendIot(@RequestBody JSONObject reqJson) {`
	`61`	`+ IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_START_MACHINE_PROTOCOL, IDatabusAdapt.class);`
	`62`	`+ return databusAdaptImpl.reSendToIot(reqJson);`
	`63`	`+`
	`64`	`+ }`
	`65`	`+`
`59`	`66`	`/**`
`60`	`67`	`* 处理业务类`
`61`	`68`	`*`