lxw
2023-12-21 1daddd242a78a4da9489b560cddac38611413fc9
核容装置记录日志
3个文件已修改
1个文件已添加
118 ■■■■■ 已修改文件
src/main/java/com/whyc/constant/LogOpEnum.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevHrTestParam.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/CKPowerDevHrTestParamService.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/constant/LogOpEnum.java
New file
@@ -0,0 +1,27 @@
package com.whyc.constant;
/*
* 日志操作类型*/
public enum LogOpEnum {
    //控制类型
    TYPE_CMD_RED(0,"读取参数"),
    TYPE_CMD_UPDATE(1,"设置参数"),
    TYPE_CMD_START(2,"启动放电"),
    TYPE_CMD_STOP(3,"停止放电"),
    ;
    private Integer type;
    private String name;
    LogOpEnum(Integer type, String name) {
        this.type = type;
        this.name = name;
    }
    public Integer getType() {
        return type;
    }
    public String getName() {
        return name;
    }
}
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevHrTestParam.java
@@ -6,6 +6,8 @@
import io.swagger.models.auth.In;
import lombok.Data;
import java.util.List;
/**
 * 核容测试遥测量
 */
@@ -64,7 +66,8 @@
    @TableField("char_curr")
    private Float charCurr;
    @TableField(exist = false)
    private List<CKPowerDevBattSetLog> logList;
}
src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java
@@ -44,4 +44,9 @@
    public void addBatch(List<CKPowerDevBattSetLog> logList) {
        mapper.insertBatchSomeColumn(logList);
    }
    //添加记录单条
    public void add(CKPowerDevBattSetLog log) {
        mapper.insert(log);
    }
}
src/main/java/com/whyc/service/CKPowerDevHrTestParamService.java
@@ -4,14 +4,21 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.constant.CMD_Constant;
import com.whyc.constant.LogOpEnum;
import com.whyc.constant.OperationLogEnum;
import com.whyc.dto.Response;
import com.whyc.mapper.CKPowerDevBattSetLogMapper;
import com.whyc.mapper.CKPowerDevHrTestParamMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevHrTestParam;
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 CKPowerDevHrTestParamService {
@@ -19,12 +26,33 @@
    @Resource
    private CKPowerDevHrTestParamMapper mapper;
    @Resource
    private CKPowerDevBattSetLogMapper setLogMapper;
    @Resource
    private CKPowerDevBattSetLogService setLogService;
    public Response getBattDisParam() {
        UpdateWrapper<CKPowerDevHrTestParam> update = Wrappers.update();
        update.set("op_cmd",CMD_Constant.CMD_GetBattDisParam);
        mapper.update(null,update);
        QueryWrapper<CKPowerDevHrTestParam> query = Wrappers.query();
        return OpCmdUtil.readByUpdateOpCmd(mapper, query, CMD_Constant.CMD_GetBattDisParam, 20, null);
        Response opStatus= OpCmdUtil.readByUpdateOpCmd(mapper, query, CMD_Constant.CMD_GetBattDisParam, 20, null);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            //记录日志
            Date now = new Date();
            CKPowerDevBattSetLog log=new CKPowerDevBattSetLog();
            //查询最大的操作编号
            String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
            log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
            log.setCreateTime(now);
            log.setCreateDay(now);
            log.setCmdType(LogOpEnum.TYPE_CMD_RED.getType());
            log.setDevType(0);
            log.setBattIndex(0);
            setLogService.add(log);
        }
        return opStatus;
    }
    public Response getDevIp() {
@@ -32,14 +60,44 @@
        update.set("op_cmd",CMD_Constant.CMD_GetDevIP);
        mapper.update(null,update);
        QueryWrapper<CKPowerDevHrTestParam> query = Wrappers.query();
        return OpCmdUtil.readByUpdateOpCmd(mapper, query, CMD_Constant.CMD_GetDevIP, 20, null);
        Response opStatus= OpCmdUtil.readByUpdateOpCmd(mapper, query, CMD_Constant.CMD_GetDevIP, 20, null);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            //记录日志
            Date now = new Date();
            CKPowerDevBattSetLog log=new CKPowerDevBattSetLog();
            //查询最大的操作编号
            String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
            log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
            log.setCreateTime(now);
            log.setCreateDay(now);
            log.setCmdType(LogOpEnum.TYPE_CMD_RED.getType());
            log.setDevType(0);
            log.setBattIndex(0);
            setLogService.add(log);
        }
        return opStatus;
    }
    public Response update(CKPowerDevHrTestParam set) {
        set.setOpCmd(CMD_Constant.CMD_SetBattDisParam);
        mapper.update(set,null);
        QueryWrapper<CKPowerDevHrTestParam> query = Wrappers.query();
        return OpCmdUtil.getOpStatus(mapper, query, CMD_Constant.CMD_SetBattDisParam,20,null);
        Response opStatus=OpCmdUtil.getOpStatus(mapper, query, CMD_Constant.CMD_SetBattDisParam,20,null);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            //记录日志
            Date now = new Date();
            List<CKPowerDevBattSetLog> logList = set.getLogList();
            //查询最大的操作编号
            String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
            logList.forEach(log->{
                log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
                log.setCmdType(LogOpEnum.TYPE_CMD_UPDATE.getType());
                log.setCreateTime(now);
                log.setCreateDay(now);
            });
            setLogService.addBatch(logList);
        }
        return opStatus;
    }
    public Response updateStartOrStop(Integer opCmd) {
@@ -47,6 +105,21 @@
        param.setOpCmd(opCmd);
        mapper.update(param,null);
        QueryWrapper<CKPowerDevHrTestParam> query = Wrappers.query();
        return OpCmdUtil.getOpStatus(mapper, query, opCmd,20,null);
        Response  opStatus=OpCmdUtil.getOpStatus(mapper, query, opCmd,20,null);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            //记录日志
            Date now = new Date();
            CKPowerDevBattSetLog log=new CKPowerDevBattSetLog();
            //查询最大的操作编号
            String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
            log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
            log.setCreateTime(now);
            log.setCreateDay(now);
            log.setCmdType(LogOpEnum.TYPE_CMD_START.getType());
            log.setDevType(0);
            log.setBattIndex(0);
            setLogService.add(log);
        }
        return opStatus;
    }
}