From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-

---
 src/main/java/com/whyc/service/Fbs9100SetparamService.java |  106 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 97 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/whyc/service/Fbs9100SetparamService.java b/src/main/java/com/whyc/service/Fbs9100SetparamService.java
index cc1a278..39d6411 100644
--- a/src/main/java/com/whyc/service/Fbs9100SetparamService.java
+++ b/src/main/java/com/whyc/service/Fbs9100SetparamService.java
@@ -18,6 +18,7 @@
 import com.whyc.pojo.Li9130SetparamPlan;
 import com.whyc.util.ActionUtil;
 import com.whyc.util.ThreadLocalUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,7 +36,8 @@
     private BattInfMapper binfMapper;
     @Resource
     private Fbs9100SetParamTempMapper tmpMapper;
-
+    @Autowired
+    private PwrdevAcdcdataService pwrdevAcdcservice;
     //鏌ヨ璁惧鐨勫弬鏁�
     public Response serchdevParam(int devId) {
         sendCmdToFBS9100Dev(FBS9100_ComBase.CMD_GetDischargeParm, 0, devId);
@@ -46,7 +48,7 @@
         return new Response().set(1, pageInfo);
     }
 
-    //鍙抽敭鏌ョ湅鍙傛暟鍜屽脊鍑烘鐨勫埛鏂版寜閽�-----BTS鍋滄
+    //鍙抽敭鏌ョ湅鍙傛暟鍜屽脊鍑烘鐨勫埛鏂版寜閽�-----BTS鍋滄61850锛�6184
     public Response serchbyDev_id(int num, Integer testCmd, int devId, int battGroupNum) {
         boolean bl = sendCmdToFBS9100Dev2(num, testCmd != null ? testCmd : 0, devId, battGroupNum);
         if ((devId / 100000 == DeviceTypeDTO.DEVICE6185) && (num == FBS9100_ComBase.CMD_Start)) {//褰撳惎鍔ㄦ斁鐢佃澶囦负6185鏃�
@@ -68,7 +70,27 @@
             tmpMapper.update((Fbs9100SetParamTemp) ActionUtil.objeNull, wrapper);
 
         }
-        Fbs9100Setparam setparam = mapper.serchbyDev_id(devId);
+        Fbs9100Setparam setparam = mapper.serchbyDev_id(devId,battGroupNum-1);
+        /*閲嶅簡bts4810(61850)
+        鐩墠瀹㈡埛鐨勮礋杞界數娴佹瘮杈冨皬锛屽厖鏀剧數鍙傛暟璁剧疆鏃讹紝灏忎簬0.1C10鐨�,鐢垫祦鍊艰姹傝兘鑷姩璇嗗埆锛�
+        閲囩敤涓�澶╁唴鐢垫祦骞冲潎鍊兼潵鏀剧數銆傝礋杞界數娴佸ぇ浜�0.1C10.鐢�0.1C10鏀剧數瀹㈡埛瑕佹眰鑷姩濉厖,涓嶈浜轰负鐨勫綍鍏�.
+        锛�100AH鐢垫睜 璐熻浇鐢垫祦灏忎簬10A 灏辩敤璐熻浇鐢垫祦鐨勫钩鍧囧�� 澶т簬10A 灏辩敤10A锛�
+        */
+        if (devId / 100000 == DeviceTypeDTO.DEVICE6185){
+            //鏍规嵁devId鑾峰彇鏈烘埧id
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("FBSDeviceId", devId);
+            queryWrapper.last("limit 1");
+            Battinf binf = binfMapper.selectOne(queryWrapper);
+            if(binf!=null){
+                //鑾峰彇鐢垫簮鐨勮礋杞界數娴�
+                float loadCurr=pwrdevAcdcservice.getBts4810LoadCurr(binf.getStationId(),binf.getMonCapStd());
+                setparam.setLoadCurr(loadCurr);
+            }else {
+                setparam.setLoadCurr(0f);
+            }
+
+        }
         return new Response().setII(1, setparam, bl, bl == true ? "鏌ヨ鎴愬姛!" : "璁剧疆9100鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
     }
     //鍐呴樆娴嬭瘯
@@ -84,7 +106,7 @@
         wrapper.set("is_startup", 0);
         wrapper.eq("dev_id", devId);
         int flag = li9130Mapper.update((Li9130SetparamPlan) ActionUtil.objeNull, wrapper);
-        Fbs9100Setparam setparam = mapper.serchbyDev_id(devId);
+        Fbs9100Setparam setparam = mapper.serchbyDev_id(devId,battGroupNum-1);
         return new Response().setIII(1, setparam, bl, flag > 0, bl == true ? "鏌ヨ鎴愬姛!" : "璁剧疆9100鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
     }
 
@@ -140,6 +162,28 @@
         }
         return new Response().set(1,bl,bl==true?"淇敼鍙傛暟鎴愬姛!":"璁剧疆61850鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
     }
+
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-璁剧疆61853鏀剧數鍙傛暟璁剧疆
+    public Response update61853Param(Fbs9100Setparam fbs9100Setparam) {
+        Boolean b=mapper.update61853Param(fbs9100Setparam);
+        boolean bl=false;
+        if(b){
+            bl=sendCmdToFBS9100Dev(fbs9100Setparam.getNum().intValue(),0,fbs9100Setparam.getDevId().intValue());
+        }
+        return new Response().set(1,bl,bl==true?"淇敼鍙傛暟鎴愬姛!":"璁剧疆61853鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+    }
+
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-璁剧疆6186鏀剧數鍙傛暟璁剧疆
+    public Response update6186Param(Fbs9100Setparam fbs9100Setparam) {
+        Boolean b=mapper.update6186Param(fbs9100Setparam);
+        boolean bl=false;
+        if(b){
+            bl=sendCmdToFBS9100Dev(fbs9100Setparam.getNum().intValue(),0,fbs9100Setparam.getDevId().intValue());
+        }
+        return new Response().set(1,bl,bl==true?"淇敼鍙傛暟鎴愬姛!":"璁剧疆61853鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+    }
+
+
 
     //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-A059鍙戦�佹寚浠�
     public Response updateA059Cmd(int opCmd, int devId) {
@@ -289,11 +333,12 @@
         boolean res_exe = false;
         if(flag>0)
         {
+            PageHelper.startPage(1,1);
+            QueryWrapper queryWrapper=new QueryWrapper();
+            queryWrapper.eq("dev_id",dev_id);
             for(int n=0; n<stopTime; n++)
             {
-                PageHelper.startPage(1,1);
-                QueryWrapper queryWrapper=new QueryWrapper();
-                queryWrapper.eq("dev_id",dev_id);
+
                 Fbs9100Setparam fbs9100Setparam=mapper.selectOne(queryWrapper);
                 if(fbs9100Setparam!=null){
                     if (fbs9100Setparam.getOpCmd() == m_cmd_ack) {
@@ -456,7 +501,7 @@
         UpdateWrapper updateWrapper=new UpdateWrapper();
         updateWrapper.set("op_cmd",m_cmd);
         updateWrapper.set("BattGroupNum",battGroupNum);
-        if(test_type > 0 && cmd == FBS9100_ComBase.CMD_Start){					//鍚姩娴嬭瘯鏃舵湭鐐瑰嚮璁惧畾鍙傛暟鎸夐挳锛屼細鍑虹幇鍚姩鍐呴樆娴嬭瘯bug淇
+        if(test_type > 0 && (cmd == FBS9100_ComBase.CMD_Start||cmd == FBS9100_ComBase.CMD_Stop)){					//鍚姩娴嬭瘯鏃舵湭鐐瑰嚮璁惧畾鍙傛暟鎸夐挳锛屼細鍑虹幇鍚姩鍐呴樆娴嬭瘯bug淇
             updateWrapper.set("TestCmd",test_type);
         }
         updateWrapper.eq("dev_id",dev_id);
@@ -477,7 +522,7 @@
                         break;
                     }
                     try {
-                        Thread.sleep(250);
+                        Thread.sleep(500);
                     } catch (InterruptedException e) {
                         // TODO Auto-generated catch block
                         e.printStackTrace();
@@ -829,5 +874,48 @@
         boolean bl = sendCmdToFBS9100Dev(opCmd, testType, devId);
         return new Response().set(1, bl, bl == true ? "鎿嶆帶FBO4830鎴愬姛!" : "鎿嶆帶FBO4830澶辫触,璇锋鏌ョ綉缁�!");
     }
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-璁剧疆6184鏀剧數鍙傛暟璁剧疆
+    public Response update6184Param(Fbs9100Setparam fbs9100Setparam) {
+        Boolean b=mapper.update6184Param(fbs9100Setparam);
+        boolean bl=false;
+        if(b){
+            bl=sendCmdToFBS9100Dev2(FBS9100_ComBase.CMD_SetDischargeParm,0,fbs9100Setparam.getDevId().intValue(),fbs9100Setparam.getBattGroupNum());
+        }
+        return new Response().set(1,bl,bl==true?"淇敼鍙傛暟鎴愬姛!":"璁剧疆6184鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+    }
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-璇诲彇6184鏀剧數鍙傛暟
+    public Response get6184Param(int devId, int battGroupNum) {
+        PageHelper.startPage(1, 1);
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("dev_id", devId);
+        boolean bl = sendCmdToFBS9100Dev2(FBS9100_ComBase.CMD_GetDischargeParm,0, devId, battGroupNum);
+        Fbs9100Setparam setparam = mapper.serchbyDev_id(devId,battGroupNum-1);
+        return new Response().setII(1, bl, setparam, bl == true ? "璇诲彇鍙傛暟鎴愬姛!" : "璇诲彇6184鏀剧數鍙傛暟,璇锋鏌ョ綉缁�!");
+    }
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-6184璁惧杩滅▼閲嶅惎
+    public Response restart6184(int devId, int battGroupNum) {
+        boolean bl = sendCmdToFBS9100Dev2(FBS9100_ComBase.CMD_ResetSystem,0, devId, battGroupNum);
+        return new Response().set(1,bl,bl==true?"6184璁惧杩滅▼閲嶅惎鎴愬姛!":"6184璁惧杩滅▼閲嶅惎澶辫触!");
+    }
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-6184杩滅▼鍚姩鏀剧數娴嬭瘯
+    public Response startDis6184(int devId, int battGroupNum) {
+        boolean bl = sendCmdToFBS9100Dev2(FBS9100_ComBase.CMD_Start,FBS9100_ComBase.CMD_StartDischarge, devId, battGroupNum);
+        return new Response().set(1,bl,bl==true?"6184杩滅▼鍚姩鏀剧數娴嬭瘯鎴愬姛!":"6184杩滅▼鍚姩鏀剧數娴嬭瘯澶辫触!");
+    }
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-6184鍚姩鍐呴樆娴嬭瘯
+    public Response startRes6184(int devId, int battGroupNum) {
+        boolean bl = sendCmdToFBS9100Dev2(FBS9100_ComBase.CMD_Start,FBS9100_ComBase.CMD_StartResDischarge, devId, battGroupNum);
+        return new Response().set(1,bl,bl==true?"鍚姩鍐呴樆娴嬭瘯鎴愬姛!":"鍚姩鍐呴樆娴嬭瘯澶辫触!");
+    }
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-6184鍋滄娴嬭瘯
+    public Response stop6184(int devId, int battGroupNum) {
+        boolean bl = sendCmdToFBS9100Dev2(FBS9100_ComBase.CMD_Stop,FBS9100_ComBase.CMD_StopDischarge, devId, battGroupNum);
+        return new Response().set(1,bl,bl==true?"6184鍋滄娴嬭瘯鎴愬姛!":"6184鍋滄娴嬭瘯澶辫触!");
+    }
 
+    //鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶-6184鍋滄鍐呴樆娴嬭瘯
+    public Response stopRes6184(int devId, int battGroupNum) {
+        boolean bl = sendCmdToFBS9100Dev2(FBS9100_ComBase.CMD_Stop,FBS9100_ComBase.CMD_StopResDischarge, devId, battGroupNum);
+        return new Response().set(1,bl,bl==true?"鍋滄鍐呴樆娴嬭瘯鎴愬姛!":"鍋滄鍐呴樆娴嬭瘯澶辫触!");
+    }
 }

--
Gitblit v1.9.1