From e6a9e6f750115579c8cc90d7e6d5bf1eebe79b90 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 05 十一月 2024 15:26:24 +0800
Subject: [PATCH] 获取农户数据去掉重复记录，微信支付的传参、返回值、接口、数据库表金额都以元为单位
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeSv.java | 113 +++++++++++++++++++++++++-------------------------------
1 files changed, 51 insertions(+), 62 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 bf1091b..f8ce89c 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
@@ -6,6 +6,7 @@
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.mw.protocol.Command;
import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveHistoryMapper;
@@ -25,7 +26,6 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -75,40 +75,31 @@
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");
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
- JSONArray jsonArray = new JSONArray();
+ JSONArray jsonArray = new JSONArray();
+ if(response != null && response.getString("code").equals("0001")) {
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
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);
- //}
attachment.forEach((key, value) -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put("rtuAddr", key);
jsonObject.put("isOnLine", value);
jsonArray.add(jsonObject);
-
});
}
-
- qo.setOnLineMap(jsonArray.toJSONString());
- // 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄
- String intakeNum = qo.getIntakeNum();
- if(intakeNum != null) {
- qo.setIntakeNum(intakeNum.toLowerCase());
- }
-
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
- return prIntakeMapper.getIntakeByName(params);
- } else {
- return new VoOnLineIntake();
+ //} else {
+ // return new VoOnLineIntake();
}
+
+ qo.setOnLineMap(jsonArray.toJSONString());
+ // 濡傛灉 intakeNum 涓嶄负绌猴紝鍒欒浆涓哄皬鍐欏啀鍐欏叆qo瀵硅薄
+ String intakeNum = qo.getIntakeNum();
+ if(intakeNum != null) {
+ qo.setIntakeNum(intakeNum.toLowerCase());
+ }
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ return prIntakeMapper.getIntakeByName(params);
}
/**
@@ -123,48 +114,40 @@
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");
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
- JSONArray jsonArray = new JSONArray();
+ JSONArray jsonArray = new JSONArray();
+ if(response != null && response.getString("code").equals("0001")) {
+ JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
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);
- //}
attachment.forEach((key, value) -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put("rtuAddr", key);
jsonObject.put("isOnLine", value);
jsonArray.add(jsonObject);
-
});
}
-
- qo.setOnLineMap(jsonArray.toJSONString());
- // 濡傛灉 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.getOnLineIntakesCount(params);
-
- QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = qo.pageSize ;
- rsVo.pageCurr = qo.pageCurr ;
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = prIntakeMapper.getOnLineIntakes(params);
- return rsVo;
- } else {
- QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
- return rsVo;
+ //} else {
+ // QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
+ // return rsVo;
}
+
+ qo.setOnLineMap(jsonArray.toJSONString());
+ // 濡傛灉 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.getOnLineIntakesCount(params);
+
+ QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = prIntakeMapper.getOnLineIntakes(params);
+ return rsVo;
+
}
/**
@@ -184,10 +167,9 @@
//JSONObject response = JSON.parseObject(response_Str);
//String test = response.toJSONString();
+ JSONArray jsonArray = new JSONArray();
if(response != null && response.getString("code").equals("0001")) {
JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");
-
- JSONArray jsonArray = new JSONArray();
if(attachment != null) {
attachment.forEach((key, value) -> {
JSONObject jsonObject = new JSONObject();
@@ -199,10 +181,12 @@
}
System.out.println(jsonArray.toJSONString());
- return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operatorId);
- } else {
- return new ArrayList<>();
+ //return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operatorId);
+ //} else {
+ // return new ArrayList<>();
}
+
+ return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operatorId);
}
/**
@@ -222,6 +206,11 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ if(response == null) {
+ return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�");
+ }
+
return response.getBody();
}
--
Gitblit v1.8.0