From 556ac1e11a824bf8d0f8883d4b33a673100c2ea1 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 01 Nov 2021 13:39:53 +0800
Subject: [PATCH] 1.能量树
---
src/main/java/org/springblade/modules/energy/controller/EnergyTreeController.java | 8 ++++++++
src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.java | 2 +-
src/main/java/org/springblade/modules/energy/controller/EnergyController.java | 16 +++++++---------
src/main/java/org/springblade/modules/energy/service/impl/EnergyServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/energy/service/IEnergyService.java | 2 +-
src/main/java/org/springblade/modules/energy/entity/Energy.java | 1 +
src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.xml | 2 +-
7 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/energy/controller/EnergyController.java b/src/main/java/org/springblade/modules/energy/controller/EnergyController.java
index 0ba32e7..8cad7d9 100644
--- a/src/main/java/org/springblade/modules/energy/controller/EnergyController.java
+++ b/src/main/java/org/springblade/modules/energy/controller/EnergyController.java
@@ -157,18 +157,16 @@
* @return
*/
@PostMapping("/updateEnergyId")
- public R updateEnergyId(String id,String identification) {
- String[] strArray = id.split(",");
- for (int i = 0; i < strArray.length; i++) {
- energyService.updateEnergyId(strArray[i]);
- }
+ public R updateEnergyId(String id,String identification,int num) {
+
+ energyService.updateEnergyId(id,identification);
//能量树
String nums = energyTreeService.selectNum(identification);
Integer a=Integer.valueOf(nums);
- int length = strArray.length;
- int i = a + length;
- String num=String.valueOf(i);
- energyTreeService.updateEnergyTreeId(num,identification);
+ Integer n=Integer.valueOf(num);
+ int i1 = n + a;
+ String i = String.valueOf(i1);
+ energyTreeService.updateEnergyTreeId(i,identification);
return R.success("拾取成功");
}
diff --git a/src/main/java/org/springblade/modules/energy/controller/EnergyTreeController.java b/src/main/java/org/springblade/modules/energy/controller/EnergyTreeController.java
index 95eff6a..e0de7f8 100644
--- a/src/main/java/org/springblade/modules/energy/controller/EnergyTreeController.java
+++ b/src/main/java/org/springblade/modules/energy/controller/EnergyTreeController.java
@@ -122,4 +122,12 @@
return R.status(energyTreeService.removeByIds(Func.toLongList(ids)));
}
+
+
+ @GetMapping("/selectNum")
+ public R selectNum(String identification) {
+ String nums = energyTreeService.selectNum(identification);
+ return R.data(nums);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/energy/entity/Energy.java b/src/main/java/org/springblade/modules/energy/entity/Energy.java
index cf981c2..71b4057 100644
--- a/src/main/java/org/springblade/modules/energy/entity/Energy.java
+++ b/src/main/java/org/springblade/modules/energy/entity/Energy.java
@@ -48,6 +48,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date time;
private String type;
+ private Integer num;
}
diff --git a/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.java b/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.java
index 97afe6e..e4d3eba 100644
--- a/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.java
+++ b/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.java
@@ -34,7 +34,7 @@
public interface EnergyMapper extends BaseMapper<Energy> {
List<String> selectTreeNum(String time);
List<String> selectEnergyTree(String identification);
- void updateEnergyId(String id);
+ void updateEnergyId(String id,String identification);
void updateEnergyType(String code,String time);
String selectType(String time);
}
diff --git a/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.xml b/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.xml
index c2821ff..b1d9501 100644
--- a/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.xml
+++ b/src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.xml
@@ -17,7 +17,7 @@
<update id="updateEnergyId">
UPDATE sys_energy SET
- type = 0 WHERE id = #{id}
+ type = 0 WHERE id = #{id} and identification=#{identification}
</update>
<select id="selectType" resultType="java.lang.String">
diff --git a/src/main/java/org/springblade/modules/energy/service/IEnergyService.java b/src/main/java/org/springblade/modules/energy/service/IEnergyService.java
index f145d6f..c8771be 100644
--- a/src/main/java/org/springblade/modules/energy/service/IEnergyService.java
+++ b/src/main/java/org/springblade/modules/energy/service/IEnergyService.java
@@ -33,7 +33,7 @@
*/
public interface IEnergyService extends IService<Energy> {
List<String> selectTreeNum(String time);
- void updateEnergyId(String id);
+ void updateEnergyId(String id,String identification);
void updateEnergyType(String code,String time);
String selectType(String time);
List<String> selectEnergyTree(String identification);
diff --git a/src/main/java/org/springblade/modules/energy/service/impl/EnergyServiceImpl.java b/src/main/java/org/springblade/modules/energy/service/impl/EnergyServiceImpl.java
index 84f2be7..9530982 100644
--- a/src/main/java/org/springblade/modules/energy/service/impl/EnergyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/energy/service/impl/EnergyServiceImpl.java
@@ -48,8 +48,8 @@
}
@Override
- public void updateEnergyId(String id) {
- baseMapper.updateEnergyId(id);
+ public void updateEnergyId(String id,String identification) {
+ baseMapper.updateEnergyId(id,identification);
}
@Override
--
Gitblit v1.9.3