From 8bcb47b7ea268061f4629e0953de4e3597fca690 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 七月 2024 22:16:53 +0800
Subject: [PATCH] 2024-07-16 朱宝民

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java |   71 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index 6d032a7..ae7601e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -3,6 +3,7 @@
 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.QueryResultVo;
 import com.dy.pipIrrGlobal.command.ComSupport;
@@ -19,6 +20,8 @@
 import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -45,6 +48,24 @@
     private final SeClientCardMapper seClientCardMapper;
 
     /**
+     * pro_mw锛氬睘鎬�
+     * tag浠庢帶鍒跺櫒涓幏鍙�
+     * key_mw锛歶rl鐨刱ey
+     */
+    private Environment env = null;
+    private String pro_mw = "mw";
+    private String key_mw = "comSendUrl";
+    @Autowired
+    public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, Environment env) {
+        this.rmCommandHistoryMapper = rmCommandHistoryMapper;
+        this.seVirtualCardMapper = seVirtualCardMapper;
+        this.prIntakeMapper = prIntakeMapper;
+        this.prWaterPriceMapper = prWaterPriceMapper;
+        this.prIntakeVcMapper = prIntakeVcMapper;
+        this.seClientCardMapper = seClientCardMapper;
+        this.env = env;
+    }
+    /**
      * 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
      * @param vcId
      * @return
@@ -62,25 +83,6 @@
     }
 
     /**
-     * 娣诲姞鍛戒护鏃ュ織
-     * @param po 鍛戒护鏃ュ織瀵硅薄
-     * @return 瀛楃涓茬被鍨嬬殑涓婚敭
-     */
-    public Long insert(RmCommandHistory po) {
-        rmCommandHistoryMapper.insert(po);
-        return po.getId();
-    }
-
-    /**
-     * 淇敼鍛戒护鏃ュ織淇℃伅
-     * @param po 鍛戒护鏃ュ織瀵硅薄
-     * @return 褰卞搷璁板綍鏁伴噺
-     */
-    public Integer update(RmCommandHistory po) {
-        return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
-    }
-
-    /**
      * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級
      * @param operator
      * @return
@@ -90,9 +92,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);
@@ -135,4 +137,33 @@
     public SeClientCard geClientCardByCardId(Long cardId) {
         return seClientCardMapper.selectByPrimaryKey(cardId);
     }
+
+    /**
+     * 娣诲姞鍛戒护鏃ュ織
+     * @param po 鍛戒护鏃ュ織瀵硅薄
+     * @return 瀛楃涓茬被鍨嬬殑涓婚敭
+     */
+    public Long insert(RmCommandHistory po) {
+        rmCommandHistoryMapper.insert(po);
+        return po.getComId();
+    }
+
+    /**
+     * 淇敼鍛戒护鏃ュ織淇℃伅
+     * @param po 鍛戒护鏃ュ織瀵硅薄
+     * @return 褰卞搷璁板綍鏁伴噺
+     */
+    public Integer update(RmCommandHistory po) {
+        return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
+    }
+
+    /**
+     * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
+     * @param intakeName
+     * @return
+     */
+    public Long getIntakeIdByName(String intakeName) {
+        return prIntakeMapper.getIntakeIdByName(intakeName);
+    }
+
 }

--
Gitblit v1.8.0