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

liurunyu

2024-10-28 927beadbb05d22759efc4d60c931f906bffa511d

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java

@@ -26,7 +26,6 @@
import org.springframework.web.util.UriComponentsBuilder;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -77,17 +76,17 @@

        JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
        if(response != null && response.getString("code").equals("0001")) {
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");

            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()) {
                attachment.forEach((key, value) -> {
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("rtuAddr", entry.getKey());
                    jsonObject.put("isOnLine", entry.getValue());
                    jsonObject.put("rtuAddr", key);
                    jsonObject.put("isOnLine", value);
                    jsonArray.add(jsonObject);
                }

                });
            }

            qo.setOnLineMap(jsonArray.toJSONString());
@@ -117,17 +116,17 @@

        JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
        if(response != null && response.getString("code").equals("0001")) {
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");

            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()) {
                attachment.forEach((key, value) -> {
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("rtuAddr", entry.getKey());
                    jsonObject.put("isOnLine", entry.getValue());
                    jsonObject.put("rtuAddr", key);
                    jsonObject.put("isOnLine", value);
                    jsonArray.add(jsonObject);
                }

                });
            }

            qo.setOnLineMap(jsonArray.toJSONString());
@@ -154,32 +153,37 @@

    /**
     * 根据操作员获取常用取水口
     * @param operator
     * @param operatorId
     * @return
     */
    public List<VoOnLineIntake> getUsedIntakes(Long operator) {
    public List<VoOnLineIntake> getUsedIntakes(Long operatorId) {
        Command com = new Command() ;
        com.id = Command.defaultId;
        com.code = "LCD0001";
        com.type = "innerCommand";
        comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);

        JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
        //String response_Str = "{\"code\": \"0001\",\"content\": {\"attachment\": {\"530115059980\": true,\"620201000030\": true},\"code\": \"LCD0001\",\"id\": \"999999999\",\"param\": {\"message\": \"查询所有RTU在线情况结果\",\"success\": true},\"protocol\": \"\",\"rtuAddr\": \"\",\"rtuResultSendWebUrl\": \"\",\"type\": \"resultCommand\"},\"msg\": \"请求成功\",\"success\": true}";
        //JSONObject response = JSON.parseObject(response_Str);
        //String test = response.toJSONString();

        if(response != null && response.getString("code").equals("0001")) {
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
            JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");

            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()) {
                attachment.forEach((key, value) -> {
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("rtuAddr", entry.getKey());
                    jsonObject.put("isOnLine", entry.getValue());
                    jsonObject.put("rtuAddr", key);
                    jsonObject.put("isOnLine", value);
                    jsonArray.add(jsonObject);
                }

                });
            }

            return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
            System.out.println(jsonArray.toJSONString());
            return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operatorId);
        } else {
            return new ArrayList<>();
        }