From 58481c160b0d45894d631b96e63d3f02f4243533 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 11 十月 2024 10:09:19 +0800
Subject: [PATCH] 优化代码 开关阀最新和历史记录 根据指定获取控制器记录 实现接口 最近未报数的取水口
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 232 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
index 717429e..681ea4a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -1,10 +1,32 @@
package com.dy.pipIrrProject.controller;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.common.mw.protocol.Command;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoPr.PrIntakeController;
+import com.dy.pipIrrGlobal.voPr.VoController;
+import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -19,12 +41,221 @@
@Autowired
private PrControllerMapper prControllerMapper;
+ @Autowired
+ private PrIntakeMapper prIntakeMapper;
+
+ @Autowired
+ private PrIntakeControllerMapper prIntakeControllerMapper;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+// protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send";
+ protected String comSendUrl;
+
+ /**
+ * pro_mw锛氬睘鎬�
+ * tag浠庢帶鍒跺櫒涓幏鍙�
+ * key_mw锛歶rl鐨刱ey
+ */
+ private Environment env = null;
+ private String pro_mw = "mw";
+ private String key_mw = "comSendUrl";
+ @Autowired
+ public ControllerSv(Environment env) {
+ this.env = env;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�
+ *
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoController>> getControllers(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);
+
+ JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+
+
+ if (response != null && response.getString("code").equals("0001")) {
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
+ HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
+
+ JSONArray jsonArray = new JSONArray();
+ 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 = prControllerMapper.getRecordCount(params);
+
+ QueryResultVo<List<VoController>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = prControllerMapper.getControllers(params);
+ return rsVo;
+ } else {
+ QueryResultVo<List<VoController>> rsVo = new QueryResultVo<>();
+ return rsVo;
+ }
+ }
+
/**
* 娣诲姞鎺у埗鍣�
+ *
* @param po
* @return
*/
public Integer addController(PrController po) {
- return prControllerMapper.insert(po);
+ int rows = prControllerMapper.insert(po);
+ if (rows == 0) {
+ return 0;
+ }
+ PrIntakeController addPrIntakeController = new PrIntakeController();
+ addPrIntakeController.setIntakeid(po.getIntakeId());
+ addPrIntakeController.setControllerid(po.getId());
+ addPrIntakeController.setOperatetype((byte) 1);
+ addPrIntakeController.setOperator(po.getOperator());
+ addPrIntakeController.setOperatedt(po.getOperateDt());
+ addPrIntakeController.setRemarks("缁戝畾");
+ int rec = prIntakeControllerMapper.insert(addPrIntakeController);
+ if (rec == 0) {
+ return 0;
+ }
+ return 1;
+ }
+
+ /**
+ * 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�
+ *
+ * @param rtuAddr
+ * @return
+ */
+ public List<Map<String, Object>> getControllersByAddr(String rtuAddr) {
+ return prControllerMapper.getControllersByAddr(rtuAddr);
+ }
+
+ /**
+ * 鏍规嵁鎺у埗鍣ㄧ紪鍙风墿鐞嗗垹闄ゆ帶鍒�
+ *
+ * @param controllerId
+ * @return
+ */
+ public Integer deleteControllerById(Long controllerId) {
+ return prControllerMapper.deleteByPrimaryKey(controllerId);
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鎺у埗鍣ㄥ垪琛�
+ *
+ * @param queryVo
+ * @return
+ */
+ public List<VoController> export(QueryVo queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ List<VoController> rsVo = new ArrayList<>();
+ rsVo = prControllerMapper.getControllers(params);
+ return rsVo;
+ }
+
+ /**
+ * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺
+ *
+ * @param controllerId
+ * @return
+ */
+ public Integer getRecordCountOfController(Long controllerId) {
+ return prControllerMapper.getRecordCountOfController(controllerId);
+ }
+
+ /**
+ * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�
+ *
+ * @param controllerId
+ * @return
+ */
+ public Integer getBindedCount(Long controllerId) {
+ return prControllerMapper.getBindedCount(controllerId);
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鍒犻櫎澶栭敭
+ *
+ * @param controllerId
+ * @return
+ */
+ public Integer deleteIntakeId(Long controllerId) {
+ return prControllerMapper.deleteIntakeId(controllerId);
+ }
+
+ /**
+ * 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｅ垪琛�
+ *
+ * @return
+ */
+ public JSONArray getNoBindingIntakes() {
+ List<Map<String, Object>> list = Optional.ofNullable(prIntakeMapper.getNoBindingIntakes()).orElse(new ArrayList<>());
+ JSONArray array = null;
+ if (list.size() > 0) {
+ array = JSONArray.parseArray(JSON.toJSONString(list));
+ }
+ return array;
+ }
+
+ /**
+ * 鏍规嵁鎺у埗鍣ㄧ紪鍙风墿鐞嗗垹闄ゆ帶鍒�
+ * 2024-6-7
+ *
+ * @param controllerId
+ * @return
+ */
+ public Integer deleteControllerByIdTwo(Long controllerId) {
+ return prControllerMapper.deleteByPrimaryKey(controllerId);
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ鎺у埗鍣ㄥ垪琛�
+ * 2024-6-7
+ *
+ * @param controllerId
+ * @return
+ */
+ public PrController getByControllerId(Long controllerId) {
+ return prControllerMapper.selectByPrimaryKey(controllerId);
+ }
+
+
+ /**
+ * 鍙戦�佸懡浠�
+ *
+ * @return
+ */
+ protected BaseResponse sendCom2Mw(Command com) {
+ String url = UriComponentsBuilder.fromUriString(comSendUrl)
+ .build()
+ .toUriString();
+ HttpHeaders headers = new HttpHeaders();
+ HttpEntity<Command> httpEntity = new HttpEntity<>(com, headers);
+ ResponseEntity<BaseResponse> response = null;
+ try {
+ // 閫氳繃Post鏂瑰紡璋冪敤鎺ュ彛
+ response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, BaseResponse.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return response.getBody();
}
}
--
Gitblit v1.8.0