Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-06-26 e8d6c405c367e1bd501a6f6b4fa8cfa0dddbd806

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java

@@ -5,16 +5,18 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandType;
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.command.enums.LastOperateENUM;
import com.dy.pipIrrGlobal.command.result.CommandResultCode;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
@@ -42,8 +44,6 @@
 * @Description 命令支撑类
 */

//@Component
//@DependsOn({"baSettingsMapper", "prControllerMapper"})
public class ComSupport {
    protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;

@@ -64,11 +64,11 @@
    @Autowired
    private PrControllerMapper prControllerMapper;

    //@Autowired
    //private CommandSv commandSv;

    @Autowired
    private RmCommandHistoryMapper rmCommandHistoryMapper;

    @Autowired
    private SeVirtualCardMapper seVirtualCardMapper;

    public static ComSupport comSupport;

@@ -225,16 +225,19 @@
    }

    /**
     * 发送命令并处理请求结果及执行结果
     * 构造命令、发送命令并处理请求结果及执行结果
     * @param po
     * @return
     */
    protected BaseResponse dealWithCommandResult(Param po) {
    protected BaseResponse<Boolean> dealWithCommandResult(Param po) {
        Long comId = po.getComId();
        Byte comType = po.getComType();
        String commandCode = po.getCommandCode();
        String commandName = po.getCommandName();
        Long intakeId = po.getIntakeId();
        String rtuAddr = po.getRtuAddr();
        String protocol = po.getProtocol();
        Long vcId = po.getVcId();
        Object param = po.getParam();
        String rtuResultSendWebUrl = po.getRtuResultSendWebUrl();
        Long operator = po.getOperator();
@@ -245,28 +248,38 @@
        // 发送命令
        JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
        if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
            //if(1 > 0) {
            // 请求成功

            // 创建命令日志对象并添加到数据库中
            String commandName = CodeV202404.getCodeName(commandCode);
            RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
            //commandSv.insert(rmCommandHistory);
            rmCommandHistoryMapper.insert(rmCommandHistory);

            // 处理回调
            BaseResponse response_CallBack = dealWithCallBack(comId);

            // 回调失败
            // 回调异常
            if(!response_CallBack.getCode().equals("0001")) {
                // 命令日志执行结果改为失败
                rmCommandHistory = new RmCommandHistory();
                rmCommandHistory.setId(comId);
                rmCommandHistory.setResult((byte)0);
                //commandSv.updateCommandResult(rmCommandHistory);
                rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
                return BaseResponseUtils.buildFail(response_CallBack.getMsg());
                //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
                return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
            }

            // 回调超时
            if (response_CallBack.getContent().toString().equals(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
                /**
                 * 回调超时，暂时认为执行失败
                 * 命令置为失败
                 * 虚拟卡依旧保持使用中的状态
                 */

                rmCommandHistory = new RmCommandHistory();
                rmCommandHistory.setId(comId);
                rmCommandHistory.setResult((byte) 0);
                rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
                return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
            }

            // 回调成功，再判断执行是否成功
@@ -276,18 +289,33 @@
            System.out.println(job_subData);
            Boolean dealResult = job_subData.getBoolean("success");
            if(!dealResult) {
                return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
                return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
            }

            /**
             * 执行成功，返回回调内容
             * 如果是开关阀：更改虚拟卡状态：是否使用中、最后操作、最后操作时间
             */
            if(comType != null) {
                SeVirtualCard virtualCard = new SeVirtualCard();
                virtualCard.setId(vcId);
                if(comType == 1) {
                    virtualCard.setInUse((byte) 1);
                }else {
                    virtualCard.setInUse((byte) 0);
                }
                virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
                virtualCard.setLastOperateTime(new Date());
                seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
            }

            // 回调返回的内容
            Data myData = (Data)response_CallBack.getContent();
            return BaseResponseUtils.buildSuccess(myData) ;
        } else {
            // 请求失败
            JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
            return BaseResponseUtils.buildFail(job_param.getString("message"));
            return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
        }
    }
}