From e1cb03bf866b04589dd5457db1f4517d9e77f42d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 15:45:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 1c61f81..f35f3f1 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,9 +3,11 @@
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.config.DingTalk;
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
@@ -15,6 +17,7 @@
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;
@@ -45,8 +48,32 @@
@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(DataSourceContext.get(), this.env, message);
+ } catch (Exception e) {
+ return "鍙戦�佸け璐�";
+ }
+ return "鍙戦�佹垚鍔�";
+ }
/**
* 娣诲姞鍙栨按鍙�
@@ -78,7 +105,6 @@
public Long getSupperByVillageId(long vaId) {
return prIntakeMapper.getSupperByVillageId(vaId);
}
-
/**
* 淇濆瓨淇敼瀹炰綋
@@ -207,9 +233,9 @@
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);
@@ -272,7 +298,7 @@
* @return
*/
protected BaseResponse sendCom2Mw(Command com){
- String url = UriComponentsBuilder.fromUriString(mwUrlSendCom)
+ String url = UriComponentsBuilder.fromUriString(comSendUrl)
.build()
.toUriString();
HttpHeaders headers = new HttpHeaders();
@@ -287,12 +313,14 @@
return response.getBody();
}
+
/**
- * 寰楀埌鎵�鏈夊彇姘村彛鍚嶇О
+ * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
+ * @param intakeName
* @return
*/
- public List<String> getIntakeName() {
- return prIntakeMapper.getIntakeName();
+ public List<Long> getIntakeIdsByName(String intakeName) {
+ return prIntakeMapper.getIntakeIdsByName(intakeName);
}
/**
@@ -300,7 +328,9 @@
* @param intakeName
* @return
*/
- public List<Long> getIntakeIdByName1(String intakeName) {
- return prIntakeMapper.getIntakeIdByName1(intakeName);
+ public List<Long> getIntakeIdByNameExcludeId(Long id, String intakeName) {
+ return prIntakeMapper.getIntakeIdByNameExcludeId(id, intakeName);
}
+
+
}
--
Gitblit v1.8.0