电池单体和组端信息状态设置表

whycxzp

2023-11-30 0d1965ec5753789474ccdc8a593ff2e245919c99

电池单体和组端信息状态设置表

 src/main/java/com/whyc/controller/CKPowerDevBattRtDataSetController.java

File was deleted

 src/main/java/com/whyc/controller/CKPowerDevBattRtStateSetController.java

@@ -1,5 +1,6 @@
package com.whyc.controller;

import com.whyc.dto.BattRtSetDto;
import com.whyc.dto.Response;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevRtSet;
@@ -14,7 +15,7 @@
import org.springframework.web.bind.annotation.RestController;

@RestController
@Api(tags = "蓄电池组组端以及主控信息实时状态设置表")
@Api(tags = "电池单体和组端信息状态设置表")
@RequestMapping("ckPowerDevBattRtStateSet")
public class CKPowerDevBattRtStateSetController {

@@ -23,7 +24,7 @@

    @ApiOperation("设置")
    @PostMapping("update")
    public Response update(@RequestBody CKPowerDevBattRtStateSet set){
    public Response update(@RequestBody BattRtSetDto set){
        return service.update(set);
    }


 src/main/java/com/whyc/dto/BattRtSetDto.java

New file
@@ -0,0 +1,26 @@
package com.whyc.dto;

import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtDataSet;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet;

public class BattRtSetDto {

    private CKPowerDevBattRtDataSet dataSet;
    private CKPowerDevBattRtStateSet stateSet;

    public CKPowerDevBattRtDataSet getDataSet() {
        return dataSet;
    }

    public void setDataSet(CKPowerDevBattRtDataSet dataSet) {
        this.dataSet = dataSet;
    }

    public CKPowerDevBattRtStateSet getStateSet() {
        return stateSet;
    }

    public void setStateSet(CKPowerDevBattRtStateSet stateSet) {
        this.stateSet = stateSet;
    }
}

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

@@ -1,12 +1,7 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.constant.CMD_Constant;
import com.whyc.dto.Response;
import com.whyc.mapper.CKPowerDevBattRtDataSetMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtDataSet;
import com.whyc.util.OpCmdUtil;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -17,10 +12,7 @@
    @Resource
    private CKPowerDevBattRtDataSetMapper mapper;

    public Response update(CKPowerDevBattRtDataSet set) {
    public void update(CKPowerDevBattRtDataSet set) {
        mapper.update(set,null);
        //读取opCmd返回是否成功
        QueryWrapper<CKPowerDevBattRtDataSet> query = Wrappers.query();
        return OpCmdUtil.getOpStatus(mapper, query, CMD_Constant.CMD_SetACDCARK_Signal,20,set.getBattIndex());
    }
}

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

@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.constant.CMD_Constant;
import com.whyc.dto.BattRtSetDto;
import com.whyc.dto.Response;
import com.whyc.mapper.CKPowerDevBattRtStateSetMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtDataSet;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevSignalSet;
import com.whyc.util.OpCmdUtil;
@@ -18,10 +20,18 @@
    @Resource
    private CKPowerDevBattRtStateSetMapper mapper;

    public Response update(CKPowerDevBattRtStateSet set) {
        mapper.update(set,null);
    @Resource
    private CKPowerDevBattRtDataSetService dataSetService;

    public Response update(BattRtSetDto set) {
        CKPowerDevBattRtDataSet dataSet = set.getDataSet();
        CKPowerDevBattRtStateSet stateSet = set.getStateSet();
        //设置state_set表
        mapper.update(stateSet,null);
        //设置data_set表
        dataSetService.update(dataSet);
        //读取opCmd返回是否成功
        QueryWrapper<CKPowerDevSignalSet> query = Wrappers.query();
        return OpCmdUtil.getOpStatus(mapper, query, CMD_Constant.CMD_SetACDCARK_Signal,20,set.getBattIndex());
        return OpCmdUtil.getOpStatus(mapper, query, set.getStateSet().getOpCmd(),20,set.getStateSet().getBattIndex());
    }
}

 src/main/java/com/whyc/util/OpCmdUtil.java

@@ -113,11 +113,86 @@
            case CMD_Constant.CMD_SetACDCARK_Signal:{
                return opCmdAck == CMD_Constant.CMD_SetACDCARK_Signal_ACK;
            }
            case CMD_Constant.CMD_GetAlarmParam: {
            case CMD_Constant.CMD_GetModelParam:{
                return opCmdAck ==CMD_Constant.CMD_GetModelParam_ACK ;
            }
            case CMD_Constant.CMD_SetModelParam:{
                return opCmdAck ==CMD_Constant.CMD_SetModelParam_ACK ;
            }
            case CMD_Constant.CMD_SetModelControl:{
                return opCmdAck ==CMD_Constant.CMD_SetModelControl_ACK ;
            }
            case CMD_Constant.CMD_GetModelControl:{
                return opCmdAck ==CMD_Constant.CMD_GetModelControl_ACK ;
            }
            case CMD_Constant.CMD_SetBatt1MonData:{
                return opCmdAck ==CMD_Constant.CMD_SetBatt1MonData_ACK ;
            }
            case CMD_Constant.CMD_SetBatt1GroupData:{
                return opCmdAck ==CMD_Constant.CMD_SetBatt1GroupData_ACK ;
            }
            case CMD_Constant.CMD_SetBatt2MonData:{
                return opCmdAck ==CMD_Constant.CMD_SetBatt2MonData_ACK ;
            }
            case CMD_Constant.CMD_SetBatt2GroupData:{
                return opCmdAck ==CMD_Constant.CMD_SetBatt2GroupData_ACK ;
            }
            case CMD_Constant.CMD_SetBattAlarm:{
                return opCmdAck ==CMD_Constant.CMD_SetBattAlarm_ACK ;
            }
            case CMD_Constant.CMD_GetBattDisParam:{
                return opCmdAck ==CMD_Constant.CMD_GetBattDisParam_ACK ;
            }
            case CMD_Constant.CMD_SetBattDisParam:{
                return opCmdAck ==CMD_Constant.CMD_SetBattDisParam_ACK ;
            }
            case CMD_Constant.CMD_GetDevIP:{
                return opCmdAck ==CMD_Constant.CMD_GetDevIP_ACK ;
            }
            case CMD_Constant.CMD_SetDevIP:{
                return opCmdAck ==CMD_Constant.CMD_SetDevIP_ACK ;
            }
            case CMD_Constant.CMD_StartBatt1DisTest:{
                return opCmdAck ==CMD_Constant.CMD_StartBatt1DisTest_ACK ;
            }
            case CMD_Constant.CMD_StopBatt1DisTest:{
                return opCmdAck ==CMD_Constant.CMD_StopBatt1DisTest_ACK ;
            }
            case CMD_Constant.CMD_StartBatt2DisTest:{
                return opCmdAck ==CMD_Constant.CMD_StartBatt2DisTest_ACK ;
            }
            case CMD_Constant.CMD_StopBatt2DisTest:{
                return opCmdAck ==CMD_Constant.CMD_StopBatt2DisTest_ACK ;
            }
            case CMD_Constant.CMD_StartBatt1ResTest:{
                return opCmdAck ==CMD_Constant.CMD_StartBatt1ResTest_ACK ;
            }
            case CMD_Constant.CMD_StopBatt1ResTest:{
                return opCmdAck ==CMD_Constant.CMD_StopBatt1ResTest_ACK ;
            }
            case CMD_Constant.CMD_StartBatt2ResTest:{
                return opCmdAck ==CMD_Constant.CMD_StartBatt2ResTest_ACK ;
            }
            case CMD_Constant.CMD_StartDevK1Test:{
                return opCmdAck ==CMD_Constant.CMD_StartDevK1Test_ACK ;
            }
            case CMD_Constant.CMD_StopDevK1Test:{
                return opCmdAck ==CMD_Constant.CMD_StopDevK1Test_ACK ;
            }
            case CMD_Constant.CMD_StartDevD1Test:{
                return opCmdAck ==CMD_Constant.CMD_StartDevD1Test_ACK ;
            }
            case CMD_Constant.CMD_StopDevD1Test:{
                return opCmdAck ==CMD_Constant.CMD_StopDevD1Test_ACK ;
            }
            case CMD_Constant.CMD_RestartDev:{
                return opCmdAck ==CMD_Constant.CMD_RestartDev_ACK ;
            }
            case CMD_Constant.CMD_GetAlarmParam:{
                return opCmdAck ==CMD_Constant.CMD_GetAlarmParam_ACK ;
            }
            case CMD_Constant.CMD_SetAlarmParam:{
                return opCmdAck == CMD_Constant.CMD_SetAlarmParam_ACK ;
                return opCmdAck ==CMD_Constant.CMD_SetAlarmParam_ACK ;
            }
            default:
                return false;