src/main/java/com/whyc/aop/OperationLogAspect.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/AlarmParamController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/AlarmParamMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/DocUserMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/AlarmParamService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/UserBridgeService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/AlarmParamMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/aop/OperationLogAspect.java
@@ -107,28 +107,7 @@ operationTypeName = OperationLogEnum.TYPE_2_USER_UPDATE_PASSWORD.getName(); } } //业务级 else if(classNameTrue.equals("CKPowerDevSignalSetController") ||classNameTrue.equals("CKPowerDevRtSetController")){ //电源设备设置 if(methodName.startsWith("update")){ type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_POWER_UPDATE.getType(); operationTypeName = OperationLogEnum.TYPE_2_POWER_UPDATE.getName(); } }else if(classNameTrue.equals("CKPowerDevBattRtStateSetController")){ //核容设备信息相关设置 if(methodName.startsWith("update")){ type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_BATTERY_UPDATE.getType(); operationTypeName = OperationLogEnum.TYPE_2_BATTERY_UPDATE.getName(); } } else if(classNameTrue.equals("CKPowerDevHrTestParamController")) { //核容设备遥调遥控 if (methodName.startsWith("update")) { type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_BATTERY_TEST_PARAM_UPDATE.getType(); operationTypeName = OperationLogEnum.TYPE_2_BATTERY_TEST_PARAM_UPDATE.getName(); } } else if(classNameTrue.contains("Alarm") ||classNameTrue.contains("Alm")){ //告警设置 if(methodName.startsWith("update")){ @@ -137,31 +116,7 @@ operationTypeName = OperationLogEnum.TYPE_2_ALARM.getName(); } } else if(classNameTrue.contains("BreakerInfController")){ //断路器 type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_BREAKER.getType(); operationTypeName = OperationLogEnum.TYPE_2_BREAKER.getName(); } else if(classNameTrue.contains("CKPowerDevBreakerControlController")){ //断路器控制 type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_BREAKER_CONTROL.getType(); operationTypeName = OperationLogEnum.TYPE_2_BREAKER_CONTROL.getName(); } else if(classNameTrue.contains("GatewayInfController")){ //网关 type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_GATEWAY.getType(); operationTypeName = OperationLogEnum.TYPE_2_GATEWAY.getName(); } else if(classNameTrue.contains("CKPowerDevModecontrolController")){ //电源设备模块控制操作 type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_POWER_MODE_CONTROL.getType(); operationTypeName = OperationLogEnum.TYPE_2_POWER_MODE_CONTROL.getName(); } else if(classNameTrue.contains("CKPowerDevModeparamController")){ //电源设备模块参数操作 type1 = OperationLogEnum.TYPE_1_SERVICE.getType(); type2 = OperationLogEnum.TYPE_2_POWER_MODE_PARAM.getType(); operationTypeName = OperationLogEnum.TYPE_2_POWER_MODE_PARAM.getName(); } // TODO else if() String module = "模块"; src/main/java/com/whyc/controller/AlarmParamController.java
New file @@ -0,0 +1,39 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.pojo.AlarmParam; import com.whyc.service.AlarmParamService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @Api(tags = "电池告警参数设置") @RestController @RequestMapping("alarmParam") public class AlarmParamController { @Autowired private AlarmParamService service; @ApiOperation("电池告警参数设置--列表查询") @PostMapping("serchByCondition") public Response serchByCondition(@RequestBody List<Integer> AlarmIds) { return service.serchByCondition(AlarmIds); } @ApiOperation("查询电池优劣好坏的标准") @GetMapping("serchQuality") public Response serchQuality() { return service.serchQuality(); } @ApiOperation("告警参数设置") @PostMapping("setParam") public Response setParam(@RequestBody List<AlarmParam> list) { return service.setParam(list); } } src/main/java/com/whyc/mapper/AlarmParamMapper.java
@@ -2,5 +2,12 @@ import com.whyc.pojo.AlarmParam; import java.util.List; public interface AlarmParamMapper extends CustomMapper<AlarmParam>{ //电池告警参数设置--列表查询 List serchByCondition(List alarmIds); List<Float> getParamInfoList(int alarmId,int alarmId2); } src/main/java/com/whyc/mapper/DocUserMapper.java
File was deleted src/main/java/com/whyc/service/AlarmParamService.java
New file @@ -0,0 +1,67 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.mapper.AlarmParamMapper; import com.whyc.pojo.AlarmParam; import com.whyc.util.ActionUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; @Service public class AlarmParamService { @Resource private AlarmParamMapper mapper; //电池告警参数设置--列表查询 public Response serchByCondition(List AlarmIds) { List list = mapper.serchByCondition(AlarmIds); PageInfo pageInfo = new PageInfo(list); return new Response().set(1, pageInfo); } //查询电池优劣好坏的标准 public Response serchQuality() { //0.查询劣化(告警)和损坏(更换)的阈值 QueryWrapper<AlarmParam> 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<AlarmParam> paramList = mapper.selectList(alarmWrapper); float capAlarm = 0f; float capChange = 0f; if (paramList != null && paramList.size() > 0) { capAlarm = paramList.get(0).getAlmLowCoe();//劣化参数0.8 capChange = paramList.get(1).getAlmLowCoe();//损坏参数0.6 } else { capAlarm = 0.8f; capChange = 0.6f; } Map<String, Float> map = new HashMap<>(); map.put("capAlarm", capAlarm); map.put("capChange", capChange); return new Response<>().setII(1, true, map, "查询电池优劣好坏的标准"); } //告警参数设置 @Transactional public Response setParam(List<AlarmParam> list) { if (list != null && list.size() > 0) { for (AlarmParam p : list) { UpdateWrapper wrapper = new UpdateWrapper(); wrapper.set("alm_low_coe", p.getAlmLowCoe()); wrapper.eq("alm_id", p.getAlmId()); mapper.update((AlarmParam) ActionUtil.objeNull, wrapper); } } return new Response().set(1, true); } } src/main/java/com/whyc/service/UserBridgeService.java
@@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.mapper.DocUserMapper; import com.whyc.mapper.UserInfMapper; import com.whyc.pojo.UserInf; import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; @@ -23,7 +23,7 @@ public class UserBridgeService { @Resource private DocUserMapper userMapper; private UserInfMapper userMapper; @Resource private CacheManager caffeineCacheManager; @@ -36,13 +36,6 @@ return userInf==null?new UserInf(0,"用户不存在"):userInf; } /* public UserInf findUserByMobilephone(String mobilephone){ QueryWrapper<UserInf> queryWrapper = Wrappers.query(); queryWrapper.select("uId","uName","upassword","UKey_ID","uRole","uMobilephone").eq("uMobilephone",mobilephone); List<UserInf> list = userMapper.selectList(queryWrapper); return list.size()==0?new UserInf(0,"用户不存在"):list.get(0); }*/ /** * TODO 采用caffeineCache重写 src/main/resources/mapper/AlarmParamMapper.xml
New file @@ -0,0 +1,17 @@ <?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.AlarmParamMapper"> <select id="serchByCondition" resultType="AlarmParam"> select num,alm_id,alm_name,alm_high_coe,alm_low_coe,alm_high_level,alm_low_level,alm_high_en,alm_low_en from db_param.alarm_param <where> <if test="AlarmIds!=null and AlarmIds.size>0"> <foreach collection="AlarmIds" item="AlarmId" open=" alm_id in (" close=")" separator=","> #{AlarmId} </foreach> </if> </where> </select> <select id="getParamInfoList" resultType="float"> select alm_low_coe from db_param.alarm_param where alm_id in(#{alarmId},#{alarmId2}) </select> </mapper>