From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。"
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java | 126 ++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 47 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
index f8ce89c..90bbc2d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java
@@ -10,6 +10,8 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveHistoryMapper;
+import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voRm.VoOpenClostWechat;
import com.dy.pipIrrWechat.intake.qo.OnLineIntakesQO;
@@ -63,35 +65,57 @@
this.env = env;
}
+
+ /**
+ * 鑾峰彇鍙栨按鍙ｅ垪琛�
+ * @return
+ */
+ public QueryResultVo<List<VoOnLineIntake>> selectSomeIntakes(OnLineIntakesQO qo) {
+ // 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄
+ String intakeNum = qo.getIntakeNum();
+ if(intakeNum != null) {
+ qo.setIntakeNum(intakeNum.toLowerCase());
+ }
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ Long itemTotal = prIntakeMapper.getSomeIntakesCount4Wx(params);
+
+ QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = prIntakeMapper.getSomeIntakes4Wx(params);
+ return rsVo;
+
+ }
+
/**
* 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栧彇姘村彛瀵硅薄
* @return
*/
public VoOnLineIntake selectOneIntake(OnLineIntakesQO qo) {
- Command com = new Command() ;
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+ //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));
+ //
+ //JSONArray jsonArray = new JSONArray();
+ //if(response != null && response.getString("code").equals("0001")) {
+ // JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
+ // if(attachment != null) {
+ // attachment.forEach((key, value) -> {
+ // JSONObject jsonObject = new JSONObject();
+ // jsonObject.put("rtuAddr", key);
+ // jsonObject.put("isOnLine", value);
+ // jsonArray.add(jsonObject);
+ // });
+ // }
+ //}
+ //qo.setOnLineMap(jsonArray.toJSONString());
- JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
-
- JSONArray jsonArray = new JSONArray();
- if(response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
- if(attachment != null) {
- attachment.forEach((key, value) -> {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", key);
- jsonObject.put("isOnLine", value);
- jsonArray.add(jsonObject);
- });
- }
- //} else {
- // return new VoOnLineIntake();
- }
-
- qo.setOnLineMap(jsonArray.toJSONString());
// 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄
String intakeNum = qo.getIntakeNum();
if(intakeNum != null) {
@@ -107,31 +131,28 @@
* @return
*/
public QueryResultVo<List<VoOnLineIntake>> selectAllIntakes(OnLineIntakesQO qo) {
- Command com = new Command() ;
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
+ //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));
+ //
+ //JSONArray jsonArray = new JSONArray();
+ //if(response != null && response.getString("code").equals("0001")) {
+ // JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
+ // if(attachment != null) {
+ // attachment.forEach((key, value) -> {
+ // JSONObject jsonObject = new JSONObject();
+ // jsonObject.put("rtuAddr", key);
+ // jsonObject.put("isOnLine", value);
+ // jsonArray.add(jsonObject);
+ // });
+ // }
+ //}
+ //qo.setOnLineMap(jsonArray.toJSONString());
- JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
-
- JSONArray jsonArray = new JSONArray();
- if(response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
- if(attachment != null) {
- attachment.forEach((key, value) -> {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", key);
- jsonObject.put("isOnLine", value);
- jsonArray.add(jsonObject);
- });
- }
- //} else {
- // QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
- // return rsVo;
- }
-
- qo.setOnLineMap(jsonArray.toJSONString());
// 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄
String intakeNum = qo.getIntakeNum();
if(intakeNum != null) {
@@ -251,4 +272,15 @@
rsVo.obj = rmOpenCloseValveHistoryMapper.getVcCardOpenClose(params);
return rsVo;
}
+
+ /**
+ * 寰楀埌鎵�鏈夊彇姘村彛
+ *
+ * @return 鎵�鏈夊彇姘村彛闆嗗悎
+ */
+ public QueryResultVo<List<VoAllIntake>> selectAll() {
+ QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
+ rsVo.obj = this.prIntakeMapper.selectAll();
+ return rsVo;
+ }
}
--
Gitblit v1.8.0