核容装置记录日志修改

lxw

2023-12-22 d2d8eef94baf66b0917fe42adbfa971565f0928e

核容装置记录日志修改

 src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevBattSetLog.java

@@ -34,8 +34,6 @@
    @ApiModelProperty(value = "操作编号")
    private String opNum;

    @ApiModelProperty(value = "设备类型")
    private Integer devType;

    @ApiModelProperty(value = "操作类型")
    private Integer cmdType;
@@ -67,7 +65,7 @@
    private Date createDay;

    @TableField(exist = false)
    private int pageCurr;
    private int pageNum;

    @TableField(exist = false)
    private int pageSize;

 src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java

@@ -69,9 +69,9 @@
        QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query();
        Response opStatus =OpCmdUtil.getOpStatus(mapper, query, opCmd,20,battIndex);
        if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功
            /*//记录日志
            //记录日志
            Date now = new Date();
            List<CKPowerDevBattSetLog> logList = set.getLogList();
            List<CKPowerDevBattSetLog> logList = setDto.getLogList();
            //查询最大的操作编号
            String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
            logList.forEach(log->{
@@ -81,7 +81,7 @@
                log.setCreateTime(now);
                log.setCreateDay(now);
            });
            setLogService.addBatch(logList);*/
            setLogService.addBatch(logList);
        }
        return opStatus;
    }
@@ -109,6 +109,7 @@
            String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0";
            logList.forEach(log->{
                log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1));
                log.setMonNum(0);
                log.setCmdType(stateSet.getOpCmd());
                log.setBattIndex(stateSet.getBattIndex());
                log.setCreateTime(now);

 src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java

@@ -19,16 +19,16 @@

    //获取核容装置日志
    public Response getBattSetLog(CKPowerDevBattSetLog battSetLog) {
        PageHelper.startPage(battSetLog.getPageCurr(),battSetLog.getPageSize());
        PageHelper.startPage(battSetLog.getPageNum(),battSetLog.getPageSize());
        QueryWrapper wrapper=new QueryWrapper();
        if(battSetLog.getDevType()!=null&&!battSetLog.getDevType().equals("")){
            wrapper.eq("dev_type",battSetLog.getDevType());
        }
        if(battSetLog.getCmdType()!=null&&battSetLog.getCmdType()!=-1){
            wrapper.eq("cmd_type",battSetLog.getDevType());
            wrapper.eq("cmd_type",battSetLog.getCmdType());
        }
        if(battSetLog.getParamCn()!=null){
            wrapper.eq("param_cn",battSetLog.getDevType());
        /*if(battSetLog.getParamCn()!=null){
            wrapper.eq("param_cn",battSetLog.getParamCn());
        }*/
        if(battSetLog.getBattIndex()!=null){
            wrapper.eq("batt_index",battSetLog.getBattIndex());
        }
        if(battSetLog.getCreateTime()!=null&&!battSetLog.getCreateTime().equals("")){
            wrapper.ge("create_time",battSetLog.getCreateTime());

 src/main/java/com/whyc/service/CKPowerDevHrTestParamService.java

@@ -48,8 +48,8 @@
            log.setCreateTime(now);
            log.setCreateDay(now);
            log.setCmdType(CMD_Constant.CMD_GetBattDisParam);
            log.setDevType(0);
            log.setBattIndex(0);
            log.setMonNum(0);
            setLogService.add(log);
        }
        return opStatus;
@@ -71,7 +71,7 @@
            log.setCreateTime(now);
            log.setCreateDay(now);
            log.setCmdType(CMD_Constant.CMD_GetDevIP);
            log.setDevType(0);
            log.setMonNum(0);
            log.setBattIndex(0);
            setLogService.add(log);
        }
@@ -94,6 +94,8 @@
                log.setCmdType(CMD_Constant.CMD_SetBattDisParam);
                log.setCreateTime(now);
                log.setCreateDay(now);
                log.setBattIndex(0);
                log.setMonNum(0);
            });
            setLogService.addBatch(logList);
        }
@@ -116,7 +118,7 @@
            log.setCreateTime(now);
            log.setCreateDay(now);
            log.setCmdType(opCmd);
            log.setDevType(0);
            log.setMonNum(0);
            log.setBattIndex(0);
            setLogService.add(log);
        }