优化代码

java110-bean/src/main/java/com/java110/dto/machineTranslateError/MachineTranslateErrorDto.java

@@ -0,0 +1,95 @@
+package com.java110.dto.machineTranslateError;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description IOT同步错误日志记录数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class MachineTranslateErrorDto extends PageDto implements Serializable {
+
+    private String reqHeader;
+    private String machineTranslateId;
+    private String resBody;
+    private String reqBody;
+    private String logId;
+    private String communityId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getReqHeader() {
+        return reqHeader;
+    }
+
+    public void setReqHeader(String reqHeader) {
+        this.reqHeader = reqHeader;
+    }
+
+    public String getMachineTranslateId() {
+        return machineTranslateId;
+    }
+
+    public void setMachineTranslateId(String machineTranslateId) {
+        this.machineTranslateId = machineTranslateId;
+    }
+
+    public String getResBody() {
+        return resBody;
+    }
+
+    public void setResBody(String resBody) {
+        this.resBody = resBody;
+    }
+
+    public String getReqBody() {
+        return reqBody;
+    }
+
+    public void setReqBody(String reqBody) {
+        this.reqBody = reqBody;
+    }
+
+    public String getLogId() {
+        return logId;
+    }
+
+    public void setLogId(String logId) {
+        this.logId = logId;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/machineTranslateError/MachineTranslateErrorPo.java

@@ -0,0 +1,72 @@
+package com.java110.po.machineTranslateError;
+
+import java.io.Serializable;
+
+public class MachineTranslateErrorPo implements Serializable {
+
+    private String reqHeader;
+    private String machineTranslateId;
+    private String resBody;
+    private String reqBody;
+    private String logId;
+    private String statusCd = "0";
+    private String communityId;
+
+    public String getReqHeader() {
+        return reqHeader;
+    }
+
+    public void setReqHeader(String reqHeader) {
+        this.reqHeader = reqHeader;
+    }
+
+    public String getMachineTranslateId() {
+        return machineTranslateId;
+    }
+
+    public void setMachineTranslateId(String machineTranslateId) {
+        this.machineTranslateId = machineTranslateId;
+    }
+
+    public String getResBody() {
+        return resBody;
+    }
+
+    public void setResBody(String resBody) {
+        this.resBody = resBody;
+    }
+
+    public String getReqBody() {
+        return reqBody;
+    }
+
+    public void setReqBody(String reqBody) {
+        this.reqBody = reqBody;
+    }
+
+    public String getLogId() {
+        return logId;
+    }
+
+    public void setLogId(String logId) {
+        this.logId = logId;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+
+}

java110-db/src/main/resources/mapper/common/MachineTranslateErrorServiceDaoImplMapper.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="machineTranslateErrorServiceDaoImpl">
+
+
+    <!-- 保存IOT同步错误日志记录信息 add by wuxw 2018-07-03 -->
+    <insert id="saveMachineTranslateErrorInfo" parameterType="Map">
+        insert into machine_translate_error(
+        req_header,machine_translate_id,res_body,req_body,log_id,community_id
+        ) values (
+        #{reqHeader},#{machineTranslateId},#{resBody},#{reqBody},#{logId},#{communityId}
+        )
+    </insert>
+
+
+    <!-- 查询IOT同步错误日志记录信息 add by wuxw 2018-07-03 -->
+    <select id="getMachineTranslateErrorInfo" parameterType="Map" resultType="Map">
+        select t.req_header,t.req_header reqHeader,t.machine_translate_id,t.machine_translate_id
+        machineTranslateId,t.res_body,t.res_body resBody,t.req_body,t.req_body reqBody,t.log_id,t.log_id
+        logId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId
+        from machine_translate_error t
+        where 1 =1
+        <if test="reqHeader !=null and reqHeader != ''">
+            and t.req_header= #{reqHeader}
+        </if>
+        <if test="machineTranslateId !=null and machineTranslateId != ''">
+            and t.machine_translate_id= #{machineTranslateId}
+        </if>
+        <if test="resBody !=null and resBody != ''">
+            and t.res_body= #{resBody}
+        </if>
+        <if test="reqBody !=null and reqBody != ''">
+            and t.req_body= #{reqBody}
+        </if>
+        <if test="logId !=null and logId != ''">
+            and t.log_id= #{logId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改IOT同步错误日志记录信息 add by wuxw 2018-07-03 -->
+    <update id="updateMachineTranslateErrorInfo" parameterType="Map">
+        update machine_translate_error t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="reqHeader !=null and reqHeader != ''">
+            , t.req_header= #{reqHeader}
+        </if>
+        <if test="machineTranslateId !=null and machineTranslateId != ''">
+            , t.machine_translate_id= #{machineTranslateId}
+        </if>
+        <if test="resBody !=null and resBody != ''">
+            , t.res_body= #{resBody}
+        </if>
+        <if test="reqBody !=null and reqBody != ''">
+            , t.req_body= #{reqBody}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="logId !=null and logId != ''">
+            and t.log_id= #{logId}
+        </if>
+
+    </update>
+
+    <!-- 查询IOT同步错误日志记录数量 add by wuxw 2018-07-03 -->
+    <select id="queryMachineTranslateErrorsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from machine_translate_error t
+        where 1 =1
+        <if test="reqHeader !=null and reqHeader != ''">
+            and t.req_header= #{reqHeader}
+        </if>
+        <if test="machineTranslateId !=null and machineTranslateId != ''">
+            and t.machine_translate_id= #{machineTranslateId}
+        </if>
+        <if test="resBody !=null and resBody != ''">
+            and t.res_body= #{resBody}
+        </if>
+        <if test="reqBody !=null and reqBody != ''">
+            and t.req_body= #{reqBody}
+        </if>
+        <if test="logId !=null and logId != ''">
+            and t.log_id= #{logId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+
+
+    </select>
+
+</mapper>

java110-generator/src/main/resources/newBack/template_1.json

@@ -1,30 +1,25 @@
 {
   "autoMove": true,
-  "id": "auId",
-  "name": "staffAppAuth",
-  "desc": "员工微信认证",
-  "shareParam": "storeId",
-  "shareColumn": "store_id",
-  "shareName": "user",
-  "tableName": "staff_app_auth",
+  "id": "logId",
+  "name": "machineTranslateError",
+  "desc": "IOT同步错误日志记录",
+  "shareParam": "communityId",
+  "shareColumn": "community_id",
+  "shareName": "common",
+  "tableName": "machine_translate_error",
   "param": {
-    "auId": "au_id",
-    "staffId": "staff_id",
-    "storeId": "store_id",
-    "appType": "app_type",
-    "openId": "open_id",
-    "state": "state",
-    "openName": "open_name",
+    "logId": "log_id",
+    "machineTranslateId": "machine_translate_id",
+    "communityId": "community_id",
+    "reqHeader": "req_header",
+    "reqBody": "req_body",
+    "resBody": "res_body",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "staffId",
-      "msg": "员工不能为空"
-    },
-    {
-      "code": "appType",
-      "msg": "应用类型不能为空"
+      "code": "logId",
+      "msg": "ID不能为空"
     }
   ]
 }

java110-interface/src/main/java/com/java110/intf/common/IMachineTranslateErrorInnerServiceSMO.java

@@ -0,0 +1,52 @@
+package com.java110.intf.common;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.machineTranslateError.MachineTranslateErrorDto;
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IMachineTranslateErrorInnerServiceSMO
+ * @Description IOT同步错误日志记录接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/machineTranslateErrorApi")
+public interface IMachineTranslateErrorInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveMachineTranslateError", method = RequestMethod.POST)
+    public int saveMachineTranslateError(@RequestBody MachineTranslateErrorPo machineTranslateErrorPo);
+
+    @RequestMapping(value = "/updateMachineTranslateError", method = RequestMethod.POST)
+    public int updateMachineTranslateError(@RequestBody MachineTranslateErrorPo machineTranslateErrorPo);
+
+    @RequestMapping(value = "/deleteMachineTranslateError", method = RequestMethod.POST)
+    public int deleteMachineTranslateError(@RequestBody MachineTranslateErrorPo machineTranslateErrorPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param machineTranslateErrorDto 数据对象分享
+     * @return MachineTranslateErrorDto 对象数据
+     */
+    @RequestMapping(value = "/queryMachineTranslateErrors", method = RequestMethod.POST)
+    List<MachineTranslateErrorDto> queryMachineTranslateErrors(@RequestBody MachineTranslateErrorDto machineTranslateErrorDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param machineTranslateErrorDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryMachineTranslateErrorsCount", method = RequestMethod.POST)
+    int queryMachineTranslateErrorsCount(@RequestBody MachineTranslateErrorDto machineTranslateErrorDto);
+}

service-common/src/main/java/com/java110/common/api/MachineApi.java

@@ -6,15 +6,14 @@ import com.java110.common.bmo.attrValue.IGetAttrValueBMO;
 import com.java110.common.bmo.attrValue.ISaveAttrValueBMO;
 import com.java110.common.bmo.attrValue.IUpdateAttrValueBMO;
 import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
+import com.java110.common.bmo.machineTranslateError.IGetMachineTranslateErrorBMO;
+import com.java110.dto.machineTranslateError.MachineTranslateErrorDto;
 import com.java110.po.attrValue.AttrValuePo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @RestController
@@ -24,6 +23,9 @@ public class MachineApi {
     @Autowired
     private IMachineOpenDoorBMO machineOpenDoorBMOImpl;
 
+    @Autowired
+    private IGetMachineTranslateErrorBMO getMachineTranslateErrorBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -44,4 +46,22 @@ public class MachineApi {
     }
 
 
+    /**
+     * 微信删除消息模板
+     * @serviceCode /machine/queryMachineTranslateError
+     * @path /app/machine/queryMachineTranslateError
+     * @param communityId 小区ID
+     * @return
+     */
+    @RequestMapping(value = "/queryMachineTranslateError", method = RequestMethod.GET)
+    public ResponseEntity<String> queryMachineTranslateError(@RequestParam(value = "communityId") String communityId,
+                                                             @RequestParam(value = "page") int page,
+                                                             @RequestParam(value = "row") int row) {
+        MachineTranslateErrorDto machineTranslateErrorDto = new MachineTranslateErrorDto();
+        machineTranslateErrorDto.setPage(page);
+        machineTranslateErrorDto.setRow(row);
+        machineTranslateErrorDto.setCommunityId(communityId);
+        return getMachineTranslateErrorBMOImpl.get(machineTranslateErrorDto);
+    }
+
 }

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/IDeleteMachineTranslateErrorBMO.java

@@ -0,0 +1,19 @@
+package com.java110.common.bmo.machineTranslateError;
+
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteMachineTranslateErrorBMO {
+
+
+    /**
+     * 修改IOT同步错误日志记录
+     * add by wuxw
+     *
+     * @param machineTranslateErrorPo
+     * @return
+     */
+    ResponseEntity<String> delete(MachineTranslateErrorPo machineTranslateErrorPo);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/IGetMachineTranslateErrorBMO.java

@@ -0,0 +1,19 @@
+package com.java110.common.bmo.machineTranslateError;
+
+import com.java110.dto.machineTranslateError.MachineTranslateErrorDto;
+import org.springframework.http.ResponseEntity;
+
+public interface IGetMachineTranslateErrorBMO {
+
+
+    /**
+     * 查询IOT同步错误日志记录
+     * add by wuxw
+     *
+     * @param machineTranslateErrorDto
+     * @return
+     */
+    ResponseEntity<String> get(MachineTranslateErrorDto machineTranslateErrorDto);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/ISaveMachineTranslateErrorBMO.java

@@ -0,0 +1,19 @@
+package com.java110.common.bmo.machineTranslateError;
+
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import org.springframework.http.ResponseEntity;
+
+public interface ISaveMachineTranslateErrorBMO {
+
+
+    /**
+     * 添加IOT同步错误日志记录
+     * add by wuxw
+     *
+     * @param machineTranslateErrorPo
+     * @return
+     */
+    ResponseEntity<String> save(MachineTranslateErrorPo machineTranslateErrorPo);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/IUpdateMachineTranslateErrorBMO.java

@@ -0,0 +1,19 @@
+package com.java110.common.bmo.machineTranslateError;
+
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateMachineTranslateErrorBMO {
+
+
+    /**
+     * 修改IOT同步错误日志记录
+     * add by wuxw
+     *
+     * @param machineTranslateErrorPo
+     * @return
+     */
+    ResponseEntity<String> update(MachineTranslateErrorPo machineTranslateErrorPo);
+
+
+}

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/impl/DeleteMachineTranslateErrorBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.common.bmo.machineTranslateError.impl;
+
+import com.java110.common.bmo.machineTranslateError.IDeleteMachineTranslateErrorBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.common.IMachineTranslateErrorInnerServiceSMO;
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteMachineTranslateErrorBMOImpl")
+public class DeleteMachineTranslateErrorBMOImpl implements IDeleteMachineTranslateErrorBMO {
+
+    @Autowired
+    private IMachineTranslateErrorInnerServiceSMO machineTranslateErrorInnerServiceSMOImpl;
+
+    /**
+     * @param machineTranslateErrorPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(MachineTranslateErrorPo machineTranslateErrorPo) {
+
+        int flag = machineTranslateErrorInnerServiceSMOImpl.deleteMachineTranslateError(machineTranslateErrorPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/impl/GetMachineTranslateErrorBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.common.bmo.machineTranslateError.impl;
+
+import com.java110.common.bmo.machineTranslateError.IGetMachineTranslateErrorBMO;
+import com.java110.dto.machineTranslateError.MachineTranslateErrorDto;
+import com.java110.intf.common.IMachineTranslateErrorInnerServiceSMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getMachineTranslateErrorBMOImpl")
+public class GetMachineTranslateErrorBMOImpl implements IGetMachineTranslateErrorBMO {
+
+    @Autowired
+    private IMachineTranslateErrorInnerServiceSMO machineTranslateErrorInnerServiceSMOImpl;
+
+    /**
+     * @param machineTranslateErrorDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(MachineTranslateErrorDto machineTranslateErrorDto) {
+
+
+        int count = machineTranslateErrorInnerServiceSMOImpl.queryMachineTranslateErrorsCount(machineTranslateErrorDto);
+
+        List<MachineTranslateErrorDto> machineTranslateErrorDtos = null;
+        if (count > 0) {
+            machineTranslateErrorDtos = machineTranslateErrorInnerServiceSMOImpl.queryMachineTranslateErrors(machineTranslateErrorDto);
+        } else {
+            machineTranslateErrorDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) machineTranslateErrorDto.getRow()), count, machineTranslateErrorDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/impl/SaveMachineTranslateErrorBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.common.bmo.machineTranslateError.impl;
+
+import com.java110.common.bmo.machineTranslateError.ISaveMachineTranslateErrorBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IMachineTranslateErrorInnerServiceSMO;
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveMachineTranslateErrorBMOImpl")
+public class SaveMachineTranslateErrorBMOImpl implements ISaveMachineTranslateErrorBMO {
+
+    @Autowired
+    private IMachineTranslateErrorInnerServiceSMO machineTranslateErrorInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param machineTranslateErrorPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(MachineTranslateErrorPo machineTranslateErrorPo) {
+
+        machineTranslateErrorPo.setLogId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_logId));
+        int flag = machineTranslateErrorInnerServiceSMOImpl.saveMachineTranslateError(machineTranslateErrorPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-common/src/main/java/com/java110/common/bmo/machineTranslateError/impl/UpdateMachineTranslateErrorBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.common.bmo.machineTranslateError.impl;
+
+import com.java110.common.bmo.machineTranslateError.IUpdateMachineTranslateErrorBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.common.IMachineTranslateErrorInnerServiceSMO;
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateMachineTranslateErrorBMOImpl")
+public class UpdateMachineTranslateErrorBMOImpl implements IUpdateMachineTranslateErrorBMO {
+
+    @Autowired
+    private IMachineTranslateErrorInnerServiceSMO machineTranslateErrorInnerServiceSMOImpl;
+
+    /**
+     * @param machineTranslateErrorPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(MachineTranslateErrorPo machineTranslateErrorPo) {
+
+        int flag = machineTranslateErrorInnerServiceSMOImpl.updateMachineTranslateError(machineTranslateErrorPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-common/src/main/java/com/java110/common/dao/IMachineTranslateErrorServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.common.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * IOT同步错误日志记录组件内部之间使用，没有给外围系统提供服务能力
+ * IOT同步错误日志记录服务接口类，要求全部以字符串传输，方便微服务化
+ * 新建客户，修改客户，删除客户，查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IMachineTranslateErrorServiceDao {
+
+
+    /**
+     * 保存 IOT同步错误日志记录信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveMachineTranslateErrorInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询IOT同步错误日志记录信息（instance过程）
+     * 根据bId 查询IOT同步错误日志记录信息
+     * @param info bId 信息
+     * @return IOT同步错误日志记录信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getMachineTranslateErrorInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改IOT同步错误日志记录信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateMachineTranslateErrorInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询IOT同步错误日志记录总数
+     *
+     * @param info IOT同步错误日志记录信息
+     * @return IOT同步错误日志记录数量
+     */
+    int queryMachineTranslateErrorsCount(Map info);
+
+}

service-common/src/main/java/com/java110/common/dao/impl/MachineTranslateErrorServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.common.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.common.dao.IMachineTranslateErrorServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * IOT同步错误日志记录服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("machineTranslateErrorServiceDaoImpl")
+//@Transactional
+public class MachineTranslateErrorServiceDaoImpl extends BaseServiceDao implements IMachineTranslateErrorServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(MachineTranslateErrorServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存IOT同步错误日志记录信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveMachineTranslateErrorInfo(Map info) throws DAOException {
+        logger.debug("保存IOT同步错误日志记录信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("machineTranslateErrorServiceDaoImpl.saveMachineTranslateErrorInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存IOT同步错误日志记录信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询IOT同步错误日志记录信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getMachineTranslateErrorInfo(Map info) throws DAOException {
+        logger.debug("查询IOT同步错误日志记录信息 入参 info : {}",info);
+
+        List<Map> businessMachineTranslateErrorInfos = sqlSessionTemplate.selectList("machineTranslateErrorServiceDaoImpl.getMachineTranslateErrorInfo",info);
+
+        return businessMachineTranslateErrorInfos;
+    }
+
+
+    /**
+     * 修改IOT同步错误日志记录信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateMachineTranslateErrorInfo(Map info) throws DAOException {
+        logger.debug("修改IOT同步错误日志记录信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("machineTranslateErrorServiceDaoImpl.updateMachineTranslateErrorInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改IOT同步错误日志记录信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询IOT同步错误日志记录数量
+     * @param info IOT同步错误日志记录信息
+     * @return IOT同步错误日志记录数量
+     */
+    @Override
+    public int queryMachineTranslateErrorsCount(Map info) {
+        logger.debug("查询IOT同步错误日志记录数据 入参 info : {}",info);
+
+        List<Map> businessMachineTranslateErrorInfos = sqlSessionTemplate.selectList("machineTranslateErrorServiceDaoImpl.queryMachineTranslateErrorsCount", info);
+        if (businessMachineTranslateErrorInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessMachineTranslateErrorInfos.get(0).get("count").toString());
+    }
+
+
+}

service-common/src/main/java/com/java110/common/smo/impl/MachineTranslateErrorInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.common.smo.impl;
+
+
+import com.java110.common.dao.IMachineTranslateErrorServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.machineTranslateError.MachineTranslateErrorDto;
+import com.java110.intf.common.IMachineTranslateErrorInnerServiceSMO;
+import com.java110.po.machineTranslateError.MachineTranslateErrorPo;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description IOT同步错误日志记录内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class MachineTranslateErrorInnerServiceSMOImpl extends BaseServiceSMO implements IMachineTranslateErrorInnerServiceSMO {
+
+    @Autowired
+    private IMachineTranslateErrorServiceDao machineTranslateErrorServiceDaoImpl;
+
+
+    @Override
+    public int saveMachineTranslateError(@RequestBody MachineTranslateErrorPo machineTranslateErrorPo) {
+        int saveFlag = 1;
+        machineTranslateErrorServiceDaoImpl.saveMachineTranslateErrorInfo(BeanConvertUtil.beanCovertMap(machineTranslateErrorPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateMachineTranslateError(@RequestBody MachineTranslateErrorPo machineTranslateErrorPo) {
+        int saveFlag = 1;
+        machineTranslateErrorServiceDaoImpl.updateMachineTranslateErrorInfo(BeanConvertUtil.beanCovertMap(machineTranslateErrorPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteMachineTranslateError(@RequestBody MachineTranslateErrorPo machineTranslateErrorPo) {
+        int saveFlag = 1;
+        machineTranslateErrorPo.setStatusCd("1");
+        machineTranslateErrorServiceDaoImpl.updateMachineTranslateErrorInfo(BeanConvertUtil.beanCovertMap(machineTranslateErrorPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<MachineTranslateErrorDto> queryMachineTranslateErrors(@RequestBody MachineTranslateErrorDto machineTranslateErrorDto) {
+
+        //校验是否传了 分页信息
+
+        int page = machineTranslateErrorDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            machineTranslateErrorDto.setPage((page - 1) * machineTranslateErrorDto.getRow());
+        }
+
+        List<MachineTranslateErrorDto> machineTranslateErrors = BeanConvertUtil.covertBeanList(machineTranslateErrorServiceDaoImpl.getMachineTranslateErrorInfo(BeanConvertUtil.beanCovertMap(machineTranslateErrorDto)), MachineTranslateErrorDto.class);
+
+        return machineTranslateErrors;
+    }
+
+
+    @Override
+    public int queryMachineTranslateErrorsCount(@RequestBody MachineTranslateErrorDto machineTranslateErrorDto) {
+        return machineTranslateErrorServiceDaoImpl.queryMachineTranslateErrorsCount(BeanConvertUtil.beanCovertMap(machineTranslateErrorDto));
+    }
+
+    public IMachineTranslateErrorServiceDao getMachineTranslateErrorServiceDaoImpl() {
+        return machineTranslateErrorServiceDaoImpl;
+    }
+
+    public void setMachineTranslateErrorServiceDaoImpl(IMachineTranslateErrorServiceDao machineTranslateErrorServiceDaoImpl) {
+        this.machineTranslateErrorServiceDaoImpl = machineTranslateErrorServiceDaoImpl;
+    }
+}

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

@@ -22,11 +22,14 @@ 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.IMachineTranslateErrorInnerServiceSMO;
 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.po.machineTranslateError.MachineTranslateErrorPo;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,6 +64,9 @@ public class IotSendAsynImpl implements IIotSendAsyn {
     @Autowired
     private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
 
+    @Autowired
+    private IMachineTranslateErrorInnerServiceSMO machineTranslateErrorInnerServiceSMOImpl;
+
     /**
      * 封装头信息
      *
@@ -87,9 +93,10 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
+            responseEntity = outRestTemplate.exchange(IotConstant.ADD_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
             logger.debug("调用HC IOT信息：" + responseEntity);
             JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
 
@@ -101,6 +108,7 @@ public class IotSendAsynImpl implements IIotSendAsyn {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
         } finally {
             saveTranslateLog(machineTranslateDto);
         }
@@ -119,20 +127,24 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.UPDATE_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
+            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"));
                 //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
         } finally {
             saveTranslateLog(machineTranslateDto);
         }
@@ -151,20 +163,23 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_COMMUNITY_URL, HttpMethod.POST, httpEntity, String.class);
+            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"));
                 //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
         } finally {
             saveTranslateLog(machineTranslateDto);
         }
@@ -189,15 +204,17 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
+            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());
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
                 return;
             }
             JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
@@ -206,12 +223,16 @@ public class IotSendAsynImpl implements IIotSendAsyn {
                 machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
                 machineTranslateDto.setRemark(tokenObj.getString("msg"));
                 //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
                 return;
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
             return;
         } finally {
             saveTranslateLog(machineTranslateDto);
@@ -241,15 +262,18 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.UPDATE_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
+            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());
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
                 return;
             }
             JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
@@ -258,12 +282,14 @@ public class IotSendAsynImpl implements IIotSendAsyn {
                 machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
                 machineTranslateDto.setRemark(tokenObj.getString("msg"));
                 //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
-
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
         } finally {
             saveTranslateLog(machineTranslateDto);
         }
@@ -281,13 +307,16 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_MACHINE_URL, HttpMethod.POST, httpEntity, String.class);
+            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());
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
                 return;
             }
             JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
@@ -296,12 +325,14 @@ public class IotSendAsynImpl implements IIotSendAsyn {
                 machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
                 machineTranslateDto.setRemark(tokenObj.getString("msg"));
                 //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
-
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
         } finally {
             saveTranslateLog(machineTranslateDto);
         }
@@ -320,14 +351,16 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.ADD_OWNER, HttpMethod.POST, httpEntity, String.class);
+            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());
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
                 return;
             }
             JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
@@ -335,12 +368,16 @@ public class IotSendAsynImpl implements IIotSendAsyn {
             if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
                 machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
                 machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
                 //保存 失败报文
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
 
         } finally {
             saveTranslateLog(machineTranslateDto);
@@ -359,13 +396,16 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.EDIT_OWNER, HttpMethod.POST, httpEntity, String.class);
+            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());
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
                 return;
             }
             JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
@@ -374,11 +414,14 @@ public class IotSendAsynImpl implements IIotSendAsyn {
                 machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
                 machineTranslateDto.setRemark(tokenObj.getString("msg"));
                 //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
 
         } finally {
             saveTranslateLog(machineTranslateDto);
@@ -398,14 +441,17 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
         machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
         machineTranslateDto.setRemark("同步物联网系统成功");
+        ResponseEntity<String> responseEntity = null;
         try {
             HttpEntity httpEntity = new HttpEntity(postParameters, getHeaders());
-            ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.DELETE_OWNER, HttpMethod.POST, httpEntity, String.class);
+            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());
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
                 return;
             }
             JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
@@ -414,11 +460,15 @@ public class IotSendAsynImpl implements IIotSendAsyn {
                 machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
                 machineTranslateDto.setRemark(tokenObj.getString("msg"));
                 //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
             }
         } catch (Exception e) {
             machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
             machineTranslateDto.setRemark(e.getLocalizedMessage());
             //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "");
+
 
         } finally {
             saveTranslateLog(machineTranslateDto);
@@ -432,11 +482,25 @@ public class IotSendAsynImpl implements IIotSendAsyn {
      */
     public void saveTranslateLog(MachineTranslateDto machineTranslateDto) {
         machineTranslateDto.setbId("-1");
-        machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        if (StringUtil.isEmpty(machineTranslateDto.getMachineTranslateId())) {
+            machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        }
         machineTranslateDto.setObjBId("-1");
         machineTranslateDto.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         machineTranslateInnerServiceSMOImpl.saveMachineTranslate(machineTranslateDto);
     }
 
+    public void saveTranslateError(MachineTranslateDto machineTranslateDto, String reqJson, String resJson) {
+        machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        MachineTranslateErrorPo machineTranslateErrorPo = new MachineTranslateErrorPo();
+        machineTranslateErrorPo.setLogId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_logId));
+        machineTranslateErrorPo.setCommunityId(machineTranslateDto.getCommunityId());
+        machineTranslateErrorPo.setMachineTranslateId(machineTranslateDto.getMachineTranslateId());
+        machineTranslateErrorPo.setReqBody(reqJson);
+        machineTranslateErrorPo.setReqHeader("");
+        machineTranslateErrorPo.setResBody(resJson);
+        machineTranslateErrorInnerServiceSMOImpl.saveMachineTranslateError(machineTranslateErrorPo);
+    }
+
 
 }

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

@@ -40,7 +40,7 @@ import java.util.List;
  *
  * @desc add by 吴学文 18:58
  */
-@Component(value = "hcDeleteOwnerTransactionIotAdapt")
+@Component(value = "deleteOwnerToIotAdapt")
 public class DeleteOwnerToIotAdapt extends DatabusAdaptImpl {
 
     @Autowired