From e563adb0b10dbd45d5f6a9617d5b2dabd1856060 Mon Sep 17 00:00:00 2001 From: whyczh <hzjl@qq.com> Date: 星期四, 09 十二月 2021 10:05:39 +0800 Subject: [PATCH] 更新电源新建接口编号问题;电池组信息分页接口 --- src/main/java/com/whyc/controller/PowerInfController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/whyc/controller/PowerInfController.java b/src/main/java/com/whyc/controller/PowerInfController.java index 7d5118e..5891697 100644 --- a/src/main/java/com/whyc/controller/PowerInfController.java +++ b/src/main/java/com/whyc/controller/PowerInfController.java @@ -3,15 +3,20 @@ import com.baomidou.mybatisplus.extension.api.R; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; +import com.whyc.factory.BattinfGroupFactory; import com.whyc.pojo.PowerInf; import com.whyc.pojo.UserInf; +import com.whyc.service.PowerAppSysService; import com.whyc.service.PowerInfService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import java.io.PipedWriter; import java.util.List; @RequestMapping("powerInf") @@ -20,11 +25,30 @@ public class PowerInfController { @Autowired private PowerInfService service; + @Autowired + private PowerAppSysService powerAppSysService; @PostMapping @ApiOperation(value = "娣诲姞鐢垫簮") public Response add(@RequestBody PowerInf powerInf){ + if(StringUtils.isEmpty(powerInf.getStationId())){ + powerInf.setStationId(String.valueOf(BattinfGroupFactory.searchStationId())); + } + powerInf.setPowerDeviceId(BattinfGroupFactory.searchmaxdev_id(powerInf.getPowerDeviceType())); service.add(powerInf); + //娣诲姞鐢垫簮绔欑偣鏃�,鏇存柊ReInit瀛楁涓�1,閫氳绋嬪簭鐩戞帶鍙樺寲閲嶆柊鍒濆鍖� + if(powerInf.getPowerDeviceType()==BattinfGroupFactory.DEVICE_POWER) { + boolean flag = powerAppSysService.updateFlag("AppServer_Reinit_PowerData_EN"); + if (!flag) { + System.out.println("鏇存柊updateReInit鎺ュ彛澶辫触"); + } + }else{ + //鍏呯數鏈哄拰缁濈紭瑁呯疆鐨�,鏇存柊鍙︿竴涓猂eInit瀛楁涓�1 + boolean flag = powerAppSysService.updateFlag("AppServer_Reinit_BattGroupData_EN"); + if (!flag) { + System.out.println("鏇存柊updateReInit鎺ュ彛澶辫触"); + } + } return new Response().setII(1,"娣诲姞鎴愬姛"); } @PutMapping -- Gitblit v1.9.1