浏览代码

feat:新增接口

Xu·LinPeng 5 月之前
父节点
当前提交
329f8be585

+ 46 - 16
src/main/java/com/jwkj/qsydw/controller/Fxjjc.java

@@ -6,7 +6,6 @@ import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
 import com.jwkj.qsydw.vo.ReadResults;
-import com.jwkj.qsydw.vo.StatusVo;
 import com.jwkj.qsydw.vo.wrapper.Wrapper;
 import jakarta.annotation.Resource;
 import org.nlsd.common.BaseResponse;
@@ -18,6 +17,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 副斜井绞车
  * @author Xu·LinPeng
  */
 @RestController
@@ -40,21 +40,51 @@ public class Fxjjc {
 //        TestData testData = new TestData();
 //        List<ReadResults> readResultsList = testData.getListData();
         List<Npvo<String>> list = new ArrayList<>();
-        list.add(new Npvo<>("提升高度",readResultsList.get(0).getV()+"m"));
-        list.add(new Npvo<>("提升速度",readResultsList.get(1).getV()+"m/s"));
-        list.add(new Npvo<>("制动油压",readResultsList.get(2).getV()+"Mpa"));
-        list.add(new Npvo<>("电枢电流",readResultsList.get(3).getV()+"A"));
-        list.add(new Npvo<>("励磁电流",readResultsList.get(4).getV()+"A"));
-        list.add(new Npvo<>("润滑油压",readResultsList.get(5).getV()+"Mpa"));
-        list.add(new Npvo<>("电机温度1",readResultsList.get(6).getV()+"℃"));
-        list.add(new Npvo<>("电机温度2",readResultsList.get(7).getV()+"℃"));
-        List<Npvo<List<Npvo<List<StatusVo>>>>> itemList = new ArrayList<>();
-        List<Npvo<List<StatusVo>>> paramsList = new ArrayList<>();
-        List<StatusVo> params = new ArrayList<>();
-        params.add(new StatusVo(readResultsList.get(8).getV()));
-        params.add(new StatusVo(readResultsList.get(9).getV()));
-        paramsList.add(new Npvo<>("过卷",params));
-        itemList.add(new Npvo<>("状态",paramsList));
+        list.add(new Npvo<>("运行速度",readResultsList.get(0).getV()+"M/S"));
+        list.add(new Npvo<>("电机电流",readResultsList.get(1).getV()+"A"));
+        list.add(new Npvo<>("电机温度1",readResultsList.get(2).getV()+"℃"));
+        list.add(new Npvo<>("电机温度2",readResultsList.get(3).getV()+"℃"));
+        list.add(new Npvo<>("电机温度3",readResultsList.get(4).getV()+"℃"));
+        list.add(new Npvo<>("电机温度4",readResultsList.get(5).getV()+"℃"));
+        list.add(new Npvo<>("电机前轴温度",readResultsList.get(6).getV()+"℃"));
+        list.add(new Npvo<>("电机后轴温度",readResultsList.get(7).getV()+"℃"));
+        List<Npvo<List<String>>> itemList = new ArrayList<>();
+        List<String> var1 = new ArrayList<>();
+        var1.add(readResultsList.get(8).getV()+"A");
+        itemList.add(new Npvo<>("主电机电流",var1));
+        List<String> var2 = new ArrayList<>();
+        var2.add(readResultsList.get(9).getV()+"m/s");
+        itemList.add(new Npvo<>("速度给定", var2));
+        List<String> var3 = new ArrayList<>();
+        var3.add(readResultsList.get(10).getV()+"Mpa");
+        itemList.add(new Npvo<>("液压站压力", var3));
+        List<String> var4 = new ArrayList<>();
+        var4.add(readResultsList.get(11).getV()+"m/s");
+        itemList.add(new Npvo<>("主编码速度", var4));
+        List<String> var5 = new ArrayList<>();
+        var5.add(readResultsList.get(12).getV()+"M");
+        itemList.add(new Npvo<>("主编码深度", var5));
+        List<String> var6 = new ArrayList<>();
+        var6.add(readResultsList.get(13).getV()+"m/s");
+        itemList.add(new Npvo<>("副编码速度", var6));
+        List<String> var7 = new ArrayList<>();
+        var7.add(readResultsList.get(14).getV()+"M");
+        itemList.add(new Npvo<>("副编码深度", var7));
+        List<String> var8 = new ArrayList<>();
+        var8.add(readResultsList.get(15).getV()+"m/s");
+        itemList.add(new Npvo<>("装置速度", var8));
+        List<String> var9 = new ArrayList<>();
+        var9.add(readResultsList.get(16).getV()+"Mpa");
+        itemList.add(new Npvo<>("润滑油压", var9));
+        List<String> var10 = new ArrayList<>();
+        var10.add(readResultsList.get(17).getV()+"A");
+        itemList.add(new Npvo<>("励磁电流", var10));
+        List<String> var11 = new ArrayList<>();
+        var11.add(readResultsList.get(18).getV());
+        itemList.add(new Npvo<>("去向", var11));
+        List<String> var12 = new ArrayList<>();
+        var12.add(readResultsList.get(19).getV());
+        itemList.add(new Npvo<>("手动去向", var12));
         JSONObject result = new JSONObject();
         result.put("list",list);
         result.put("itemList",itemList);

+ 100 - 0
src/main/java/com/jwkj/qsydw/controller/Rqglf.java

@@ -0,0 +1,100 @@
+package com.jwkj.qsydw.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.services.HttpClientService;
+import com.jwkj.qsydw.vo.Npvo;
+import com.jwkj.qsydw.vo.PointPosition;
+import com.jwkj.qsydw.vo.ReadResults;
+import com.jwkj.qsydw.vo.wrapper.Wrapper;
+import jakarta.annotation.Resource;
+import org.nlsd.common.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 燃气锅炉房
+ * @author Xu·LinPeng
+ */
+@RestController
+@RequestMapping("/transform")
+public class Rqglf {
+
+    @Resource
+    HttpClientService httpClientService;
+    @Resource
+    PointPosition pointPosition;
+
+    @PostMapping("/rqglf")
+    public BaseResponse<JSONObject> data(){
+
+
+        String var = pointPosition.getPointPosition("qsyrqglf");
+        String res = httpClientService.httpService(var);
+        Wrapper wrapper = JSON.parseObject(res, Wrapper.class);
+        List<ReadResults> readResultsList = wrapper.getReadResults();
+//        TestData testData = new TestData();
+//        List<ReadResults> readResultsList = testData.getListData();
+        List<Npvo<List<String>>> paramsList = new ArrayList<>();
+        List<String> var1 = new ArrayList<>();
+        var1.add(readResultsList.get(0).getV()+"℃");
+        paramsList.add(new Npvo<>("锅炉供水管温度",var1));
+        List<String> var2 = new ArrayList<>();
+        var2.add(readResultsList.get(1).getV()+"℃");
+        paramsList.add(new Npvo<>("实际目标水温", var2));
+        List<String> var3 = new ArrayList<>();
+        var3.add(readResultsList.get(2).getV()+"℃");
+        paramsList.add(new Npvo<>("当前室内水温", var3));
+        List<String> var4 = new ArrayList<>();
+        var4.add(readResultsList.get(3).getV()+"℃");
+        paramsList.add(new Npvo<>("低低控制温度", var4));
+        List<String> var5 = new ArrayList<>();
+        var5.add(readResultsList.get(4).getV()+"℃");
+        paramsList.add(new Npvo<>("最低控制温度", var5));
+        List<String> var6 = new ArrayList<>();
+        var6.add(readResultsList.get(5).getV()+"℃");
+        paramsList.add(new Npvo<>("最高控制温度", var6));
+        List<String> var7 = new ArrayList<>();
+        var7.add(readResultsList.get(6).getV()+"℃");
+        paramsList.add(new Npvo<>("出水超温", var7));
+        List<String> var8 = new ArrayList<>();
+        var8.add(readResultsList.get(7).getV()+"℃");
+        paramsList.add(new Npvo<>("二次供水超温", var8));
+        List<String> var9 = new ArrayList<>();
+        var9.add(readResultsList.get(8).getV()+"Mpa");
+        paramsList.add(new Npvo<>("二次回水低压", var9));
+        List<String> var10 = new ArrayList<>();
+        var10.add(readResultsList.get(9).getV()+"M");
+        paramsList.add(new Npvo<>("水箱液位高", var10));
+        List<String> var11 = new ArrayList<>();
+        var11.add(readResultsList.get(10).getV()+"M");
+        paramsList.add(new Npvo<>("水箱液位低", var11));
+        List<String> var12 = new ArrayList<>();
+        var12.add(readResultsList.get(11).getV());
+        paramsList.add(new Npvo<>("锅炉供水管就地", var12));
+        List<String> var13 = new ArrayList<>();
+        var13.add(readResultsList.get(12).getV());
+        paramsList.add(new Npvo<>("锅炉供水管2#变频", var13));
+        List<String> var14 = new ArrayList<>();
+        var14.add(readResultsList.get(13).getV()+"%");
+        paramsList.add(new Npvo<>("锅炉供水管占比", var14));
+        List<String> var15 = new ArrayList<>();
+        var15.add(readResultsList.get(14).getV());
+        paramsList.add(new Npvo<>("锅炉供水管3#工频", var15));
+        List<String> var16 = new ArrayList<>();
+        var16.add(readResultsList.get(15).getV()+"℃");
+        paramsList.add(new Npvo<>("二次供水管温度", var16));
+        List<String> var17 = new ArrayList<>();
+        var17.add(readResultsList.get(16).getV()+"℃");
+        paramsList.add(new Npvo<>("二次回水管温度", var17));
+        JSONObject result = new JSONObject();
+        result.put("paramsList",paramsList);
+        return new BaseResponse<>(200,"OK",result,"请求成功");
+
+    }
+
+}

+ 72 - 0
src/main/java/com/jwkj/qsydw/controller/Scsgs.java

@@ -0,0 +1,72 @@
+package com.jwkj.qsydw.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.services.HttpClientService;
+import com.jwkj.qsydw.vo.Npvo;
+import com.jwkj.qsydw.vo.Nsvo;
+import com.jwkj.qsydw.vo.PointPosition;
+import com.jwkj.qsydw.vo.ReadResults;
+import com.jwkj.qsydw.vo.wrapper.Wrapper;
+import jakarta.annotation.Resource;
+import org.nlsd.common.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 生产水供水
+ * @author Xu·LinPeng
+ */
+@RestController
+@RequestMapping("/transform")
+public class Scsgs {
+
+    @Resource
+    HttpClientService httpClientService;
+    @Resource
+    PointPosition pointPosition;
+
+    @PostMapping("/scsgs")
+    public BaseResponse<JSONObject> data(){
+
+
+        String var = pointPosition.getPointPosition("qsyscsgs");
+        String res = httpClientService.httpService(var);
+        Wrapper wrapper = JSON.parseObject(res, Wrapper.class);
+        List<ReadResults> readResultsList = wrapper.getReadResults();
+//        TestData testData = new TestData();
+//        List<ReadResults> readResultsList = testData.getListData();
+        List<Npvo<String>> list = new ArrayList<>();
+        list.add(new Npvo<>("管道压力",readResultsList.get(0).getV()+"Mpa"));
+        list.add(new Npvo<>("瞬时流量",readResultsList.get(1).getV()+"m³/h"));
+        list.add(new Npvo<>("累计流量",readResultsList.get(2).getV()+"m³"));
+        List<Nsvo<String>> statusList = new ArrayList<>();
+        statusList.add(new Nsvo<>("1#阀门",readResultsList.get(3).getV()));
+        statusList.add(new Nsvo<>("2#阀门",readResultsList.get(4).getV()));
+        statusList.add(new Nsvo<>("3#阀门",readResultsList.get(5).getV()));
+        statusList.add(new Nsvo<>("4#阀门",readResultsList.get(6).getV()));
+        statusList.add(new Nsvo<>("稳压",readResultsList.get(7).getV()));
+        List<Nsvo<String>> statusList1 = new ArrayList<>();
+        statusList1.add(new Nsvo<>("QSC水位低",readResultsList.get(8).getV()));
+        statusList1.add(new Nsvo<>("主泵2过热",readResultsList.get(9).getV()));
+        statusList1.add(new Nsvo<>("稳压泵过热",readResultsList.get(10).getV()));
+        statusList1.add(new Nsvo<>("主泵3过热",readResultsList.get(11).getV()));
+        statusList1.add(new Nsvo<>("JK压力低PJ4",readResultsList.get(12).getV()));
+        statusList1.add(new Nsvo<>("主泵4过热",readResultsList.get(13).getV()));
+        statusList1.add(new Nsvo<>("CK压力低PJ1",readResultsList.get(14).getV()));
+        statusList1.add(new Nsvo<>("控制柜自动",readResultsList.get(15).getV()));
+        statusList1.add(new Nsvo<>("CK压力低PJ2",readResultsList.get(16).getV()));
+        statusList1.add(new Nsvo<>("控制柜手动",readResultsList.get(17).getV()));
+        JSONObject result = new JSONObject();
+        result.put("list",list);
+        result.put("statusList",statusList);
+        result.put("statusList1",statusList1);
+        return new BaseResponse<>(200,"OK",result,"请求成功");
+
+    }
+
+}

+ 69 - 0
src/main/java/com/jwkj/qsydw/controller/Shsgs.java

@@ -0,0 +1,69 @@
+package com.jwkj.qsydw.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.services.HttpClientService;
+import com.jwkj.qsydw.vo.Ndvo;
+import com.jwkj.qsydw.vo.Nsvo;
+import com.jwkj.qsydw.vo.PointPosition;
+import com.jwkj.qsydw.vo.ReadResults;
+import com.jwkj.qsydw.vo.wrapper.Wrapper;
+import jakarta.annotation.Resource;
+import org.nlsd.common.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 生活水供水
+ * @author Xu·LinPeng
+ */
+@RestController
+@RequestMapping("/transform")
+public class Shsgs {
+
+    @Resource
+    HttpClientService httpClientService;
+    @Resource
+    PointPosition pointPosition;
+
+    @PostMapping("/shsgs")
+    public BaseResponse<JSONObject> data(){
+
+
+        String var = pointPosition.getPointPosition("qsyshsgs");
+        String res = httpClientService.httpService(var);
+        Wrapper wrapper = JSON.parseObject(res, Wrapper.class);
+        List<ReadResults> readResultsList = wrapper.getReadResults();
+//        TestData testData = new TestData();
+//        List<ReadResults> readResultsList = testData.getListData();
+        List<Ndvo<String>> list = new ArrayList<>();
+        list.add(new Ndvo<>("液位高限","300m"));
+        list.add(new Ndvo<>("液位低限","206m³/h"));
+        list.add(new Ndvo<>("净水瞬时流量","20.0m³/h"));
+        list.add(new Ndvo<>("累计流量","46512.0m³"));
+        list.add(new Ndvo<>("原水池液位","243m"));
+        list.add(new Ndvo<>("变频器运行频率",readResultsList.get(1).getV()));
+        list.add(new Ndvo<>("变频器运行电流",readResultsList.get(2).getV()));
+        list.add(new Ndvo<>("供电压力","0.45MPa"));
+        list.add(new Ndvo<>("设定压力",readResultsList.get(3).getV()));
+        list.add(new Ndvo<>("压力高报值","1.20MPa"));
+        list.add(new Ndvo<>("压力低报值","0.03MPa"));
+        list.add(new Ndvo<>("消防水池液位","2.69m"));
+
+        List<Nsvo<String>> statusList = new ArrayList<>();
+        statusList.add(new Nsvo<>("1#阀门","1"));
+        statusList.add(new Nsvo<>("2#阀门","1"));
+        statusList.add(new Nsvo<>("3#阀门","1"));
+        statusList.add(new Nsvo<>("4#阀门","1"));
+        JSONObject result = new JSONObject();
+        result.put("list",list);
+        result.put("statusList",statusList);
+        return new BaseResponse<>(200,"OK",result,"请求成功");
+
+    }
+
+}

+ 81 - 0
src/main/java/com/jwkj/qsydw/controller/Xfsgs.java

@@ -0,0 +1,81 @@
+package com.jwkj.qsydw.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.services.HttpClientService;
+import com.jwkj.qsydw.vo.Ndvo;
+import com.jwkj.qsydw.vo.Nsvo;
+import com.jwkj.qsydw.vo.PointPosition;
+import com.jwkj.qsydw.vo.ReadResults;
+import com.jwkj.qsydw.vo.wrapper.Wrapper;
+import jakarta.annotation.Resource;
+import org.nlsd.common.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 消防水供水
+ * @author Xu·LinPeng
+ */
+@RestController
+@RequestMapping("/transform")
+public class Xfsgs {
+
+    @Resource
+    HttpClientService httpClientService;
+    @Resource
+    PointPosition pointPosition;
+
+    @PostMapping("/xfsgs")
+    public BaseResponse<JSONObject> data(){
+
+
+        String var = pointPosition.getPointPosition("qsyxfsgs");
+        String res = httpClientService.httpService(var);
+        Wrapper wrapper = JSON.parseObject(res, Wrapper.class);
+        List<ReadResults> readResultsList = wrapper.getReadResults();
+//        TestData testData = new TestData();
+//        List<ReadResults> readResultsList = testData.getListData();
+        List<Ndvo<String>> list = new ArrayList<>();
+        list.add(new Ndvo<>("管道压力",readResultsList.get(0).getV()+"Mpa"));
+        list.add(new Ndvo<>("瞬时流量",readResultsList.get(1).getV()+"m³/h"));
+        list.add(new Ndvo<>("累计流量",readResultsList.get(2).getV()+"m³"));
+        list.add(new Ndvo<>("变频运行频率",readResultsList.get(3).getV()+"Hz"));
+        list.add(new Ndvo<>("仪表设定压力",readResultsList.get(4).getV()+"Pa"));
+        list.add(new Ndvo<>("变频运行电流",readResultsList.get(5).getV()+"Hz"));
+        list.add(new Ndvo<>("仪表反馈压力",readResultsList.get(6).getV()+"MPa"));
+        list.add(new Ndvo<>("变频故障代码",readResultsList.get(7).getV()));
+        List<Nsvo<String>> statusList = new ArrayList<>();
+        statusList.add(new Nsvo<>("1#阀门",readResultsList.get(8).getV()));
+        statusList.add(new Nsvo<>("2#阀门",readResultsList.get(9).getV()));
+        statusList.add(new Nsvo<>("3#阀门",readResultsList.get(10).getV()));
+        List<Nsvo<String>> statusList1 = new ArrayList<>();
+        statusList1.add(new Nsvo<>("报警水位",readResultsList.get(11).getV()));
+        statusList1.add(new Nsvo<>("消防报警水位",readResultsList.get(12).getV()));
+        statusList1.add(new Nsvo<>("出口压力低PJ5",readResultsList.get(13).getV()));
+        statusList1.add(new Nsvo<>("消防溢流水位",readResultsList.get(14).getV()));
+        statusList1.add(new Nsvo<>("JK压力低PJ6",readResultsList.get(15).getV()));
+        statusList1.add(new Nsvo<>("系统故障",readResultsList.get(16).getV()));
+        statusList1.add(new Nsvo<>("出口压力低",readResultsList.get(17).getV()));
+        statusList1.add(new Nsvo<>("溢流水位",readResultsList.get(18).getV()));
+        statusList1.add(new Nsvo<>("出口压力高",readResultsList.get(19).getV()));
+        statusList1.add(new Nsvo<>("控制柜自动",readResultsList.get(20).getV()));
+        statusList1.add(new Nsvo<>("软启动器1故障",readResultsList.get(21).getV()));
+        statusList1.add(new Nsvo<>("控制柜手动",readResultsList.get(22).getV()));
+        statusList1.add(new Nsvo<>("软启动器2故障",readResultsList.get(23).getV()));
+        statusList1.add(new Nsvo<>("变频器故障",readResultsList.get(24).getV()));
+        statusList1.add(new Nsvo<>("软启动器3故障",readResultsList.get(25).getV()));
+        statusList1.add(new Nsvo<>("管道漏水",readResultsList.get(26).getV()));
+        JSONObject result = new JSONObject();
+        result.put("list",list);
+        result.put("statusList",statusList);
+        result.put("statusList1",statusList1);
+        return new BaseResponse<>(200,"OK",result,"请求成功");
+
+    }
+
+}

+ 70 - 0
src/main/java/com/jwkj/qsydw/controller/Xglfjk.java

@@ -0,0 +1,70 @@
+package com.jwkj.qsydw.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.services.HttpClientService;
+import com.jwkj.qsydw.vo.Ndvo;
+import com.jwkj.qsydw.vo.PointPosition;
+import com.jwkj.qsydw.vo.ReadResults;
+import com.jwkj.qsydw.vo.wrapper.Wrapper;
+import jakarta.annotation.Resource;
+import org.nlsd.common.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 新锅炉房监控
+ * @author Xu·LinPeng
+ */
+@RestController
+@RequestMapping("/transform")
+public class Xglfjk {
+
+    @Resource
+    HttpClientService httpClientService;
+    @Resource
+    PointPosition pointPosition;
+
+    @PostMapping("/xglfjk")
+    public BaseResponse<JSONObject> data(){
+
+
+        String var = pointPosition.getPointPosition("qsyxglfjk");
+        String res = httpClientService.httpService(var);
+        Wrapper wrapper = JSON.parseObject(res, Wrapper.class);
+        List<ReadResults> readResultsList = wrapper.getReadResults();
+//        TestData testData = new TestData();
+//        List<ReadResults> readResultsList = testData.getListData();
+        List<Ndvo<List<String>>> paramsList = new ArrayList<>();
+        List<String> var1 = new ArrayList<>();
+        var1.add(readResultsList.get(0).getV());
+        paramsList.add(new Ndvo<>("PID自动调节设定值",var1));
+        List<String> var2 = new ArrayList<>();
+        var2.add(readResultsList.get(1).getV());
+        paramsList.add(new Ndvo<>("锅筒水位", var2));
+        List<String> var3 = new ArrayList<>();
+        var3.add(readResultsList.get(2).getV());
+        paramsList.add(new Ndvo<>("排烟温度", var3));
+        List<String> var4 = new ArrayList<>();
+        var4.add(readResultsList.get(3).getV());
+        paramsList.add(new Ndvo<>("锅筒压力", var4));
+        List<String> var5 = new ArrayList<>();
+        var5.add(readResultsList.get(4).getV());
+        paramsList.add(new Ndvo<>("主蒸汽压力", var5));
+        List<String> var6 = new ArrayList<>();
+        var6.add(readResultsList.get(5).getV());
+        paramsList.add(new Ndvo<>("主蒸汽温度", var6));
+        List<String> var7 = new ArrayList<>();
+        var7.add(readResultsList.get(6).getV());
+        paramsList.add(new Ndvo<>("2#蒸汽电动阀", var7));
+        JSONObject result = new JSONObject();
+        result.put("paramsList", paramsList);
+        return new BaseResponse<>(200,"OK",result,"请求成功");
+
+    }
+
+}

+ 40 - 0
src/main/java/com/jwkj/qsydw/vo/Ndvo.java

@@ -0,0 +1,40 @@
+package com.jwkj.qsydw.vo;
+
+/**
+ * @author Xu·LinPeng
+ */
+public class Ndvo<T> {
+    String name;
+    T data;
+
+    public Ndvo() {
+
+    }
+
+    public Ndvo(String name, T data) {
+
+        this.name = name;
+        this.data = data;
+    }
+
+    public String getName() {
+
+        return name;
+    }
+
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+    public T getData() {
+
+        return data;
+    }
+
+    public void setData(T data) {
+
+        this.data = data;
+    }
+
+}

+ 40 - 0
src/main/java/com/jwkj/qsydw/vo/Nsvo.java

@@ -0,0 +1,40 @@
+package com.jwkj.qsydw.vo;
+
+/**
+ * @author Xu·LinPeng
+ */
+public class Nsvo<T> {
+    String name;
+    T status;
+
+    public Nsvo() {
+
+    }
+
+    public Nsvo(String name, T status) {
+
+        this.name = name;
+        this.status = status;
+    }
+
+    public String getName() {
+
+        return name;
+    }
+
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+    public T getStatus() {
+
+        return status;
+    }
+
+    public void setStatus(T status) {
+
+        this.status = status;
+    }
+
+}

+ 105 - 44
src/main/java/com/jwkj/qsydw/vo/PointPosition.java

@@ -132,16 +132,26 @@ public class PointPosition {
                 "\"自动化平台.设备 1.IoServer.100_100_104_138.副立井压风1.B_04_120\"" + // 2#轻故障
                 "]";
         String qsyfxjjc = "[" +
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_066\"," + // 提升高度
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_067\"," + // 提升速度
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_045\"," + // 制动油压
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_068\"," + // 电枢电流
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_069\"," + // 励磁电流
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_072\"," + // 润滑油压
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_073\"," + // 电机温度1
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_074\"," + // 电机温度2
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_032\"," + // 行控过卷
-                "\"自动化平台.设备 1.IoServer.100_100_100_106.副斜井绞车提升PC2.F_01_041\"" +// 提升过卷
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_装置速度\"," +  // 运行速度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机(电枢)电流\"," +  // 电机电流
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机及轴承测温1\"," +  // 电机温度1
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机及轴承测温2\"," +  // 电机温度2
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机及轴承测温3\"," +  // 电机温度3
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机及轴承测温4\"," +  // 电机温度4
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机及轴承测温5\"," +  // 电机前轴温度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机及轴承测温6\"," +  // 电机后轴温度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_电机(电枢)电流\"," +  // 主电机电流
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_速度给定输出\"," +  // 速度给定
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_0液压油压\"," +  // 液压站压力
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_主编码速度\"," +  // 主编码速度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_主编码深度\"," +  // 主编码深度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_从编码速度\"," +  // 副编码速度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_从编码深度\"," +  // 副编码深度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_装置速度\"," +  // 装置速度
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_AI_润滑油压\"," +  // 润滑油压
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_励磁电流\"," +  // 励磁电流
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_0液压油压\"," +  // 去向
+                "\"自动化平台.设备 1.IoServer.192.168.18.2.副斜井提升新.副斜井提升_0液压油压\"" +  // 手动去向
                 "]";
         String qsyjdgmj = "[" +
                 "\"自动化平台.设备 1.IoServer.100_100_100_174.甲带给煤机4.C_03_001\"," + // gmj1运行状态
@@ -415,43 +425,92 @@ public class PointPosition {
                 "\"自动化平台.设备 1.IoServer.100_100_104_218.主运输井下皮带.井下皮带_5#皮带二级跑偏1\"" +  // 5#皮带二级跑偏1
                 "]";
         String qsyrqglf = "[" +
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_033\"," + // 2#锅炉_模块排烟温度
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_025\"," + // 1#锅炉_模块当前负荷
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_035\"," + // 2#锅炉_模块当前负荷
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_045\"," + // 3#锅炉_模块当前负荷
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_055\"," + // 4#锅炉_模块当前负荷
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_027\"," + // 1#锅炉_远程温度设定值
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_037\"," + // 2#锅炉_远程温度设定值
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_047\"," + // 3#锅炉_远程温度设定值
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_057\"," + // 4#锅炉_远程温度设定值
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_005\"," + // 软水箱液位
-                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_071\"" + // SZ_补水泵泵频率(频率控制手动)
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_001\"," +  // 锅炉供水管温度
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_058\"," +  // 实际目标水温
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_059\"," +  // 当前室内水温
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_060\"," +  // 低低控制温度
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_061\"," +  // 最低控制温度
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_062\"," +  // 最高控制温度
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_013\"," +  // 出水超温
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_014\"," +  // 二次供水超温
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_015\"," +  // 二次回水低压
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_016\"," +  // 水箱液位高
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_017\"," +  // 水箱液位低
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_141\"," +  // 锅炉供水管就地
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_142\"," +  // 锅炉供水管2#变频
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_008\"," +  // 锅炉供水管占比
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_145\"," +  // 锅炉供水管3#工频
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_003\"," +  // 二次供水管温度
+                "\"自动化平台.设备 1.IoServer.100_100_104_170.燃气锅炉.E_02_002\"" +  // 二次回水管温度
                 "]";
         String qsyshsgs = "[" +
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_192\"," + // 反洗水泵变频运行频率
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_193\"," + // 反洗泵变频运行电流
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_194\"," + // 反洗管道设定压力
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_195\"," + // 反洗管道供水压力
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_100\"," + // 1#过滤器产水阀关驱动
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_210\"," + // 2#过滤器产水阀关驱动
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_221\"," + // 3#过滤器产水阀关驱动
-                "\"自动化平台.设备 1.IoServer.100_100_100_200.生活水.D_07_231\"" + // 4#过滤器产水阀关驱动
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.ZD.ZD_临时压风机房4号压风机_电机前端\"," +  // 概述
+                "\"自动化平台.设备 1.IoServer.100.100.100.190.净水站200.生活水_运行频率\"," +  // 变频器运行频率
+                "\"自动化平台.设备 1.IoServer.100.100.100.190.净水站200.生活水_变频器电流\"," +  // 变频器运行电流
+                "\"自动化平台.设备 1.IoServer.100.100.100.190.净水站200.生活水_供水压力\"" +  // 供水压力
                 "]";
         String qsyxfsgs = "[" +
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_002\"," +  // 报警水位
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_027\"," +  // 消防报警水位
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_010\"," +  // 出口压力低PJ5
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_028\"," +  // 消防溢流水位
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_010\"," +  // 出口压力低PJ5
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_029\"," +  // 系统故障
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_009\"," +  // 出口压力低
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_037\"," +  // 溢流水位
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_011\"," +  // 出口压力高  
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_038\"," +  // 消防水控制柜自动信号
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_017\"," +  // 软启动器1故障
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_020\"," +  // 消防水控制柜手动信号
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_018\"," +  // 软启动器2故障
-                "\"自动化平台.设备 1.IoServer.100_100_100_137.消防水.D_06_019\"" +  // 软启动器3故障
+                "\"自动化平台.设备 1.IoServer.100.100.100.64.供水系统模拟量200.消防水压力\"," +  // 管道压力
+                "\"自动化平台.设备 1.IoServer.100.100.100.64.供水系统模拟量200.消防水瞬时流量\"," +  // 瞬时流量
+                "\"自动化平台.设备 1.IoServer.100.100.100.64.供水系统模拟量200.消防水累计流量\"," +  // 累计流量
+                "\"自动化平台.设备 1.IoServer.100.100.100.64.供水系统模拟量200.消防水池液位\"," +  // 累计流量
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_bp_yxpl\"," +  // 变频器运行频率
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_yb_sdyl\"," +  // 仪表设定压力
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_bp_yxdl\"," +  // 变频运行电流
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_yb_fkyl\"," +  // 仪表反馈压力
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_bp_gzz\"," +  // 变频故障代码
+
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_beng1yxfh\"," +  // 1#水泵
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_beng2yxfh\"," +  // 2#水泵
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_beng3yxfh\"," +  // 3#水泵
+
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_baojingswGZ\"," +  // 报警水位
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_xiaofbjswGZ\"," +  // 消防报警水位
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ckyalidiPJ5GZ\"," +  // 出口压力低PJ5
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_xiaofylswGZ\"," +  // 消防溢流水位
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ckyaligaoPJ6GZ\"," +  // JK压力低PJ6
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_xitongGZ\"," +  // 系统故障
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ckyalidiGZ\"," +  // 出口压力低
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ylswGZ\"," +  // 溢流水位
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ckyaligaoGZ\"," +  // 出口压力高
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_zddengliang\"," +  // 控制柜自动
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ruanqdq1GZ\"," +  // 软启动器1故障
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_sddengliang\"," +  // 控制柜手动
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ruanqdq2GZ\"," +  // 软启动器2故障
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_bp_gz\"," +  // 变频器故障
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.消防水opc.消防水opc_消防水_xfs_ruanqdq3GZ\"," +  // 软启动器3故障
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_gdls\"" +  // 管道漏水
+                "]";
+        String qsyscsgs = "[" +
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生活水及煤仓液位.生活水及煤仓液位_煤仓相关设备_供水系统模拟量及煤仓物位_shs_ssll\"," +  // 管道压力
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生活水及煤仓液位.生活水及煤仓液位_煤仓相关设备_供水系统模拟量及煤仓物位_shs_ssll\"," +  // 瞬时流量
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生活水及煤仓液位.生活水及煤仓液位_煤仓相关设备_供水系统模拟量及煤仓物位_xfs_ljll\"," +  // 累计流量
+
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_beng1yxfh\"," +  // 1#阀门
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_beng2yxfh\"," +  // 2#阀门
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_beng3yxfh\"," +  // 3#阀门
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_beng4yxfh\"," +  // 4#阀门
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_wybengyxfh\"," +  // 稳压
+
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_qscswdiGZ\"," +  // QSC水位低
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_beng2gaowenGZ\"," +  // 主泵2过热
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_wybenggaowenGZ\"," +  // 稳压泵过热
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_beng3gaowenGZ\"," +  // 主泵3过热
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_jkyldiPJ4GZ\"," +  // JK压力低PJ4
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_beng4gaowenGZ\"," +  // 主泵4过热
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_ckyldiPJ1GZ\"," +  // CK压力低PJ1
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_zddengliang\"," +  // 控制柜自动
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_ckylgaoPJ2GZ\"," +  // CK压力低PJ2
+                "\"自动化平台.设备 1.IoServer.Kepware.KEPServerEX.V6.生产水opc.生产水opc_生产水_scs_sddengliang\"" +  // 控制柜手动
+                "]";
+        String qsyxglfjk = "[" +
+                "\"自动化平台.设备 1.IoServer.100_100_100_104.主排水泵房11采区.A_02_329\"," +  // PID自动调节设定值
+                "\"自动化平台.设备 1.IoServer.100_100_100_104.主排水泵房11采区.A_02_329\"," +  // 锅筒水位
+                "\"自动化平台.设备 1.IoServer.100_100_100_104.主排水泵房11采区.A_02_329\"," +  // 排烟温度
+                "\"自动化平台.设备 1.IoServer.100_100_100_104.主排水泵房11采区.A_02_329\"," +  // 锅筒压力
+                "\"自动化平台.设备 1.IoServer.100_100_100_104.主排水泵房11采区.A_02_329\"," +  // 主蒸汽压力
+                "\"自动化平台.设备 1.IoServer.100_100_100_104.主排水泵房11采区.A_02_329\"," +  // 主蒸汽温度
+                "\"自动化平台.设备 1.IoServer.100_100_100_104.主排水泵房11采区.A_02_329\"" +  // 2#蒸汽电动阀
                 "]";
         return switch (param) {
             case "qsy786sbf" -> qsy786sbf; // 786水泵房
@@ -468,9 +527,11 @@ public class PointPosition {
             case "qsyemss" -> qsyemss; // 二煤上山
             case "qsyhrz" -> qsyhrz; // 换热站
             case "qsyjxpdjk" -> qsyjxpdjk; // 井下皮带监控
-            case "qsyrqglf" -> qsyrqglf; // 燃气锅炉
+            case "qsyrqglf" -> qsyrqglf; // 燃气锅炉
             case "qsyshsgs" -> qsyshsgs; // 生活水供水
             case "qsyxfsgs" -> qsyxfsgs; // 消防水供水
+            case "qsyscsgs" -> qsyscsgs; // 生产水供水
+            case "qsyxglfjk" -> qsyxglfjk; //新锅炉房监控
             default -> null;
         };
     }