From 78087f225a4b90fba36c0c0697bc457cb363a5ab Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 16 五月 2025 16:06:30 +0800
Subject: [PATCH] 新建电源

---
 src/main/java/com/whyc/service/PowerInfService.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 672a890..35bd968 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -30,7 +30,11 @@
     @Autowired(required = false)
     private BaojigroupService bjService;
 
-    //娣诲姞鐢垫簮
+    /*娣诲姞鐢垫簮
+    1.鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏄寘缁勭敤鎴�
+    2.鍒ゆ柇鏈烘埧鏄惁瀛樺湪锛岃嫢瀛樺湪鍒欏湪鏈烘埧涓嬫坊鍔犵數婧愶紝鑻ヤ笉瀛樺湪鍒欐柊寤烘満鎴�+鏂板缓鐢垫簮
+    3.鐢垫簮闇�瑕佺紪鍙凤紝powerNum缂栧彿锛岀數婧愬悕绉拌嚜鍔ㄧ敓鎴愰�氳鐢垫簮+powerNum
+    */
     @Transactional
    public Response addPower(PowerInf addpinf) {
        //鍏堟牎楠屽綋鍓嶇敤鎴锋槸鍚﹀瓨鍦ㄥ寘鏈虹粍涓嶅瓨鍦ㄥ垯涓嶈娣诲姞鐢垫簮
@@ -64,17 +68,17 @@
             addsinf.setStationId(stationId);
             sinfMapper.insert(addsinf);
         }
-        //鍒ゆ柇鏈烘埧鏄惁瀛樺湪
-        QueryWrapper wrapper1=new QueryWrapper();
-        wrapper1.eq("power_name",addpinf.getPowerName());
-        wrapper1.eq("station_id",stationId);
-        wrapper1.last("limit 1");
-        PowerInf juegep=mapper.selectOne(wrapper);
-        if(juegep==null){
-            return new Response().set(1, false, "褰撳墠鏈烘埧涓嬪凡娣诲姞杩囪鐢垫簮");
+        //鐢垫簮闇�瑕佺紪鍙凤紝powerNum缂栧彿锛岀數婧愬悕绉拌嚜鍔ㄧ敓鎴愰�氳鐢垫簮+powerNum
+        int powerNum=mapper.getMaxPowerNum(stationId);
+        if(powerNum==0){
+            powerNum=1;
+        }else{
+            powerNum+=1;
         }
         //鍐嶆坊鍔犵數婧愪俊鎭�
         addpinf.setStationId(stationId);
+        addpinf.setPowerNum(powerNum);
+        addpinf.setPowerName("閫氳鐢垫簮"+powerNum);
         //鑾峰彇瀵瑰簲鐨勭數婧恑d
         powerId = mapper.getMaxPowerId();
         if (powerId == 0) {//鏁版嵁搴撲腑娌℃湁绔欑偣

--
Gitblit v1.9.1