From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/energy/controller/EnergyController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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("拾取成功");
}
--
Gitblit v1.9.3