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

Your Name

2023-03-17 e20c58a63d3827d9c55cd5f387568fb0916b9590

 service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java

@@ -16,6 +16,7 @@
package com.java110.common.cmd.chargeMachine;

import com.alibaba.fastjson.JSONObject;
import com.java110.common.charge.IChargeCore;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
@@ -63,6 +64,9 @@
    @Autowired
    private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;

    @Autowired
    private IChargeCore chargeCoreImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
@@ -81,6 +85,9 @@
        if (count > 0) {
            chargeMachineDtos = chargeMachineV1InnerServiceSMOImpl.queryChargeMachines(chargeMachineDto);
            freshQrCodeUrl(chargeMachineDtos);

            // todo  查询设备是否在线
            queryMachineState(chargeMachineDtos);
        } else {
            chargeMachineDtos = new ArrayList<>();
        }
@@ -92,6 +99,15 @@
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }

    private void queryMachineState(List<ChargeMachineDto> chargeMachineDtos) {

        if(chargeMachineDtos == null || chargeMachineDtos.size() < 1 || chargeMachineDtos.size() > 10){
            return ;
        }

        chargeCoreImpl.queryChargeMachineState(chargeMachineDtos);
    }

    /**
     * 充电桩二维码
     *