From 09762db33435f5b6bf8d1ec3b8acfabc807a8b17 Mon Sep 17 00:00:00 2001 From: whycxzp <glperry@163.com> Date: 星期二, 08 四月 2025 14:03:15 +0800 Subject: [PATCH] 更新电池告警参数接口 --- src/main/java/com/whyc/mapper/BattAlarmParamMapper.java | 6 +- src/main/java/com/whyc/controller/BattAlarmParamController.java | 30 +++++++++++++++ src/main/java/com/whyc/controller/AlarmParamController.java | 4 +- src/main/java/com/whyc/pojo/db_param/BattAlarmParam.java | 17 ++------ src/main/java/com/whyc/service/BattAlarmParamService.java | 25 +++++++++--- 5 files changed, 59 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/whyc/controller/AlarmParamController.java b/src/main/java/com/whyc/controller/AlarmParamController.java index d9a6de9..445435b 100644 --- a/src/main/java/com/whyc/controller/AlarmParamController.java +++ b/src/main/java/com/whyc/controller/AlarmParamController.java @@ -1,7 +1,7 @@ package com.whyc.controller; import com.whyc.dto.Response; -import com.whyc.pojo.db_param.BattalarmParam; +import com.whyc.pojo.db_param.BattAlarmParam; import com.whyc.pojo.db_param.PoweralarmParam; import com.whyc.service.BattAlarmParamService; import com.whyc.service.PoweralarmParamService; @@ -38,7 +38,7 @@ @ApiOperation("鐢垫睜鍛婅鍙傛暟璁剧疆") @PostMapping("setBattParam") - public Response setBattParam(@RequestBody List<BattalarmParam> list) { + public Response setBattParam(@RequestBody List<BattAlarmParam> list) { return service.setBattParam(list); } diff --git a/src/main/java/com/whyc/controller/BattAlarmParamController.java b/src/main/java/com/whyc/controller/BattAlarmParamController.java new file mode 100644 index 0000000..ed7afd5 --- /dev/null +++ b/src/main/java/com/whyc/controller/BattAlarmParamController.java @@ -0,0 +1,30 @@ +package com.whyc.controller; + +import com.whyc.dto.Response; +import com.whyc.pojo.db_param.BattAlarmParam; +import com.whyc.service.BattAlarmParamService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@Api(tags = "鐢垫睜鍛婅鍙傛暟") +@RequestMapping("battAlarmParam") +public class BattAlarmParamController { + + @Autowired + private BattAlarmParamService service; + + @GetMapping("getList") + public Response<List<BattAlarmParam>> getList() { + List<BattAlarmParam> list = service.getList(); + return new Response<List<BattAlarmParam>>().set(1,list); + } + + @PostMapping("updateByNum") + public Response updateByNum(@RequestBody BattAlarmParam param) { + return service.updateByNum(param); + } +} diff --git a/src/main/java/com/whyc/mapper/BattAlarmParamMapper.java b/src/main/java/com/whyc/mapper/BattAlarmParamMapper.java index 00a3dc0..939e9f0 100644 --- a/src/main/java/com/whyc/mapper/BattAlarmParamMapper.java +++ b/src/main/java/com/whyc/mapper/BattAlarmParamMapper.java @@ -1,13 +1,13 @@ package com.whyc.mapper; -import com.whyc.pojo.db_param.BattalarmParam; +import com.whyc.pojo.db_param.BattAlarmParam; import java.util.List; -public interface BattAlarmParamMapper extends CustomMapper<BattalarmParam>{ +public interface BattAlarmParamMapper extends CustomMapper<BattAlarmParam>{ //鐢垫睜鍛婅鍙傛暟璁剧疆--鍒楄〃鏌ヨ - List<BattalarmParam> serchByCondition(List alarmIds); + List<BattAlarmParam> serchByCondition(List alarmIds); List<Float> getParamInfoList(int alarmId,int alarmId2); } \ No newline at end of file diff --git a/src/main/java/com/whyc/pojo/db_param/BattalarmParam.java b/src/main/java/com/whyc/pojo/db_param/BattAlarmParam.java similarity index 82% rename from src/main/java/com/whyc/pojo/db_param/BattalarmParam.java rename to src/main/java/com/whyc/pojo/db_param/BattAlarmParam.java index 3cd17b6..f3fe91c 100644 --- a/src/main/java/com/whyc/pojo/db_param/BattalarmParam.java +++ b/src/main/java/com/whyc/pojo/db_param/BattAlarmParam.java @@ -1,6 +1,5 @@ package com.whyc.pojo.db_param; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,28 +7,22 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import lombok.experimental.Accessors; import java.io.Serializable; /** - * <p> - * - * </p> - * - * @author lxw - * @since 2021-12-14 + * 鐢垫睜鍛婅鍙傛暟琛� */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) +@ToString @TableName(schema ="db_param",value = "battalarm_param") -@ApiModel(value="BattalarmParam", description="") -public class BattalarmParam implements Serializable { +public class BattAlarmParam implements Serializable { private static final long serialVersionUID = 1L; - @TableField("num") + @TableId("num") @ApiModelProperty("涓婚敭缂栧彿") private Integer num; diff --git a/src/main/java/com/whyc/service/BattAlarmParamService.java b/src/main/java/com/whyc/service/BattAlarmParamService.java index cc816d4..acd3e32 100644 --- a/src/main/java/com/whyc/service/BattAlarmParamService.java +++ b/src/main/java/com/whyc/service/BattAlarmParamService.java @@ -1,12 +1,14 @@ package com.whyc.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.mapper.BattAlarmParamMapper; -import com.whyc.pojo.db_param.BattalarmParam; +import com.whyc.pojo.db_param.BattAlarmParam; import com.whyc.util.ActionUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,12 +34,12 @@ //鏌ヨ鐢垫睜浼樺姡濂藉潖鐨勬爣鍑� public Response serchQuality() { //0.鏌ヨ鍔e寲(鍛婅)鍜屾崯鍧�(鏇存崲)鐨勯槇鍊� - QueryWrapper<BattalarmParam> alarmWrapper = new QueryWrapper(); + QueryWrapper<BattAlarmParam> alarmWrapper = new QueryWrapper(); alarmWrapper.and(wrapper -> { return wrapper.eq("alm_name", "Batt_Alarm_Type_CapAlarm").or().eq("alm_name", "Batt_Alarm_Type_CapChange"); }); alarmWrapper.orderByAsc("alm_id"); - List<BattalarmParam> paramList = mapper.selectList(alarmWrapper); + List<BattAlarmParam> paramList = mapper.selectList(alarmWrapper); float capAlarm = 0f; float capChange = 0f; if (paramList != null && paramList.size() > 0) { @@ -55,15 +57,26 @@ //鍛婅鍙傛暟璁剧疆 @Transactional - public Response setBattParam(List<BattalarmParam> list) { + public Response setBattParam(List<BattAlarmParam> list) { if (list != null && list.size() > 0) { - for (BattalarmParam p : list) { + for (BattAlarmParam p : list) { UpdateWrapper wrapper = new UpdateWrapper(); wrapper.set("alm_low_coe", p.getAlmLowCoe()); wrapper.eq("alm_id", p.getAlmId()); - mapper.update((BattalarmParam) ActionUtil.objeNull, wrapper); + mapper.update((BattAlarmParam) ActionUtil.objeNull, wrapper); } } return new Response().set(1, true); } + + public List<BattAlarmParam> getList() { + QueryWrapper<BattAlarmParam> query = Wrappers.query(); + query.orderByAsc("num"); + return mapper.selectList(query); + } + + public Response updateByNum(BattAlarmParam param) { + mapper.updateById(param); + return new Response().setII(1,"淇敼瀹屾垚"); + } } -- Gitblit v1.9.1