From c6beb89b7170115eada78526f87406381c931229 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 四月 2025 10:37:51 +0800
Subject: [PATCH] 灌溉计划发布时仅发布灌溉时长大于0的
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 132 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 50 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 7ef112d..caa9e6d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -3,19 +3,23 @@
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.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.config.DingTalk;
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat;
+import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
-import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
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;
@@ -25,7 +29,9 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
/**
* @author wuzeyu
@@ -46,14 +52,28 @@
@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 IntakeSv(Environment env) {
+ this.env = env;
+ }
@Autowired
private DingTalk dingTalk;
public String sendMessage(String message) {
try {
- dingTalk.sendMessage(message);
+ dingTalk.sendMessage(DataSourceContext.get(), this.env, message);
} catch (Exception e) {
return "鍙戦�佸け璐�";
}
@@ -70,7 +90,7 @@
Integer addIntake(PrIntake po) {
Long villageId = Optional.ofNullable(po.getVillageId()).orElse(0L);
- if (villageId != 0){
+ if (villageId != 0) {
if (po.getTownId() == null || po.getTownId() == 0) {
Long townId = getSupperByVillageId(po.getVillageId());
po.setTownId(townId);
@@ -91,7 +111,6 @@
return prIntakeMapper.getSupperByVillageId(vaId);
}
-
/**
* 淇濆瓨淇敼瀹炰綋
*
@@ -100,14 +119,14 @@
*/
public int update(PrIntake po) {
- if (po.getTownId() == null || po.getTownId() == 0) {
- Long townId = getSupperByVillageId(po.getVillageId());
- po.setTownId(townId);
- }
- if (po.getCountyId() == null || po.getCountyId() == 0) {
- Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
- po.setCountyId(countyId);
- }
+// if (po.getTownId() == null || po.getTownId() == 0) {
+// Long townId = getSupperByVillageId(po.getVillageId());
+// po.setTownId(townId);
+// }
+// if (po.getCountyId() == null || po.getCountyId() == 0) {
+// Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
+// po.setCountyId(countyId);
+// }
return this.prIntakeMapper.updateByPrimaryKeySelective(po);
// return this.prIntakeMapper.updateByPrimaryKey(po);
}
@@ -119,12 +138,6 @@
* @return 鍙栨按鍙ｈ褰曞垪琛�
*/
public QueryResultVo<List<VoIntake>> getIntakes(QueryVo queryVo) {
-// String isBinded = queryVo.getIsBinded();
-//
-// if(isBinded == null || isBinded.length() <= 0) {
-//
-// }
-
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
Long itemTotal = prIntakeMapper.getRecordCount(params);
@@ -153,8 +166,8 @@
*
* @return 鎵�鏈夊彇姘村彛闆嗗悎
*/
- public QueryResultVo<List<PrIntake>> selectAll() {
- QueryResultVo<List<PrIntake>> rsVo = new QueryResultVo<>();
+ public QueryResultVo<List<VoAllIntake>> selectAll() {
+ QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
rsVo.obj = this.prIntakeMapper.selectAll();
return rsVo;
}
@@ -165,7 +178,7 @@
* @param id 鍙栨按鍙D
* @return 鍙栨按鍙ｅ疄浣�
*/
- public PrIntake selectById(Long id) {
+ public VoAllIntake selectById(Long id) {
return this.prIntakeMapper.selectByPrimaryKey(id);
}
@@ -211,18 +224,20 @@
}
/**
+ * 姝ゅ姛鑳藉凡缍撶Щ妞嶅埌remote妯″鐨凪onitroSv涓�
+ *
* 鑾峰彇鍙栨按鍙ｅ垪琛�
+ *
* @return
- */
- public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) {
- Command com = new Command() ;
+ public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(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);
JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
-
- if(response != null && response.getString("code").equals("0001")) {
+ 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);
@@ -235,12 +250,12 @@
}
qo.setOnLineMap(jsonArray.toJSONString());
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ 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 ;
+ 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;
@@ -248,43 +263,45 @@
QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
return rsVo;
}
- }
-
+ }
+ */
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
+ *
* @param operator
* @return
*/
public List<VoOnLineIntake> getUsedIntakes(Long operator) {
- Command com = new Command() ;
+ Command com = new Command();
com.id = Command.defaultId;
com.code = "LCD0001";
com.type = "innerCommand";
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);
+ 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);
+ });
}
- return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
- } else {
- return new ArrayList<>();
+ //} else {
+ // return new ArrayList<>();
}
+ return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
}
/**
* 鍙戦�佸懡浠�
+ *
* @return
*/
- protected BaseResponse sendCom2Mw(Command com){
- String url = UriComponentsBuilder.fromUriString(mwUrlSendCom)
+ protected BaseResponse sendCom2Mw(Command com) {
+ String url = UriComponentsBuilder.fromUriString(comSendUrl)
.build()
.toUriString();
HttpHeaders headers = new HttpHeaders();
@@ -296,12 +313,18 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ if(response == null) {
+ return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�");
+ }
+
return response.getBody();
}
/**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ *
* @param intakeName
* @return
*/
@@ -311,6 +334,7 @@
/**
* 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ *
* @param intakeName
* @return
*/
@@ -319,4 +343,12 @@
}
+ /**
+ * app淇敼鍙栨按鍙ｇ粡绾害
+ * @param po
+ * @return
+ */
+ public int updateIntakeLngLat(IntakeUpdateLngLat po) {
+ return prIntakeMapper.updateByPrimaryKeySelective1(po);
+ }
}
--
Gitblit v1.8.0