From fea6cf80f99019b86e4738ffa6da04259c5c7b5d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 22 一月 2024 15:08:36 +0800
Subject: [PATCH] 告警参数控制和模块参数控制
---
src/main/resources/mapper/CkPowerDevParamLogMapper.xml | 10 ++
src/main/java/com/whyc/mapper/CkPowerDevParamLogMapper.java | 9 ++
src/main/java/com/whyc/service/CKPowerDevAlmParamService.java | 47 +++++++++++
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevModeparam.java | 5 +
src/main/java/com/whyc/service/CKPowerDevModeparamService.java | 45 ++++++++++
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevAlmParam.java | 5 +
src/main/java/com/whyc/service/CkPowerDevParamLogService.java | 24 ++++++
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CkPowerDevParamLog.java | 52 +++++++++++++
8 files changed, 191 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/CkPowerDevParamLogMapper.java b/src/main/java/com/whyc/mapper/CkPowerDevParamLogMapper.java
new file mode 100644
index 0000000..1057bed
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/CkPowerDevParamLogMapper.java
@@ -0,0 +1,9 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_ckpwrdev_data_rt.CkPowerDevParamLog;
+
+public interface CkPowerDevParamLogMapper extends CustomMapper<CkPowerDevParamLog>{
+
+ //鏌ヨ鏈�澶х殑鎿嶄綔缂栧彿
+ String getOpNum();
+}
diff --git a/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevAlmParam.java b/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevAlmParam.java
index a60ab65..36a2f56 100644
--- a/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevAlmParam.java
+++ b/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevAlmParam.java
@@ -9,6 +9,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
/**
*
@@ -71,4 +72,8 @@
private Float acLowVolAlmVal;
+ @TableField(exist = false)
+ private List logList;
+
+
}
diff --git a/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevModeparam.java b/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevModeparam.java
index a2d0284..94e9c7e 100644
--- a/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevModeparam.java
+++ b/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevModeparam.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_ckpwrdev_data_rt;
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;
@@ -10,6 +11,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.List;
/**
* <p>
@@ -52,5 +54,8 @@
@ApiModelProperty(value = "妯″潡鍧囧厖鐢靛帇")
private Float modeJunChrvol;
+ @TableField(exist = false)
+ private List logList;
+
}
diff --git a/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CkPowerDevParamLog.java b/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CkPowerDevParamLog.java
new file mode 100644
index 0000000..32c9c33
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CkPowerDevParamLog.java
@@ -0,0 +1,52 @@
+package com.whyc.pojo.db_ckpwrdev_data_rt;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 鍙傛暟闃堝�艰缃〃
+ * </p>
+ *
+ * @author lxw
+ * @since 2024-01-22
+ */
+@Data
+@TableName("tb_ckpowerdev_param_log")
+@ApiModel(value="CkpowerdevParamLog瀵硅薄", description="鍙傛暟闃堝�艰缃〃")
+public class CkPowerDevParamLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "鎿嶄綔缂栧彿")
+ private String opNum;
+
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷")
+ private Integer cmdType;
+
+ @ApiModelProperty(value = "琚缃殑鍙傛暟")
+ private String param;
+
+ @ApiModelProperty(value = "琚缃殑鍙傛暟涓枃鍚�")
+ private String paramCn;
+
+ @ApiModelProperty(value = "鍊�")
+ private String value;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ private Date createDay;
+
+
+}
diff --git a/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java b/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java
index 506b333..f274c58 100644
--- a/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java
@@ -7,23 +7,49 @@
import com.whyc.constant.CMD_Constant;
import com.whyc.dto.Response;
import com.whyc.mapper.CKPowerDevAlmParamMapper;
+import com.whyc.mapper.CKPowerDevBattSetLogMapper;
+import com.whyc.mapper.CkPowerDevParamLogMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevAlmParam;
+import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevRtSet;
+import com.whyc.pojo.db_ckpwrdev_data_rt.CkPowerDevParamLog;
import com.whyc.util.OpCmdUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
@Service
public class CKPowerDevAlmParamService {
@Autowired(required = false)
private CKPowerDevAlmParamMapper mapper;
+ @Resource
+ private CkPowerDevParamLogMapper logMapper;
+
+ @Resource
+ private CkPowerDevParamLogService logService;
+
//璇诲彇鍛婅鎺у埗
public Response getAlmParam() {
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query();
- Response res=OpCmdUtil.readByUpdateOpCmd(mapper,query, CMD_Constant.CMD_GetAlarmParam,20,null);
- return res;
+ Response opStatus=OpCmdUtil.readByUpdateOpCmd(mapper,query, CMD_Constant.CMD_GetAlarmParam,20,null);
+ if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
+ //璁板綍鏃ュ織
+ Date now = new Date();
+ CkPowerDevParamLog log=new CkPowerDevParamLog();
+ //鏌ヨ鏈�澶х殑鎿嶄綔缂栧彿
+ String opNum=logMapper.getOpNum()!=null?logMapper.getOpNum():"0";
+ log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
+ log.setCreateTime(now);
+ log.setCreateDay(now);
+ log.setCmdType(CMD_Constant.CMD_GetAlarmParam);
+ logService.add(log);
+ }
+ return opStatus;
}
//璁剧疆鍛婅鍙傛暟
@@ -31,6 +57,21 @@
mapper.update(almParam,null);
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query();
- return OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetAlarmParam,20,null);
+ Response opStatus=OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetAlarmParam,20,null);
+ if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
+ //璁板綍鏃ュ織
+ Date now = new Date();
+ List<CkPowerDevParamLog> logList = almParam.getLogList();
+ //鏌ヨ鏈�澶х殑鎿嶄綔缂栧彿
+ String opNum=logMapper.getOpNum()!=null?logMapper.getOpNum():"0";
+ logList.forEach(log->{
+ log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
+ log.setCmdType(CMD_Constant.CMD_SetAlarmParam);
+ log.setCreateTime(now);
+ log.setCreateDay(now);
+ });
+ logService.addBatch(logList);
+ }
+ return opStatus;
}
}
diff --git a/src/main/java/com/whyc/service/CKPowerDevModeparamService.java b/src/main/java/com/whyc/service/CKPowerDevModeparamService.java
index 558b5a1..9bb1938 100644
--- a/src/main/java/com/whyc/service/CKPowerDevModeparamService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevModeparamService.java
@@ -5,29 +5,68 @@
import com.whyc.constant.CMD_Constant;
import com.whyc.dto.Response;
import com.whyc.mapper.CKPowerDevModeparamMapper;
+import com.whyc.mapper.CkPowerDevParamLogMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevAlmParam;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevModeparam;
+import com.whyc.pojo.db_ckpwrdev_data_rt.CkPowerDevParamLog;
import com.whyc.util.OpCmdUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
@Service
public class CKPowerDevModeparamService {
@Autowired(required = false)
private CKPowerDevModeparamMapper mapper;
+ @Resource
+ private CkPowerDevParamLogMapper logMapper;
+
+ @Resource
+ private CkPowerDevParamLogService logService;
+
//璇诲彇妯″潡鍙傛暟
public Response getModeParam() {
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
QueryWrapper<CKPowerDevModeparam> query = Wrappers.query();
- Response res= OpCmdUtil.readByUpdateOpCmd(mapper,query, CMD_Constant.CMD_GetModelParam,20,null);
- return res;
+ Response opStatus= OpCmdUtil.readByUpdateOpCmd(mapper,query, CMD_Constant.CMD_GetModelParam,20,null);
+ if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
+ //璁板綍鏃ュ織
+ Date now = new Date();
+ CkPowerDevParamLog log=new CkPowerDevParamLog();
+ //鏌ヨ鏈�澶х殑鎿嶄綔缂栧彿
+ String opNum=logMapper.getOpNum()!=null?logMapper.getOpNum():"0";
+ log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
+ log.setCreateTime(now);
+ log.setCreateDay(now);
+ log.setCmdType(CMD_Constant.CMD_GetModelParam);
+ logService.add(log);
+ }
+ return opStatus;
}
//璁剧疆妯″潡鍙傛暟
public Response setModeParam(CKPowerDevModeparam modeParam) {
mapper.update(modeParam,null);
//璇诲彇opCmd杩斿洖鏄惁鎴愬姛
QueryWrapper<CKPowerDevModeparam> query = Wrappers.query();
- return OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetModelParam,20,null);
+ Response opStatus=OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetModelParam,20,null);
+ if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //鎴愬姛
+ //璁板綍鏃ュ織
+ Date now = new Date();
+ List<CkPowerDevParamLog> logList = modeParam.getLogList();
+ //鏌ヨ鏈�澶х殑鎿嶄綔缂栧彿
+ String opNum=logMapper.getOpNum()!=null?logMapper.getOpNum():"0";
+ logList.forEach(log->{
+ log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
+ log.setCmdType(CMD_Constant.CMD_SetModelParam);
+ log.setCreateTime(now);
+ log.setCreateDay(now);
+ });
+ logService.addBatch(logList);
+ }
+ return opStatus;
}
}
diff --git a/src/main/java/com/whyc/service/CkPowerDevParamLogService.java b/src/main/java/com/whyc/service/CkPowerDevParamLogService.java
new file mode 100644
index 0000000..36e0fdf
--- /dev/null
+++ b/src/main/java/com/whyc/service/CkPowerDevParamLogService.java
@@ -0,0 +1,24 @@
+package com.whyc.service;
+
+import com.whyc.mapper.CkPowerDevParamLogMapper;
+import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog;
+import com.whyc.pojo.db_ckpwrdev_data_rt.CkPowerDevParamLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CkPowerDevParamLogService {
+ @Autowired(required = false)
+ private CkPowerDevParamLogMapper mapper;
+
+ //娣诲姞璁板綍
+ public void addBatch(List<CkPowerDevParamLog> logList) {
+ mapper.insertBatchSomeColumn(logList);
+ }
+ //娣诲姞璁板綍鍗曟潯
+ public void add(CkPowerDevParamLog log) {
+ mapper.insert(log);
+ }
+}
diff --git a/src/main/resources/mapper/CkPowerDevParamLogMapper.xml b/src/main/resources/mapper/CkPowerDevParamLogMapper.xml
new file mode 100644
index 0000000..473b8df
--- /dev/null
+++ b/src/main/resources/mapper/CkPowerDevParamLogMapper.xml
@@ -0,0 +1,10 @@
+<?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.CkPowerDevParamLogMapper" >
+
+
+ <select id="getOpNum" resultType="java.lang.String">
+ select op_num from db_ckpwrdev_data_rt.tb_ckpowerdev_param_log
+ order by id desc limit 1
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1