From 3a9c605296dfd81da4f53ae86cb913a746514575 Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期二, 10 六月 2025 17:56:47 +0800 Subject: [PATCH] 电源告警参数查询修改 --- src/main/resources/mapper/PwrdevAlarmParamMapper.xml | 37 ++++++++++++++++++ src/main/java/com/whyc/dto/Real/AlmDto.java | 1 src/main/java/com/whyc/controller/AlmParamController.java | 18 +++++++++ src/main/java/com/whyc/service/PwrdevAlarmParamService.java | 31 +++++++++++++++ src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java | 6 +++ src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParam.java | 21 ++++++++++ src/main/java/com/whyc/pojo/db_param/BattAlmparam.java | 1 7 files changed, 114 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java index 0713697..3979bc2 100644 --- a/src/main/java/com/whyc/controller/AlmParamController.java +++ b/src/main/java/com/whyc/controller/AlmParamController.java @@ -4,8 +4,10 @@ import com.whyc.dto.Response; import com.whyc.pojo.db_param.BattAlmparam; import com.whyc.pojo.db_param.DevAlmparam; +import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam; import com.whyc.service.BattAlmparamService; import com.whyc.service.DevAlmparamService; +import com.whyc.service.PwrdevAlarmParamService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,6 +25,9 @@ @Autowired private DevAlmparamService devAlmparamService; + + @Autowired + private PwrdevAlarmParamService pwrAlmparamService; @PostMapping("getBattAlmParam") @@ -49,4 +54,17 @@ public Response setDevAlmParam(@RequestBody List<DevAlmparam> almparamList){ return devAlmparamService.setDevAlmParam(almparamList); } + + @PostMapping("getPwrAlmParam") + @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟") + public Response getPwrAlmParam(@RequestBody AlmDto almDto){ + almDto.setUid(ActionUtil.getUser().getId()); + return pwrAlmparamService.getPwrAlmParam(almDto); + } + + @PostMapping("setPwrAlmParam") + @ApiOperation("淇敼鐢垫簮鍛婅鍙傛暟") + public Response setPwrAlmParam(@RequestBody List<PwrdevAlarmParam> almparamList){ + return pwrAlmparamService.setPwrAlmParam(almparamList); + } } \ No newline at end of file diff --git a/src/main/java/com/whyc/dto/Real/AlmDto.java b/src/main/java/com/whyc/dto/Real/AlmDto.java index 99280ba..d764ca4 100644 --- a/src/main/java/com/whyc/dto/Real/AlmDto.java +++ b/src/main/java/com/whyc/dto/Real/AlmDto.java @@ -13,6 +13,7 @@ private String city; private String country; private String stationName; + private String powerName; private String battgroupName; private List<Integer> almIds; private Integer almLevel; diff --git a/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java b/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java index 926853a..46b3ced 100644 --- a/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java +++ b/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java @@ -1,6 +1,12 @@ package com.whyc.mapper; +import com.whyc.dto.Real.AlmDto; import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface PwrdevAlarmParamMapper extends CustomMapper<PwrdevAlarmParam>{ + //鑾峰彇鐢垫簮鍛婅鍙傛暟 + List<PwrdevAlarmParam> getPwrAlmParam(@Param("almDto") AlmDto almDto); } \ No newline at end of file diff --git a/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java b/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java index 8610946..c2e2e41 100644 --- a/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java +++ b/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java @@ -93,7 +93,6 @@ @TableField(exist = false) private String stationName; - @ApiModelProperty(value = "鐢垫睜缁勫悕绉�") @TableField(exist = false) private String battgroupName; diff --git a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParam.java b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParam.java index d963cc0..090ce8d 100644 --- a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParam.java +++ b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParam.java @@ -1,6 +1,7 @@ package com.whyc.pojo.db_pwrdev_alarm; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -93,4 +94,24 @@ private Integer alarmLimithLevel; + @TableField(exist = false) + private String provice; + + @TableField(exist = false) + private String city; + + @TableField(exist = false) + private String country; + + @TableField(exist = false) + private String fullName; + + @TableField(exist = false) + private String stationName; + + @TableField(exist = false) + private String powerName; + + + } diff --git a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java index 0a9349b..38d73ba 100644 --- a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java +++ b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java @@ -1,11 +1,42 @@ package com.whyc.service; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.whyc.dto.Real.AlmDto; +import com.whyc.dto.Response; import com.whyc.mapper.PwrdevAlarmParamMapper; +import com.whyc.pojo.db_param.BattAlmparam; +import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam; +import com.whyc.util.ActionUtil; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; @Service public class PwrdevAlarmParamService { @Autowired(required = false) private PwrdevAlarmParamMapper mapper; + + //鑾峰彇鐢垫簮鍛婅鍙傛暟 + public Response getPwrAlmParam(AlmDto almDto) { + PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize()); + List<PwrdevAlarmParam> list = mapper.getPwrAlmParam(almDto); + PageInfo pageInfo=new PageInfo(list); + return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫簮鍛婅鍙傛暟"); + } + //淇敼鐢垫簮鍛婅鍙傛暟 + public Response setPwrAlmParam(List<PwrdevAlarmParam> almparamList) { + for (PwrdevAlarmParam param:almparamList) { + UpdateWrapper wrapper=new UpdateWrapper(); + wrapper.eq("power_id",param.getPowerId()); + wrapper.eq("alm_id",param.getAlmId()); + mapper.update(param,wrapper); + } + return new Response().set(1,true,"淇敼鐢垫簮鍛婅鍙傛暟"); + } } \ No newline at end of file diff --git a/src/main/resources/mapper/PwrdevAlarmParamMapper.xml b/src/main/resources/mapper/PwrdevAlarmParamMapper.xml new file mode 100644 index 0000000..04568da --- /dev/null +++ b/src/main/resources/mapper/PwrdevAlarmParamMapper.xml @@ -0,0 +1,37 @@ +<?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.PwrdevAlarmParamMapper"> + + <select id="getPwrAlmParam" resultType="com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam"> + select distinct tb_pwrdev_alarm_param.*,tb_power_inf.power_name + ,tb_station_inf.station_type,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name + from db_station.tb_power_inf,db_station.tb_station_inf,db_pwrdev_alarm.tb_pwrdev_alarm_param + <where> + tb_power_inf.power_id=tb_pwrdev_alarm_param.power_id + and tb_power_inf.station_id=tb_station_inf.station_id + <if test="almDto.provice!=null"> + and tb_station_inf.provice=#{almDto.provice} + </if> + <if test="almDto.city!=null"> + and tb_station_inf.city=#{almDto.city} + </if> + <if test="almDto.country!=null"> + and tb_station_inf.country=#{almDto.country} + </if> + <if test="almDto.stationName!=null"> + and tb_station_inf.station_name=#{almDto.stationName} + </if> + <if test="almDto.powerName!=null"> + and tb_power_inf.power_name=#{almDto.powerName} + </if> + <if test="almDto.uid>100"> + and tb_power_inf.power_id in( + select distinct power_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr + where tb_baojigroup_power.baoji_group_id=tb_baojigroup_usr.baoji_group_id + and tb_baojigroup_usr.uid=#{almDto.uid} + ) + </if> + order by tb_power_inf.power_id asc + </where> + </select> +</mapper> \ No newline at end of file -- Gitblit v1.9.1