zhubaomin
2024-10-28 b15920d5a66d379c9fd9cb15fcc48f0f078e7c77
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -134,31 +134,6 @@
     * @return 取水口记录列表
     */
    public QueryResultVo<List<VoIntake>> getIntakes(QueryVo queryVo) {
        Command com = new Command();
        com.id = Command.defaultId;
        com.code = "LCD0001";
        com.type = "innerCommand";
        comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
        BaseResponse baseResponse = sendCom2Mw(com);
        JSONObject response = (JSONObject) JSON.toJSON(baseResponse);
        if (response != null && response.getString("code").equals("0001")) {
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
            JSONArray jsonArray = new JSONArray();
            if(attachment != null) {
                HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
                for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("rtuAddr", entry.getKey());
                    jsonObject.put("isOnLine", entry.getValue());
                    jsonArray.add(jsonObject);
                }
            }
            queryVo.setOnLineMap(jsonArray.toJSONString());
            Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
            Long itemTotal = prIntakeMapper.getRecordCount(params);
@@ -168,10 +143,6 @@
            rsVo.calculateAndSet(itemTotal, params);
            rsVo.obj = prIntakeMapper.getIntakes(params);
            return rsVo;
        } else {
            QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>();
            return rsVo;
        }
    }
    /**
@@ -249,10 +220,11 @@
    }
    /**
     * 此功能已經移植到remote模塊的MonitroSv中
     *
     * 获取取水口列表
     *
     * @return
     */
    public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) {
        Command com = new Command();
        com.id = Command.defaultId;
@@ -288,7 +260,7 @@
            return rsVo;
        }
    }
     */
    /**
     * 根据操作员获取常用取水口
     *