Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2020-12-10 9943c60aca4c93600e54479d919d377e08a12ef4

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

@@ -20,7 +20,7 @@
import com.java110.dto.machine.MachineDto;
import com.java110.entity.order.Business;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.job.adapt.IDatabusAdapt;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.ximoIot.asyn.IXimoMachineAsyn;
import com.java110.po.machine.MachinePo;
import com.java110.utils.util.Assert;
@@ -38,7 +38,7 @@
 * @desc add by 吴学文 18:58
 */
@Component(value = "ximoModifyMachineTransactionIotAdapt")
public class XimoModifyMachineTransactionIotAdapt implements IDatabusAdapt {
public class XimoModifyMachineTransactionIotAdapt extends DatabusAdaptImpl {

    @Autowired
    private IXimoMachineAsyn ximoMachineAsynImpl;
@@ -67,6 +67,8 @@
            if (bObj instanceof JSONObject) {
                businessMachines = new JSONArray();
                businessMachines.add(bObj);
            } else if (bObj instanceof List) {
                businessMachines = JSONArray.parseArray(JSONObject.toJSONString(bObj));
            } else {
                businessMachines = (JSONArray) bObj;
            }
@@ -89,9 +91,9 @@

        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());