2024-10-31 农户问题上报添加接口、查询接口、删除接口，在线查询代码优化

zhubaomin

2024-10-31 e77ae508afddfd24d8e713a63dfe2b3f46e9f070

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

@@ -11,14 +11,17 @@
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.PrCommonIntakesMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoPr.PrCommonIntakes;
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.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -48,13 +51,20 @@
    //@Value("${mw.comSendUrl}")
    protected String comSendUrl;

    protected static String controllerType = null;
    protected static Integer projectNo = null;
    //protected static String controllerType = null;
    //protected static Integer projectNo = null;

    @Value("${project.projectNo}")
    protected Integer projectNo;

    @Value("${project.controllerType}")
    protected String controllerType;

    protected String commandTypeOuter = CommandType.outerCommand;

    // 存储实例化的 CompletableFuture<Data> 对象
    protected static Map<Long, Object> features = new HashMap<>();
    protected static Boolean setuped = false;
    //protected static Boolean setuped = false;

    @Autowired
    private RestTemplate restTemplate;
@@ -70,6 +80,9 @@

    @Autowired
    private SeVirtualCardMapper seVirtualCardMapper;

    @Autowired
    private PrCommonIntakesMapper prCommonIntakesMapper;

    public static ComSupport comSupport;

@@ -89,11 +102,11 @@
    /**
     * 获取系统配置参数
     */
    public void setUp() {
        controllerType = comSupport.baSettingsMapper.getItemValue("controllerType");
        projectNo = Integer.parseInt(comSupport.baSettingsMapper.getItemValue("projectNo"));
        setuped = true;
    }
    //public void setUp() {
    //    controllerType = comSupport.baSettingsMapper.getItemValue("controllerType");
    //    projectNo = Integer.parseInt(comSupport.baSettingsMapper.getItemValue("projectNo"));
    //    setuped = true;
    //}

    /**
     * 生成订单号
@@ -178,8 +191,9 @@
        com.type = commandTypeOuter;
        com.rtuResultSendWebUrl = rtuResultSendWebUrl;

        com.param = param;

        if(param != null) {
            com.param = param;
        }
        return com;
    }

@@ -190,7 +204,7 @@
     * @return
     */
    protected BaseResponse<Data> dealWithCallBack(Long comId, Command com) {
        CompletableFuture<Data> feature = new CompletableFuture<>();
        CompletableFuture<JSONObject> feature = new CompletableFuture<>();
        features.put(comId, feature);
        try {
            // 发送命令
@@ -202,9 +216,10 @@
                return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
            }

            Data resultData = feature.get(180, TimeUnit.SECONDS);
            JSONObject resultData = feature.get(180, TimeUnit.SECONDS);
            features.remove(comId);
            Long commandId = Long.parseLong(resultData.getCommandId());

            Long commandId = resultData.getLong("commandId");
            if (commandId.equals(comId)) {
                return BaseResponseUtils.buildSuccess(resultData);
            } else {
@@ -239,6 +254,10 @@
        } catch (Exception e) {
            e.printStackTrace();
        }

        if(response == null) {
            return BaseResponseUtils.buildErrorMsg("中间件调用失败");
        }
        return response.getBody();
    }

@@ -269,6 +288,9 @@
        rmCommandHistoryMapper.insert(rmCommandHistory);
        comId = rmCommandHistory.getComId();

        // 添加常用取水口或更新使用信息
        addCommonIntake(operator, intakeId);

        /**
         * 处理回调
         * feature准备就绪后发送命令
@@ -283,7 +305,8 @@
            rmCommandHistory.setComId(comId);
            rmCommandHistory.setResult((byte) 0);
            rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
            return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
            //return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
            return BaseResponseUtils.buildErrorMsg(response_CallBack.getMsg());
        }

        // 回调超时
@@ -301,27 +324,7 @@
            return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
        }

        // 回调成功，再判断执行是否成功
        JSONObject job_content = (JSONObject) JSON.toJSON(response_CallBack.getContent());
        JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
        Boolean dealResult = job_subData.getBoolean("success");
        if (!dealResult) {
            /**
             * 执行失败
             * 更新执行结果、返回结果时间、结果内容
             */
            rmCommandHistory = new RmCommandHistory();
            rmCommandHistory.setComId(comId);
            rmCommandHistory.setResult((byte) 0);
            rmCommandHistory.setResultTime(new Date());
            //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
            rmCommandHistory.setResultText(response_CallBack.getContent().toString());
            rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
            return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
        }

        /**
         * 执行成功
         * 如果是开关阀：更改虚拟卡状态：是否使用中、最后操作、最后操作时间
         * 更新执行结果、返回结果时间、结果内容
         * 返回回调内容
@@ -339,9 +342,52 @@
            seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
        }

        // 回调返回的内容，回调结果写入命令日志表的任务由中间件完成
        Data myData = (Data) response_CallBack.getContent();
        return BaseResponseUtils.buildSuccess(myData);
        // 如果是开发命令（92-平台开阀，91-小程序开阀），返回结果中添加阀控器地址、虚拟卡编号、订单号
        if(commandCode.equals("92") || commandCode.equals("97")) {
            JSONObject job_response = (JSONObject) JSON.toJSON(response_CallBack);
            JSONObject job_param = (JSONObject) JSON.toJSON(param);
            JSONObject job_data = job_response.getJSONObject("content").getJSONObject("data");
            if(!job_data.getBoolean("success")) {
                // 开关阀失败
                response_CallBack.setCode("10003");
                response_CallBack.setMsg(CommandResultCode.OPEN_CLOSE_FAIL.getMessage());
                response_CallBack.setSuccess(false);
            }else {
                // 开关阀成功
                job_data.remove("success");
                job_data.put("intakeId", intakeId);
                job_data.put("rtuAddr", rtuAddr);
                if(job_param != null) {
                    job_data.put("vcNum", job_param.getString("icCardNo"));
                    job_data.put("orderNo", job_param.getString("orderNo"));
                }
                response_CallBack = JSON.parseObject(job_response.toJSONString(), BaseResponse.class);
            }
        }

        // 回调返回的内容，回调结果写入命令日志表的任务由中间件完成
        return response_CallBack;

    }

    /**
     * 添加常用取水口或更新使用信息
     * @param intakeId
     * @return
     */
    public Integer addCommonIntake(Long operatorId, Long intakeId) {
        PrCommonIntakes commonIntake = prCommonIntakesMapper.selectByOperatorAndIntake(operatorId, intakeId);
        if(commonIntake == null) {
            commonIntake = new PrCommonIntakes();
            commonIntake.setOperatorId(operatorId);
            commonIntake.setIntakeId(intakeId);
            commonIntake.setLastUsedTime(new Date());
            commonIntake.setUsageCount(1);
            return prCommonIntakesMapper.insert(commonIntake);
        }

        commonIntake.setLastUsedTime(new Date());
        commonIntake.setUsageCount(commonIntake.getUsageCount() + 1);
        return prCommonIntakesMapper.updateByPrimaryKeySelective(commonIntake);
    }
}