优化代码

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

@@ -14,6 +14,15 @@
     </insert>
 
 
+    <insert id="saveMachineAttrs" parameterType="Map">
+        insert into machine_attrs(
+        machine_id,attr_id,spec_cd,community_id,b_id,value
+        ) values (
+        #{machineId},#{attrId},#{specCd},#{communityId},'-1',#{value}
+        )
+    </insert>
+
+
     <!-- 查询设备属性信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessMachineAttrInfo" parameterType="Map" resultType="Map">
         select t.machine_id,t.machine_id machineId,t.attr_id,t.attr_id attrId,t.operate,t.spec_cd,t.spec_cd

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

@@ -2,6 +2,7 @@ package com.java110.intf.common;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.machine.MachineAttrDto;
+import com.java110.po.machine.MachineAttrPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,4 +39,15 @@ public interface IMachineAttrInnerServiceSMO {
      */
     @RequestMapping(value = "/queryMachineAttrsCount", method = RequestMethod.POST)
     int queryMachineAttrsCount(@RequestBody MachineAttrDto machineAttrDto);
+
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param machineAttrPo 数据对象分享
+     * @return MachineAttrDto 对象数据
+     */
+    @RequestMapping(value = "/saveMachineAttrs", method = RequestMethod.POST)
+    int saveMachineAttrs(@RequestBody MachineAttrPo machineAttrPo);
+
 }

java110-interface/src/main/java/com/java110/intf/job/IBusinessDatabusInnerServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.intf;
+package com.java110.intf.job;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.businessDatabus.BusinessDatabusDto;

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

@@ -73,4 +73,5 @@ public interface IMachineAttrServiceDao {
      */
     int queryMachineAttrsCount(Map info);
 
+    int saveMachineAttrs(Map beanCovertMap);
 }

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

@@ -130,5 +130,11 @@ public class MachineAttrServiceDaoImpl extends BaseServiceDao implements IMachin
         return Integer.parseInt(businessMachineAttrInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public int saveMachineAttrs(Map info) {
+        int saveFlag = sqlSessionTemplate.update("machineAttrServiceDaoImpl.saveMachineAttrs", info);
+        return saveFlag;
+    }
+
 
 }

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

@@ -7,6 +7,7 @@ import com.java110.intf.common.IMachineAttrInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.machine.MachineAttrDto;
+import com.java110.po.machine.MachineAttrPo;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -52,6 +53,11 @@ public class MachineAttrInnerServiceSMOImpl extends BaseServiceSMO implements IM
         return machineAttrServiceDaoImpl.queryMachineAttrsCount(BeanConvertUtil.beanCovertMap(machineAttrDto));
     }
 
+    @Override
+    public int saveMachineAttrs(@RequestBody MachineAttrPo machineAttrPo) {
+        return machineAttrServiceDaoImpl.saveMachineAttrs(BeanConvertUtil.beanCovertMap(machineAttrPo));
+    }
+
     public IMachineAttrServiceDao getMachineAttrServiceDaoImpl() {
         return machineAttrServiceDaoImpl;
     }

service-job/src/main/java/com/java110/job/adapt/ximoIot/XimoDeleteMachineTransactionIotAdapt.java

@@ -21,10 +21,8 @@ import com.java110.dto.machine.MachineDto;
 import com.java110.entity.order.Business;
 import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
-import com.java110.job.adapt.IDatabusAdapt;
 import com.java110.job.adapt.ximoIot.asyn.IXimoMachineAsyn;
 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;
@@ -39,7 +37,7 @@ import java.util.List;
  * @desc add by 吴学文 18:58
  */
 @Component(value = "ximoDeleteMachineTransactionIotAdapt")
-public class XimoDeleteMachineTransactionIotAdapt  extends DatabusAdaptImpl {
+public class XimoDeleteMachineTransactionIotAdapt extends DatabusAdaptImpl {
 
     @Autowired
     private IXimoMachineAsyn ximoMachineAsynImpl;
@@ -68,7 +66,7 @@ public class XimoDeleteMachineTransactionIotAdapt  extends DatabusAdaptImpl {
             if (bObj instanceof JSONObject) {
                 businessMachines = new JSONArray();
                 businessMachines.add(bObj);
-            }  else if (bObj instanceof List) {
+            } else if (bObj instanceof List) {
                 businessMachines = JSONArray.parseArray(JSONObject.toJSONString(bObj));
             } else {
                 businessMachines = (JSONArray) bObj;
@@ -86,15 +84,15 @@ public class XimoDeleteMachineTransactionIotAdapt  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, "未找到设备");
+//        List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+//
+//        Assert.listOnlyOne(machineDtos, "未找到设备");
 
         MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
 
-        postParameters.add("extCommunityUuid", machineDtos.get(0));
-        //postParameters.add("devSn", machinePo.getMachineCode());
-        postParameters.add("uuids", machinePo.getMachineId());
+        postParameters.add("extCommunityUuid", machinePo.getCommunityId());
+        postParameters.add("devSns", machinePo.getMachineCode());
+        //postParameters.add("uuids", machinePo.getMachineId());
         ximoMachineAsynImpl.deleteSend(postParameters);
     }
 }

service-job/src/main/java/com/java110/job/adapt/ximoIot/XimoModifyMachineTransactionIotAdapt.java

@@ -91,9 +91,9 @@ public class XimoModifyMachineTransactionIotAdapt extends DatabusAdaptImpl {
 
         MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
 
-        postParameters.add("extCommunityUuid", machineDtos.get(0));
-        //postParameters.add("devSn", machinePo.getMachineCode());
-        postParameters.add("uuid", machinePo.getMachineId());
+        postParameters.add("extCommunityUuid", machineDtos.get(0).getCommunityId());
+        postParameters.add("devSn", machinePo.getMachineCode());
+        //postParameters.add("uuid", machinePo.getMachineId());
         postParameters.add("name", machinePo.getMachineName());
         postParameters.add("positionType", "0");
         postParameters.add("positionUuid", machinePo.getCommunityId());

service-job/src/main/java/com/java110/job/adapt/ximoIot/asyn/impl/XimoMachineAsynImpl.java

@@ -17,9 +17,14 @@ package com.java110.job.adapt.ximoIot.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.intf.common.IMachineAttrInnerServiceSMO;
+import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.job.adapt.ximoIot.GetToken;
 import com.java110.job.adapt.ximoIot.XimoIotConstant;
 import com.java110.job.adapt.ximoIot.asyn.IXimoMachineAsyn;
+import com.java110.po.machine.MachineAttrPo;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,6 +47,12 @@ public class XimoMachineAsynImpl implements IXimoMachineAsyn {
     @Autowired
     private RestTemplate formRestTemplate;
 
+    @Autowired
+    private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
+    @Autowired
+    private IMachineAttrInnerServiceSMO machineAttrInnerServiceSMOImpl;
+
     @Override
     @Async
     public void send(MultiValueMap<String, Object> postParameters, List<MultiValueMap<String, Object>> ownerDtos) {
@@ -63,6 +74,24 @@ public class XimoMachineAsynImpl implements IXimoMachineAsyn {
             return;
         }
 
+        JSONObject data = tokenObj.getJSONObject("data");
+        String devMac = data.getString("devMac");
+        String appEkey = data.getString("appEkey");
+
+        MachineDto machinePo = new MachineDto();
+        machinePo.setMachineId(data.getString("uuid"));
+        machinePo.setState("1700");
+        machinePo.setMachineMac(devMac);
+        machineInnerServiceSMOImpl.updateMachineState(machinePo);
+
+        MachineAttrPo machineAttrPo = new MachineAttrPo();
+        machineAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+        machineAttrPo.setCommunityId(postParameters.get("extCommunityUuid").get(0).toString());
+        machineAttrPo.setSpecCd("7127015495");
+        machineAttrPo.setMachineId(data.getString("uuid"));
+        machineAttrPo.setValue(appEkey);
+        machineAttrInnerServiceSMOImpl.saveMachineAttrs(machineAttrPo);
+
         for (MultiValueMap<String, Object> owner : ownerDtos) {
             sendOwner(owner);
         }

service-job/src/main/java/com/java110/job/bmo/businessDatabus/impl/DeleteBusinessDatabusBMOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.job.bmo.businessDatabus.impl;
 
 import com.java110.core.annotation.Java110Transactional;
-import com.java110.intf.IBusinessDatabusInnerServiceSMO;
+import com.java110.intf.job.IBusinessDatabusInnerServiceSMO;
 import com.java110.job.bmo.businessDatabus.IDeleteBusinessDatabusBMO;
 import com.java110.po.businessDatabus.BusinessDatabusPo;
 import com.java110.vo.ResultVo;

service-job/src/main/java/com/java110/job/bmo/businessDatabus/impl/GetBusinessDatabusBMOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.job.bmo.businessDatabus.impl;
 
 import com.java110.dto.businessDatabus.BusinessDatabusDto;
-import com.java110.intf.IBusinessDatabusInnerServiceSMO;
+import com.java110.intf.job.IBusinessDatabusInnerServiceSMO;
 import com.java110.job.bmo.businessDatabus.IGetBusinessDatabusBMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;

service-job/src/main/java/com/java110/job/bmo/businessDatabus/impl/SaveBusinessDatabusBMOImpl.java

@@ -2,7 +2,7 @@ package com.java110.job.bmo.businessDatabus.impl;
 
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.IBusinessDatabusInnerServiceSMO;
+import com.java110.intf.job.IBusinessDatabusInnerServiceSMO;
 import com.java110.job.bmo.businessDatabus.ISaveBusinessDatabusBMO;
 import com.java110.po.businessDatabus.BusinessDatabusPo;
 import com.java110.vo.ResultVo;

service-job/src/main/java/com/java110/job/bmo/businessDatabus/impl/UpdateBusinessDatabusBMOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.job.bmo.businessDatabus.impl;
 
 import com.java110.core.annotation.Java110Transactional;
-import com.java110.intf.IBusinessDatabusInnerServiceSMO;
+import com.java110.intf.job.IBusinessDatabusInnerServiceSMO;
 import com.java110.job.bmo.businessDatabus.IUpdateBusinessDatabusBMO;
 import com.java110.po.businessDatabus.BusinessDatabusPo;
 import com.java110.vo.ResultVo;

service-job/src/main/java/com/java110/job/smo/impl/BusinessDatabusInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@ package com.java110.job.smo.impl;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.businessDatabus.BusinessDatabusDto;
-import com.java110.intf.IBusinessDatabusInnerServiceSMO;
+import com.java110.intf.job.IBusinessDatabusInnerServiceSMO;
 import com.java110.job.dao.IBusinessDatabusServiceDao;
 import com.java110.po.businessDatabus.BusinessDatabusPo;
 import com.java110.utils.util.BeanConvertUtil;