From 3a40ada68ef3b8febdafc9f49b48e75ab0b73071 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 03 七月 2024 16:30:09 +0800
Subject: [PATCH] 参数修改
---
/dev/null | 14 ---
src/main/java/com/whyc/service/AlarmParamService.java | 67 ++++++++++++++++
src/main/resources/mapper/AlarmParamMapper.xml | 17 ++++
src/main/java/com/whyc/aop/OperationLogAspect.java | 49 -----------
src/main/java/com/whyc/service/UserBridgeService.java | 11 --
src/main/java/com/whyc/controller/AlarmParamController.java | 39 +++++++++
src/main/java/com/whyc/mapper/AlarmParamMapper.java | 7 +
7 files changed, 134 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/whyc/aop/OperationLogAspect.java b/src/main/java/com/whyc/aop/OperationLogAspect.java
index 9e94866..efb1150 100644
--- a/src/main/java/com/whyc/aop/OperationLogAspect.java
+++ b/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 = "妯″潡";
diff --git a/src/main/java/com/whyc/controller/AlarmParamController.java b/src/main/java/com/whyc/controller/AlarmParamController.java
new file mode 100644
index 0000000..db497ec
--- /dev/null
+++ b/src/main/java/com/whyc/controller/AlarmParamController.java
@@ -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);
+ }
+}
diff --git a/src/main/java/com/whyc/mapper/AlarmParamMapper.java b/src/main/java/com/whyc/mapper/AlarmParamMapper.java
index 35da4f7..c36df49 100644
--- a/src/main/java/com/whyc/mapper/AlarmParamMapper.java
+++ b/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);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/DocUserMapper.java b/src/main/java/com/whyc/mapper/DocUserMapper.java
deleted file mode 100644
index 992a4e4..0000000
--- a/src/main/java/com/whyc/mapper/DocUserMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.UserInf;
-
-import java.util.List;
-
-public interface DocUserMapper extends CustomMapper<UserInf>{
- //鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
- List<UserInf> getAllUser(UserInf userInf);
- //鏌ヨ瀵嗙爜
- String selectSnId(String name);
- //鏌ヨ鎵�鏈夌敤鎴�(鏉冮檺绠＄悊鐢�)
- List<UserInf> getAllDocUser();
-}
diff --git a/src/main/java/com/whyc/service/AlarmParamService.java b/src/main/java/com/whyc/service/AlarmParamService.java
new file mode 100644
index 0000000..300cc3c
--- /dev/null
+++ b/src/main/java/com/whyc/service/AlarmParamService.java
@@ -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);
+ }
+}
diff --git a/src/main/java/com/whyc/service/UserBridgeService.java b/src/main/java/com/whyc/service/UserBridgeService.java
index c9e8ed9..30369ee 100644
--- a/src/main/java/com/whyc/service/UserBridgeService.java
+++ b/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閲嶅啓
diff --git a/src/main/resources/mapper/AlarmParamMapper.xml b/src/main/resources/mapper/AlarmParamMapper.xml
new file mode 100644
index 0000000..7d001fa
--- /dev/null
+++ b/src/main/resources/mapper/AlarmParamMapper.xml
@@ -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>
\ No newline at end of file
--
Gitblit v1.9.1