src/main/java/com/whyc/controller/BattalarmDataController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/dto/result/AlarmStaticRes.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/BattalarmDataMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattalarmDataService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/config/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BattalarmDataMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/BattalarmDataController.java
@@ -8,6 +8,8 @@ import com.whyc.dto.result.AlarmRes; import com.whyc.dto.result.AlarmStaticRes; import com.whyc.pojo.BattalarmData; import com.whyc.pojo.User; import com.whyc.pojo.UserInf; import com.whyc.service.BattalarmDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -66,4 +68,27 @@ public Response cancelalarmPro(@RequestBody List<BattalarmData> list){ return service.cancelalarmPro(list); } @PostMapping("/serchRealTime") @ApiOperation(value = "实时告警记录总数查询") public Response serchRealTime(@RequestBody UserInf uinf){ return service.serchRealTime(uinf); } @PostMapping("/update") @ApiOperation(value = "确认告警") public Response update(@RequestBody List<BattalarmData> list){ return service.update(list); } @PostMapping("/delete") @ApiOperation(value = "删除告警") public Response delete(@RequestBody List<BattalarmData> list) { return service.delete(list); } @PostMapping("/serchGood") @ApiOperation(value = "电池单体健康率") public Response serchGood(@RequestBody UserInf uinf) { return service.serchGood(uinf); } } src/main/java/com/whyc/dto/result/AlarmStaticRes.java
@@ -14,4 +14,5 @@ public class AlarmStaticRes implements Serializable { private int number;//告警数量 private int almId;//告警类型id private int battGroupId;//电池组id } src/main/java/com/whyc/mapper/BattalarmDataMapper.java
@@ -5,6 +5,7 @@ import com.whyc.dto.result.AlarmRes; import com.whyc.dto.result.AlarmStaticRes; import com.whyc.pojo.BattalarmData; import com.whyc.pojo.UserInf; import java.util.List; @@ -26,4 +27,12 @@ //根据num取消告警(多条记录) int cancelalarmPro(List<BattalarmData> list); //实时告警记录总数查询 int serchRealTime(UserInf uinf); //电池单体健康率 List<AlarmRes> serchGood(UserInf uinf); } src/main/java/com/whyc/service/BattalarmDataService.java
@@ -15,6 +15,7 @@ import com.whyc.dto.result.AlarmNumberRes; import com.whyc.mapper.BattalarmDataMapper; import com.whyc.pojo.BattalarmData; import com.whyc.pojo.UserInf; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -173,4 +174,42 @@ } return new Response().set(flag); } //实时告警记录总数查询 public Response serchRealTime(UserInf uinf) { int number=mapper.serchRealTime(uinf); return new Response().set(number); } //电池告警实时查询(确认告警) @Transactional public Response update(List<BattalarmData> list) { int flag=0; for (BattalarmData adata:list) { //修改的属性 UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.set("alm_is_confirmed",1); wrapper.set("alm_confirmed_time",adata.getAlmConfirmedTime()); // 通过num修改 wrapper.eq("num",adata.getNum()); flag=mapper.update(null,wrapper); } return new Response().set(flag); } //删除告警记录 @Transactional public Response delete(List<BattalarmData> list) { int flag=0; for (BattalarmData adata:list) { UpdateWrapper wrapper = new UpdateWrapper<>(); // 通过num删除 wrapper.eq("num",adata.getNum()); flag=mapper.delete(wrapper); } return new Response().set(flag); } //电池单体健康率 public Response serchGood(UserInf uinf) { List list=mapper.serchGood(uinf); return new Response().set(1,list); } } src/main/resources/config/application.yml
@@ -9,8 +9,8 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true # url: jdbc:mysql://192.168.10.79:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true # url: jdbc:mysql://localhost:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true url: jdbc:mysql://192.168.10.79:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true # url: jdbc:mysql://192.168.10.221:3360?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true # url: jdbc:mysql://192.168.10.222:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true # url: jdbc:mysql://118.89.139.230:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true @@ -21,7 +21,7 @@ minPoolSize: 2 maxPoolSize: 500 mybatis-plus: typeAliasesPackage: com.whyc.pojo typeAliasesPackage: com.whyc.pojo,com.whyc.dto mapper-locations: classpath:mapper/**/*Mapper.xml global-config: db-config: src/main/resources/mapper/BattalarmDataMapper.xml
@@ -127,4 +127,32 @@ update db_alarm.tb_battalarm_data set record_id=#{recordId},alm_end_time=#{almEndTime},alm_cleared_type=#{almClearedType} where num=#{num} </update> <select id="serchRealTime" parameterType="UserInf" resultType="java.lang.Integer"> select count(num) as number from db_alarm.tb_battalarm_data where alm_cleared_type=0 and alm_id not in(119010,119011,119008,119009) and db_alarm.tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.battgroupid from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid=#{uId} ) </select> <select id="serchGood" parameterType="UserInf" resultType="AlarmStaticRes"> SELECT battgroupid,count(DISTINCT MonNum) as number,alm_id FROM db_alarm.tb_battalarm_data where BattGroupId in(select distinct db_battinf.tb_battinf.battgroupid from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid=#{uId} ) and alm_id in(119010,119011) and alm_cleared_type=0 GROUP BY battgroupid,alm_id </select> </mapper>