优化代码

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

@@ -1,6 +1,7 @@
 package com.java110.dto.machine;
 
 import com.java110.dto.PageDto;
+import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,6 +16,39 @@ import java.util.Date;
  **/
 public class MachineTranslateDto extends PageDto implements Serializable {
 
+    /**
+     * 301	添加设备
+     * 302	编辑设备
+     * 303	删除设备
+     * 401	添加小区
+     * 402	编辑小区
+     * 403	删除小区
+     * 501	添加业主人脸
+     * 502	编辑业主人脸
+     * 503	删除业主人脸
+     */
+    public static final String CMD_ADD_MACHINE = "301";
+    public static final String CMD_UPDATE_MACHINE = "302";
+    public static final String CMD_DELETE_MACHINE = "303";
+    public static final String CMD_ADD_COMMUNITY = "401";
+    public static final String CMD_UPDATE_COMMUNITY = "402";
+    public static final String CMD_DELETE_COMMUNITY = "403";
+    public static final String CMD_ADD_OWNER_FACE = "501";
+    public static final String CMD_UPDATE_OWNER_FACE = "502";
+    public static final String CMD_DELETE_OWNER_FACE = "503";
+
+    //小区信息
+    public static final String TYPE_COMMUNITY = "9988";
+    public static final String TYPE_MACHINE = "3344";
+    public static final String TYPE_OWNER = "8899";
+
+    //同步状态
+    public static final String STATE_SUCCESS = "20000";
+
+    //同步失败
+    public static final String STATE_ERROR = "60000";
+
+
     private String machineId;
     private String machineCode;
     private String typeCd;
@@ -175,6 +209,9 @@ public class MachineTranslateDto extends PageDto implements Serializable {
     }
 
     public void setRemark(String remark) {
+        if (!StringUtils.isEmpty(remark) && remark.length() > 190) {
+            remark = remark.substring(0, 190);
+        }
         this.remark = remark;
     }
 }

service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/IIotSendAsyn.java

@@ -65,7 +65,7 @@ public interface IIotSendAsyn {
      */
     void updateMachine(JSONObject postParameters);
 
-    void deleteSend(JSONObject postParameters);
+    void deleteMachine(JSONObject postParameters);
 
     public void addOwner(JSONObject postParameters);
 

service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java

@@ -17,12 +17,16 @@ package com.java110.job.adapt.hcIot.asyn.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.client.RestTemplate;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.machine.MachineDto;
+import com.java110.dto.machine.MachineTranslateDto;
 import com.java110.intf.common.IMachineAttrInnerServiceSMO;
 import com.java110.intf.common.IMachineInnerServiceSMO;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
 import com.java110.job.adapt.hcIot.GetToken;
 import com.java110.job.adapt.hcIot.IotConstant;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
+import com.java110.utils.util.DateUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,7 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.util.MultiValueMap;
 
 import java.util.List;
 
@@ -55,6 +58,9 @@ public class IotSendAsynImpl implements IIotSendAsyn {
     @Autowired
     private IMachineAttrInnerServiceSMO machineAttrInnerServiceSMOImpl;
 
+    @Autowired
+    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
+
     /**
      * 封装头信息
      *
@@ -71,25 +77,97 @@ public class IotSendAsynImpl implements IIotSendAsyn {
     @Override
     @Async
     public void addCommunity(JSONObject postParameters) {
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
-        logger.debug("调用HC IOT信息：" + responseEntity);
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_COMMUNITY);
+        machineTranslateDto.setMachineCode("-");
+        machineTranslateDto.setMachineId("-");
+        machineTranslateDto.setObjId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setObjName(postParameters.getString("name"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
+            logger.debug("调用HC IOT信息：" + responseEntity);
+            JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+
+            if (paramOut.getInteger("code") != ResultVo.CODE_OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(paramOut.getString("msg"));
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
     }
 
     @Override
     @Async
     public void editCommunity(JSONObject postParameters) {
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.UPDATE_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
-        logger.debug("调用HC IOT信息：" + responseEntity);
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_COMMUNITY);
+        machineTranslateDto.setMachineCode("-");
+        machineTranslateDto.setMachineId("-");
+        machineTranslateDto.setObjId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setObjName(postParameters.getString("name"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.UPDATE_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
+            logger.debug("调用HC IOT信息：" + responseEntity);
+            JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+            if (paramOut.getInteger("code") != ResultVo.CODE_OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(paramOut.getString("msg"));
+                //保存 失败报文
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
     }
 
     @Override
     @Async
     public void deleteCommunity(JSONObject postParameters) {
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
-        logger.debug("调用HC IOT信息：" + responseEntity);
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_DELETE_COMMUNITY);
+        machineTranslateDto.setMachineCode("-");
+        machineTranslateDto.setMachineId("-");
+        machineTranslateDto.setObjId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setObjName(postParameters.getString("name"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
+            logger.debug("调用HC IOT信息：" + responseEntity);
+            JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+            if (paramOut.getInteger("code") != ResultVo.CODE_OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(paramOut.getString("msg"));
+                //保存 失败报文
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
     }
 
     /**
@@ -101,18 +179,42 @@ public class IotSendAsynImpl implements IIotSendAsyn {
     @Override
     @Async
     public void addMachine(JSONObject postParameters, List<JSONObject> ownerDtos) {
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
-
-        logger.debug("调用HC IOT信息：" + responseEntity);
-
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            return;
-        }
-        JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
-
-        if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_MACHINE);
+        machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
+        machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjName(postParameters.getString("machineName"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
+
+            logger.debug("调用HC IOT信息：" + responseEntity);
+
+            if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(responseEntity.getBody());
+                return;
+            }
+            JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+            if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                //保存 失败报文
+                return;
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
             return;
+        } finally {
+            saveTranslateLog(machineTranslateDto);
         }
 
         MachineDto machinePo = new MachineDto();
@@ -129,46 +231,212 @@ public class IotSendAsynImpl implements IIotSendAsyn {
     @Override
     @Async
     public void updateMachine(JSONObject postParameters) {
-
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.UPDATE_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
-
-        logger.debug("调用HC IOT信息：" + responseEntity);
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_MACHINE);
+        machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
+        machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjName(postParameters.getString("machineName"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.UPDATE_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
+
+            logger.debug("调用HC IOT信息：" + responseEntity);
+
+            if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(responseEntity.getBody());
+                return;
+            }
+            JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+            if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                //保存 失败报文
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
     }
 
     @Override
-    public void deleteSend(JSONObject postParameters) {
-
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
-
-        logger.debug("调用HC IOT信息：" + responseEntity);
+    public void deleteMachine(JSONObject postParameters) {
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_DELETE_MACHINE);
+        machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
+        machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjName(postParameters.getString("machineName"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
+            logger.debug("调用HC IOT信息：" + responseEntity);
+            if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(responseEntity.getBody());
+                return;
+            }
+            JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+            if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                //保存 失败报文
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
     }
 
     @Override
     public void addOwner(JSONObject postParameters) {
 
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_OWNER, HttpMethod.POST, httpEntity, String.class);
-
-        logger.debug("调用HC IOT信息：" + responseEntity);
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_OWNER_FACE);
+        machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
+        machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjId(postParameters.getString("userId"));
+        machineTranslateDto.setObjName(postParameters.getString("name"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_OWNER, HttpMethod.POST, httpEntity, String.class);
+
+            logger.debug("调用HC IOT信息：" + responseEntity);
+            if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(responseEntity.getBody());
+                return;
+            }
+            JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+            if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                //保存 失败报文
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
     }
 
     @Override
     public void sendUpdateOwner(JSONObject postParameters) {
-
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.EDIT_OWNER, HttpMethod.POST, httpEntity, String.class);
-
-        logger.debug("调用HC IOT信息：" + responseEntity);
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_OWNER_FACE);
+        machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
+        machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjId(postParameters.getString("userId"));
+        machineTranslateDto.setObjName(postParameters.getString("name"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.EDIT_OWNER, HttpMethod.POST, httpEntity, String.class);
+            logger.debug("调用HC IOT信息：" + responseEntity);
+            if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(responseEntity.getBody());
+                return;
+            }
+            JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+            if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                //保存 失败报文
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
     }
 
     @Override
     public void sendDeleteOwner(JSONObject postParameters) {
 
-        HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_OWNER, HttpMethod.POST, httpEntity, String.class);
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+        machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_OWNER_FACE);
+        machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
+        machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
+        machineTranslateDto.setObjId(postParameters.getString("userId"));
+        machineTranslateDto.setObjName(postParameters.getString("name"));
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
+        machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+        machineTranslateDto.setRemark("同步物联网系统成功");
+        try {
+            HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
+            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_OWNER, HttpMethod.POST, httpEntity, String.class);
+
+            logger.debug("调用HC IOT信息：" + responseEntity);
+            if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(responseEntity.getBody());
+                return;
+            }
+            JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+            if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                //保存 失败报文
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+        }
+    }
 
-        logger.debug("调用HC IOT信息：" + responseEntity);
+    /**
+     * 存储交互 记录
+     *
+     * @param machineTranslateDto
+     */
+    public void saveTranslateLog(MachineTranslateDto machineTranslateDto) {
+        machineTranslateDto.setbId("-1");
+        machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        machineTranslateDto.setObjBId("-1");
+        machineTranslateDto.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        machineTranslateInnerServiceSMOImpl.saveMachineTranslate(machineTranslateDto);
     }
+
+
 }

service-job/src/main/java/com/java110/job/adapt/hcIot/community/DeleteCommunityToIotAdapt.java

@@ -85,6 +85,7 @@ public class DeleteCommunityToIotAdapt extends DatabusAdaptImpl {
         CommunityPo communityPo = BeanConvertUtil.covertBean(businessCommunity, CommunityPo.class);
         JSONObject postParameters = new JSONObject();
         postParameters.put("extCommunityId", communityPo.getCommunityId());
+        postParameters.put("name", communityPo.getName());
         iotSendAsynImpl.deleteCommunity(postParameters);
     }
 

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java

@@ -214,7 +214,8 @@ public class AddMachineToIotAdapt extends DatabusAdaptImpl {
             postParameters.put("name", tOwnerDto.getName());
             postParameters.put("idNumber", tOwnerDto.getIdCard());
             postParameters.put("machineCode", machinePo.getMachineCode());
-
+            postParameters.put("extMachineId", machinePo.getMachineId());
+            postParameters.put("extCommunityId", machinePo.getCommunityId());
             ownerDtos.add(postParameters);
         }
 

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteMachineToIotAdapt.java

@@ -23,6 +23,7 @@ import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.machine.MachinePo;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -47,7 +48,7 @@ public class DeleteMachineToIotAdapt extends DatabusAdaptImpl {
 
     /**
      * {
-     *     "extMachineId": "702020042194860037"
+     * "extMachineId": "702020042194860037"
      * }
      *
      * @param business   当前处理业务
@@ -79,8 +80,13 @@ public class DeleteMachineToIotAdapt extends DatabusAdaptImpl {
         MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
         MachineDto machineDto = new MachineDto();
         machineDto.setMachineId(machinePo.getMachineId());
+        List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+        Assert.listOnlyOne(machineDtos, "未找到设备");
         JSONObject postParameters = new JSONObject();
         postParameters.put("extMachineId", machinePo.getMachineId());
-        hcMachineAsynImpl.deleteSend(postParameters);
+        postParameters.put("machineCode", machineDtos.get(0).getMachineCode());
+        postParameters.put("machineName", machineDtos.get(0).getMachineName());
+        postParameters.put("extCommunityId", machineDtos.get(0).getCommunityId());
+        hcMachineAsynImpl.deleteMachine(postParameters);
     }
 }

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java

@@ -149,6 +149,8 @@ public class AddOwnerToIotAdapt extends DatabusAdaptImpl {
             postParameters.put("name", ownerPo.getName());
             postParameters.put("idNumber", ownerPo.getIdCard());
             postParameters.put("machineCode", tmpMachineDto.getMachineCode());
+            postParameters.put("extMachineId", tmpMachineDto.getMachineId());
+            postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
             hcMachineAsynImpl.addOwner(postParameters);
         }
 

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java

@@ -18,8 +18,10 @@ package com.java110.job.adapt.hcIot.owner;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.machine.MachineDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.entity.order.Business;
 import com.java110.intf.common.IMachineInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.owner.OwnerPo;
@@ -81,6 +83,7 @@ public class DeleteOwnerToIotAdapt extends DatabusAdaptImpl {
 
         OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
 
+
         //拿到小区ID
         String communityId = ownerPo.getCommunityId();
         //根据小区ID查询现有设备
@@ -97,9 +100,11 @@ public class DeleteOwnerToIotAdapt extends DatabusAdaptImpl {
                 continue;
             }
             JSONObject postParameters = new JSONObject();
-
             postParameters.put("machineCode", tmpMachineDto.getMachineCode());
             postParameters.put("userId", ownerPo.getMemberId());
+            postParameters.put("name", ownerPo.getName());
+            postParameters.put("extMachineId", tmpMachineDto.getMachineId());
+            postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
             hcMachineAsynImpl.sendDeleteOwner(postParameters);
         }
 

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/EditOwnerToIotAdapt.java

@@ -151,6 +151,8 @@ public class EditOwnerToIotAdapt extends DatabusAdaptImpl {
             postParameters.put("name", ownerPo.getName());
             postParameters.put("idNumber", ownerPo.getIdCard());
             postParameters.put("machineCode", tmpMachineDto.getMachineCode());
+            postParameters.put("extMachineId", tmpMachineDto.getMachineId());
+            postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
             hcMachineAsynImpl.sendUpdateOwner(postParameters);
         }
 

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java

@@ -169,6 +169,8 @@ public class OwnerBindRoomToIotAdapt extends DatabusAdaptImpl {
             postParameters.put("name", tOwnerDto.getName());
             postParameters.put("idNumber", tOwnerDto.getIdCard());
             postParameters.put("machineCode", tmpMachineDto.getMachineCode());
+            postParameters.put("extMachineId", tmpMachineDto.getMachineId());
+            postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
             hcMachineAsynImpl.addOwner(postParameters);
         }
     }

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java

@@ -142,6 +142,9 @@ public class OwnerUnBindRoomToIotAdapt extends DatabusAdaptImpl {
             JSONObject postParameters = new JSONObject();
             postParameters.put("machineCode", tmpMachineDto.getMachineCode());
             postParameters.put("userId", tOwnerDto.getMemberId());
+            postParameters.put("name", tOwnerDto.getName());
+            postParameters.put("extMachineId", tmpMachineDto.getMachineId());
+            postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
             hcMachineAsynImpl.sendDeleteOwner(postParameters);
         }
     }