From de44874bf493898eedc1a83f198a90c9f9f736ab Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 13:42:22 +0800
Subject: [PATCH] 电池和电源信息管理
---
src/main/java/com/whyc/pojo/db_batt/PowerInf.java | 4 +-
src/main/resources/mapper/PowerInfMapper.xml | 8 ++++
src/main/java/com/whyc/mapper/PowerInfMapper.java | 2 +
src/main/java/com/whyc/service/PowerInfService.java | 11 +++++
src/main/java/com/whyc/pojo/db_batt/StationInf.java | 6 +-
src/main/java/com/whyc/pojo/db_batt/StationBattRelation.java | 15 +++++++
src/main/java/com/whyc/pojo/db_batt/StationPowerRelation.java | 15 +++++++
src/main/java/com/whyc/controller/BattInfController.java | 4 ++
8 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattInfController.java b/src/main/java/com/whyc/controller/BattInfController.java
index 3cd1351..3455a37 100644
--- a/src/main/java/com/whyc/controller/BattInfController.java
+++ b/src/main/java/com/whyc/controller/BattInfController.java
@@ -8,6 +8,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+/**
+ * 寮冪敤,鏁村悎鍒扮數婧愪俊鎭〃浜�
+ */
+@Deprecated
@RestController
@Api(tags = "鐢垫睜淇℃伅")
@RequestMapping("battInf")
diff --git a/src/main/java/com/whyc/mapper/PowerInfMapper.java b/src/main/java/com/whyc/mapper/PowerInfMapper.java
index a268641..01b47ea 100644
--- a/src/main/java/com/whyc/mapper/PowerInfMapper.java
+++ b/src/main/java/com/whyc/mapper/PowerInfMapper.java
@@ -3,4 +3,6 @@
import com.whyc.pojo.db_batt.PowerInf;
public interface PowerInfMapper extends CustomMapper<PowerInf>{
+ Integer selectMaxBattGroupId();
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_batt/PowerInf.java b/src/main/java/com/whyc/pojo/db_batt/PowerInf.java
index 6bc3c44..aa8e2c3 100644
--- a/src/main/java/com/whyc/pojo/db_batt/PowerInf.java
+++ b/src/main/java/com/whyc/pojo/db_batt/PowerInf.java
@@ -57,11 +57,11 @@
@TableField("binf_id")
@ApiModelProperty("鐢垫睜id")
- private Integer binfId;
+ private Integer battGroupId;
@TableField("binf_name")
@ApiModelProperty("鐢垫睜缁勫悕绉�")
- private String binfName;
+ private String battGroupName;
@TableField("mon_vol")
diff --git a/src/main/java/com/whyc/pojo/db_batt/StationBattRelation.java b/src/main/java/com/whyc/pojo/db_batt/StationBattRelation.java
new file mode 100644
index 0000000..997e31f
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/db_batt/StationBattRelation.java
@@ -0,0 +1,15 @@
+package com.whyc.pojo.db_batt;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.ToString;
+
+/**
+ * 绔欑偣-鐢垫睜鍏宠仈琛�
+ */
+@TableName(schema = "db_batt",value = "sinf_binf")
+@ToString
+public class StationBattRelation {
+
+
+
+}
diff --git a/src/main/java/com/whyc/pojo/db_batt/StationInf.java b/src/main/java/com/whyc/pojo/db_batt/StationInf.java
index e9ac78f..416d0d1 100644
--- a/src/main/java/com/whyc/pojo/db_batt/StationInf.java
+++ b/src/main/java/com/whyc/pojo/db_batt/StationInf.java
@@ -21,16 +21,16 @@
public class StationInf {
@TableField("sinf_id")
@ApiModelProperty("鏈烘埧id")
- private Integer sinfId;
+ private Integer stationId;
@TableField("sinf_name")
@ApiModelProperty("鏈烘埧鍚嶇О")
- private String sinfName;
+ private String stationName;
@TableField("stype")
@ApiModelProperty("鏈烘埧绫诲瀷: 0<鍖呭惈鐢垫睜缁勫拰鐢垫簮>1<鐢垫睜缁�> 2<鐢垫簮>")
- private Integer stype;
+ private Integer type;
@TableField(exist = false)
private List<PowerInf> pinfList;
diff --git a/src/main/java/com/whyc/pojo/db_batt/StationPowerRelation.java b/src/main/java/com/whyc/pojo/db_batt/StationPowerRelation.java
new file mode 100644
index 0000000..841867e
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/db_batt/StationPowerRelation.java
@@ -0,0 +1,15 @@
+package com.whyc.pojo.db_batt;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.ToString;
+
+/**
+ * 绔欑偣-鐢垫簮鍏宠仈琛�
+ */
+@TableName(schema = "db_batt",value = "sinf_pinf")
+@ToString
+public class StationPowerRelation {
+
+
+
+}
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index dd4faef..ee17d7b 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -45,7 +45,7 @@
Integer devType=pinf.getDevType();
map.put("devType",devType);
if(devType!=3){//绗笁绉嶄笉鍖呭惈鍗曚綋瀹炴椂
- List<RtData> list=getBattRt(pinf.getBinfId());
+ List<RtData> list=getBattRt(pinf.getBattGroupId());
map.put("battRt",list);
}
Object obj=getRealRt(powerId,devType);
@@ -82,6 +82,15 @@
}
public Response add(PowerInf powerInf) {
+ //瀵筽owerInf鐨� devType杩涜鍒ゆ柇
+ //濡傛灉devType=3,battGroupId涓�0
+ //濡傛灉devType!=3,battGroupId涓烘暟鎹簱涓渶澶у��+1
+ Integer devType = powerInf.getDevType();
+ if(devType == 3){
+ powerInf.setBattGroupId(0);
+ }else{
+ powerInf.setBattGroupId(mapper.selectMaxBattGroupId()+1);
+ }
mapper.insert(powerInf);
return new Response().setII(1,"鏂板瀹屾垚");
}
diff --git a/src/main/resources/mapper/PowerInfMapper.xml b/src/main/resources/mapper/PowerInfMapper.xml
new file mode 100644
index 0000000..ce7cddb
--- /dev/null
+++ b/src/main/resources/mapper/PowerInfMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.whyc.mapper.PowerInfMapper" >
+
+ <select id="selectMaxBattGroupId" resultType="java.lang.Integer">
+ select max(binf_id) from power_inf
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1