From 98680dbc7facfcfcd5ef0c00deb2f172929a34bd Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 16 五月 2025 16:38:49 +0800
Subject: [PATCH] 标记包机组是否为班组
---
src/main/java/com/whyc/service/BattInfService.java | 22 +++++++++++++++++++---
src/main/java/com/whyc/controller/BaojiGroupController.java | 6 ++++++
src/main/java/com/whyc/mapper/BattInfMapper.java | 3 +++
src/main/java/com/whyc/service/BaojigroupService.java | 8 ++++++++
src/main/resources/mapper/BattInfMapper.xml | 4 ++++
5 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BaojiGroupController.java b/src/main/java/com/whyc/controller/BaojiGroupController.java
index f083195..09d2ee2 100644
--- a/src/main/java/com/whyc/controller/BaojiGroupController.java
+++ b/src/main/java/com/whyc/controller/BaojiGroupController.java
@@ -21,6 +21,12 @@
public class BaojiGroupController {
@Autowired
private BaojigroupService service;
+
+ @ApiOperation("鏍囪鍖呮満缁勬槸鍚︿负鐝粍")
+ @GetMapping("setBaojiTeam")
+ public Response setBaojiTeam(@RequestParam Integer id, @RequestParam Integer teamFalg) {
+ return service.setBaojiTeam(id,teamFalg);
+ }
@ApiOperation("娣诲姞鍖呮満缁�")
@GetMapping("addBaoji")
public Response addBaoji(@RequestParam String baojiName) {
diff --git a/src/main/java/com/whyc/mapper/BattInfMapper.java b/src/main/java/com/whyc/mapper/BattInfMapper.java
index 332cd27..09a1a44 100644
--- a/src/main/java/com/whyc/mapper/BattInfMapper.java
+++ b/src/main/java/com/whyc/mapper/BattInfMapper.java
@@ -2,6 +2,7 @@
import com.whyc.dto.BattDto;
import com.whyc.pojo.db_station.BattInf;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -12,4 +13,6 @@
Integer getMaxBattGroupId();
//鏌ヨ鐢垫睜
List<BattInf> getBatt(BattDto dto);
+ //妫�娴嬬數婧愪笅鏄惁瀛樺湪璁惧
+ Integer getMaxDevNum(@Param("powerId") Integer powerId);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BaojigroupService.java b/src/main/java/com/whyc/service/BaojigroupService.java
index 7c23e92..f703a1b 100644
--- a/src/main/java/com/whyc/service/BaojigroupService.java
+++ b/src/main/java/com/whyc/service/BaojigroupService.java
@@ -201,4 +201,12 @@
List<BaojigroupUsr> list=bjUsrmapper.selectList(wrapper);
return list.size()>0?1:0 ;
}
+ //鏍囪鍖呮満缁勬槸鍚︿负鐝粍
+ public Response setBaojiTeam(Integer id, Integer teamFalg) {
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("baoji_group_id",id);
+ wrapper.set("team_flag",teamFalg);
+ int bl=mapper.update(null,wrapper);
+ return new Response().set(1,bl>0,"淇敼鍖呮満缁勭彮缁勬垚鍔�");
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 9f77385..ed4bf32 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -30,9 +30,25 @@
* 1.鍦ㄧ數婧愪笅鏂板缓璁惧锛岃褰曡澶囩紪鍙凤紝devNum,璁惧鍚嶇О涓鸿澶囩被鍨�+devNum
*/
public Response addDev(BattInf adddinf) {
- QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("station_id",adddinf.getStationId());
- wrapper.eq("power_id",adddinf.getPowerId());
+ //妫�娴嬬數婧愪笅鏄惁瀛樺湪璁惧
+ int devNum=mapper.getMaxDevNum(adddinf.getPowerId());
+ if(devNum==0){
+ devNum=1;
+ }else{
+ devNum+=1;
+ }
+ adddinf.setDevNum(devNum);
+ adddinf.setDevName(adddinf.getDevType()+devNum);
+ //鑾峰彇瀵瑰簲鐨勮澶噄d,鐢垫睜缁�
+ int devId = mapper.getMaxdevId();
+ int battGroupId=mapper.getMaxBattGroupId();
+ if (devId == 0) {//鏁版嵁搴撲腑娌℃湁绔欑偣
+ devId = 10001;
+ } else {
+ devId += 1;
+ }
+ adddinf.setDevId(devId);
+ adddinf.setBattgroupId(battGroupId);
return new Response().set(1, true, "鏂板缓鐢垫睜缁勶紙鏂扮殑璁惧鏂扮殑鐢垫睜缁勶級");
}
//璁惧涓嬫坊鍔犵數婧�
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index 7c8475a..d65d2d9 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -5,6 +5,9 @@
<select id="getMaxdevId" resultType="java.lang.Integer">
select ifnull(max(dev_id),0) from db_station.tb_batt_inf where dev_id>0;
</select>
+ <select id="getMaxDevNum" resultType="java.lang.Integer">
+ select ifnull(max(dev_num),0) from db_station.tb_batt_inf where power_id=#{powerId};
+ </select>
<select id="getMaxBattGroupId" resultType="java.lang.Integer">
select ifnull(max(battgroup_id),0) from db_station.tb_batt_inf where battgroup_id>0;
</select>
@@ -39,4 +42,5 @@
)
</if>
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1