优化加入日志功能

service-job/src/main/java/com/java110/job/adapt/hcIotNew/OwnerDataToIotImpl.java

@@ -2,20 +2,28 @@ package com.java110.job.adapt.hcIotNew;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.file.FileDto;
 import com.java110.dto.file.FileRelDto;
+import com.java110.dto.machine.MachineTranslateDto;
+import com.java110.dto.machine.MachineTranslateErrorDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.dto.room.RoomDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.common.IMachineTranslateErrorInnerServiceSMO;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
 import com.java110.intf.community.IRoomV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
 import com.java110.job.adapt.hcIotNew.http.ISendIot;
+import com.java110.po.machine.MachineTranslateErrorPo;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +48,9 @@ public class OwnerDataToIotImpl implements IOwnerDataToIot{
     @Autowired
     private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
 
+    @Autowired
+    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
+
     @Autowired
     private ISendIot sendIotImpl;
 
@@ -62,9 +73,47 @@ public class OwnerDataToIotImpl implements IOwnerDataToIot{
         //todo 查询业主车辆
         getOwnerCars(paramIn, ownerDto);
 
-        sendIotImpl.post("/iot/api/owner.addOwnerApi",paramIn);
+        ResultVo resultVo = sendIotImpl.post("/iot/api/owner.addOwnerApi",paramIn);
+
+        if(resultVo.getCode() != ResultVo.CODE_OK){
+            saveTranslateLog(ownerDto.getCommunityId(),MachineTranslateDto.CMD_ADD_OWNER_FACE,
+                    ownerDto.getMemberId(),ownerDto.getName(),
+                    MachineTranslateDto.STATE_ERROR,resultVo.getMsg());
+            return ;
+        }
+
+        saveTranslateLog(ownerDto.getCommunityId(),MachineTranslateDto.CMD_ADD_OWNER_FACE,
+                ownerDto.getMemberId(),ownerDto.getName(),
+                MachineTranslateDto.STATE_SUCCESS,resultVo.getMsg());
+
+
     }
 
+
+    /**
+     * 存储交互 记录
+     *
+     * @param communityId
+     */
+    public void saveTranslateLog(String communityId,String cmd,String objId,String objName,String state,String remark) {
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        machineTranslateDto.setCommunityId(communityId);
+        machineTranslateDto.setMachineCmd(cmd);
+        machineTranslateDto.setMachineCode("-1");
+        machineTranslateDto.setMachineId("-1");
+        machineTranslateDto.setObjId(objId);
+        machineTranslateDto.setObjName(objName);
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
+        machineTranslateDto.setRemark(remark);
+        machineTranslateDto.setState(state);
+        machineTranslateDto.setbId("-1");
+        machineTranslateDto.setObjBId("-1");
+        machineTranslateDto.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        machineTranslateInnerServiceSMOImpl.saveMachineTranslate(machineTranslateDto);
+    }
+
+
     /**
      * 查询业主车辆
      *

service-job/src/main/java/com/java110/job/adapt/hcIotNew/SendCarDataToIotAdapt.java

@@ -1,9 +1,12 @@
 package com.java110.job.adapt.hcIotNew;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.machine.MachineTranslateDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.system.Business;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
@@ -12,6 +15,7 @@ import com.java110.job.adapt.hcIotNew.http.ISendIot;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -32,6 +36,9 @@ public class SendCarDataToIotAdapt extends DatabusAdaptImpl {
     @Autowired
     private IOwnerDataToIot ownerDataToIotImpl;
 
+    @Autowired
+    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
+
     @Autowired
     private ISendIot sendIotImpl;
 
@@ -96,6 +103,39 @@ public class SendCarDataToIotAdapt extends DatabusAdaptImpl {
         car.put("endTime", DateUtil.getFormatTimeStringA(tmpOwnerCarDto.getEndTime()));
         car.put("leaseType", tmpOwnerCarDto.getLeaseType());
 
-        sendIotImpl.post("/iot/api/car.addCarApi", car);
+        ResultVo resultVo = sendIotImpl.post("/iot/api/car.addCarApi", car);
+        if (resultVo.getCode() != ResultVo.CODE_OK) {
+            saveTranslateLog(ownerDto.getCommunityId(), MachineTranslateDto.CMD_ADD_OWNER_CAR,
+                    car.getString("carMemberId"), car.getString("carNum"),
+                    MachineTranslateDto.STATE_ERROR, resultVo.getMsg());
+            return;
+        }
+
+        saveTranslateLog(ownerDto.getCommunityId(), MachineTranslateDto.CMD_ADD_OWNER_CAR,
+                car.getString("carMemberId"), car.getString("carNum"),
+                MachineTranslateDto.STATE_SUCCESS, resultVo.getMsg());
+    }
+
+    /**
+     * 存储交互 记录
+     *
+     * @param communityId
+     */
+    public void saveTranslateLog(String communityId, String cmd, String objId, String objName, String state, String remark) {
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        machineTranslateDto.setCommunityId(communityId);
+        machineTranslateDto.setMachineCmd(cmd);
+        machineTranslateDto.setMachineCode("-1");
+        machineTranslateDto.setMachineId("-1");
+        machineTranslateDto.setObjId(objId);
+        machineTranslateDto.setObjName(objName);
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER_CAR);
+        machineTranslateDto.setRemark(remark);
+        machineTranslateDto.setState(state);
+        machineTranslateDto.setbId("-1");
+        machineTranslateDto.setObjBId("-1");
+        machineTranslateDto.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        machineTranslateInnerServiceSMOImpl.saveMachineTranslate(machineTranslateDto);
     }
 }

service-job/src/main/java/com/java110/job/adapt/hcIotNew/SendDeleteCarDataToIotAdapt.java

@@ -1,9 +1,12 @@
 package com.java110.job.adapt.hcIotNew;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.machine.MachineTranslateDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.system.Business;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
@@ -11,6 +14,7 @@ import com.java110.job.adapt.hcIotNew.http.ISendIot;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -31,6 +35,9 @@ public class SendDeleteCarDataToIotAdapt extends DatabusAdaptImpl {
     @Autowired
     private IOwnerDataToIot ownerDataToIotImpl;
 
+    @Autowired
+    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
+
     @Autowired
     private ISendIot sendIotImpl;
 
@@ -59,6 +66,40 @@ public class SendDeleteCarDataToIotAdapt extends DatabusAdaptImpl {
         car.put("communityId", ownerCarDtos.get(0).getCommunityId());
         car.put("carMemberId", tmpOwnerCarDto.getMemberId());
 
-        sendIotImpl.post("/iot/api/car.deleteCarApi", car);
+        ResultVo resultVo = sendIotImpl.post("/iot/api/car.deleteCarApi", car);
+
+        if (resultVo.getCode() != ResultVo.CODE_OK) {
+            saveTranslateLog(ownerCarDtos.get(0).getCommunityId(), MachineTranslateDto.CMD_DELETE_OWNER_CAR,
+                    ownerCarDtos.get(0).getMemberId(), ownerCarDtos.get(0).getCarNum(),
+                    MachineTranslateDto.STATE_ERROR, resultVo.getMsg());
+            return;
+        }
+
+        saveTranslateLog(ownerCarDtos.get(0).getCommunityId(), MachineTranslateDto.CMD_DELETE_OWNER_CAR,
+                ownerCarDtos.get(0).getMemberId(), ownerCarDtos.get(0).getCarNum(),
+                MachineTranslateDto.STATE_SUCCESS, resultVo.getMsg());
+    }
+
+    /**
+     * 存储交互 记录
+     *
+     * @param communityId
+     */
+    public void saveTranslateLog(String communityId, String cmd, String objId, String objName, String state, String remark) {
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        machineTranslateDto.setCommunityId(communityId);
+        machineTranslateDto.setMachineCmd(cmd);
+        machineTranslateDto.setMachineCode("-1");
+        machineTranslateDto.setMachineId("-1");
+        machineTranslateDto.setObjId(objId);
+        machineTranslateDto.setObjName(objName);
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER_CAR);
+        machineTranslateDto.setRemark(remark);
+        machineTranslateDto.setState(state);
+        machineTranslateDto.setbId("-1");
+        machineTranslateDto.setObjBId("-1");
+        machineTranslateDto.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        machineTranslateInnerServiceSMOImpl.saveMachineTranslate(machineTranslateDto);
     }
 }

service-job/src/main/java/com/java110/job/adapt/hcIotNew/SendDeleteOwnerDataToIotAdapt.java

@@ -1,14 +1,18 @@
 package com.java110.job.adapt.hcIotNew;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.machine.MachineTranslateDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.system.Business;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIotNew.http.ISendIot;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -26,6 +30,9 @@ public class SendDeleteOwnerDataToIotAdapt extends DatabusAdaptImpl {
     @Autowired
     private IOwnerDataToIot ownerDataToIotImpl;
 
+    @Autowired
+    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
+
     @Autowired
     private ISendIot sendIotImpl;
     @Override
@@ -52,7 +59,41 @@ public class SendDeleteOwnerDataToIotAdapt extends DatabusAdaptImpl {
         car.put("memberId", ownerDtos.get(0).getMemberId());
 
 
-        sendIotImpl.post("/iot/api/owner.deleteOwnerApi", car);
+       ResultVo resultVo = sendIotImpl.post("/iot/api/owner.deleteOwnerApi", car);
+
+        if(resultVo.getCode() != ResultVo.CODE_OK){
+            saveTranslateLog(ownerDto.getCommunityId(),MachineTranslateDto.CMD_DELETE_OWNER_FACE,
+                    ownerDtos.get(0).getMemberId(),ownerDtos.get(0).getName(),
+                    MachineTranslateDto.STATE_ERROR,resultVo.getMsg());
+            return ;
+        }
+
+        saveTranslateLog(ownerDto.getCommunityId(),MachineTranslateDto.CMD_DELETE_OWNER_FACE,
+                ownerDtos.get(0).getMemberId(),ownerDtos.get(0).getName(),
+                MachineTranslateDto.STATE_SUCCESS,resultVo.getMsg());
+    }
+
 
+    /**
+     * 存储交互 记录
+     *
+     * @param communityId
+     */
+    public void saveTranslateLog(String communityId,String cmd,String objId,String objName,String state,String remark) {
+        MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+        machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        machineTranslateDto.setCommunityId(communityId);
+        machineTranslateDto.setMachineCmd(cmd);
+        machineTranslateDto.setMachineCode("-1");
+        machineTranslateDto.setMachineId("-1");
+        machineTranslateDto.setObjId(objId);
+        machineTranslateDto.setObjName(objName);
+        machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
+        machineTranslateDto.setRemark(remark);
+        machineTranslateDto.setState(state);
+        machineTranslateDto.setbId("-1");
+        machineTranslateDto.setObjBId("-1");
+        machineTranslateDto.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        machineTranslateInnerServiceSMOImpl.saveMachineTranslate(machineTranslateDto);
     }
 }

service-job/src/main/java/com/java110/job/adapt/hcIotNew/SendOwnerDataToIotAdapt.java

@@ -5,7 +5,6 @@ import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.system.Business;
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
-import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;

service-job/src/main/java/com/java110/job/adapt/hcIotNew/http/SendIotImpl.java

@@ -3,9 +3,13 @@ package com.java110.job.adapt.hcIotNew.http;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.machine.MachineTranslateErrorDto;
 import com.java110.dto.system.AppRoute;
+import com.java110.intf.common.IMachineTranslateErrorInnerServiceSMO;
 import com.java110.job.adapt.hcIot.GetToken;
 import com.java110.job.adapt.hcIot.IotConstant;
+import com.java110.po.machine.MachineTranslateErrorPo;
 import com.java110.utils.cache.AppRouteCache;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.cache.MappingCache;
@@ -33,6 +37,10 @@ public class SendIotImpl implements ISendIot {
     @Autowired
     private RestTemplate outRestTemplate;
 
+    @Autowired
+    private IMachineTranslateErrorInnerServiceSMO machineTranslateErrorInnerServiceSMOImpl;
+
+
     @Override
     public ResultVo get(String url) {
         HttpHeaders header = getHeaders(url, "", HttpMethod.POST);
@@ -42,7 +50,6 @@ public class SendIotImpl implements ISendIot {
         String body = tokenRes.getBody();
         JSONObject paramOut = JSONObject.parseObject(body);
 
-
         return new ResultVo(paramOut.getIntValue("code"), paramOut.getString("msg"), paramOut.getJSONObject("data"));
     }
 
@@ -56,11 +63,31 @@ public class SendIotImpl implements ISendIot {
         String body = tokenRes.getBody();
         JSONObject paramOut = JSONObject.parseObject(body);
 
+        if(paramOut.getIntValue("code") != ResultVo.CODE_OK){
+            saveTranslateError(paramIn.getString("communityId"),paramIn.toJSONString(),body,url);
+        }
+
 
         return new ResultVo(paramOut.getIntValue("code"), paramOut.getString("msg"), paramOut.getJSONObject("data"));
     }
 
 
+
+    public void saveTranslateError(String communityId,String reqJson, String resJson, String url) {
+        MachineTranslateErrorPo machineTranslateErrorPo = new MachineTranslateErrorPo();
+        machineTranslateErrorPo.setLogId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_logId));
+        machineTranslateErrorPo.setCommunityId(communityId);
+        machineTranslateErrorPo.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+        machineTranslateErrorPo.setReqBody(reqJson);
+        machineTranslateErrorPo.setReqHeader("");
+        machineTranslateErrorPo.setResBody(resJson);
+        machineTranslateErrorPo.setReqPath(url);
+        machineTranslateErrorPo.setCommunityId("-1");
+        machineTranslateErrorPo.setReqType(MachineTranslateErrorDto.REQ_TYPE_URL);
+        machineTranslateErrorInnerServiceSMOImpl.saveMachineTranslateError(machineTranslateErrorPo);
+    }
+
+
     /**
      * 封装头信息
      *