src/main/java/com/whyc/controller/CKPowerDevBattRtStateSetController.java
@@ -1,6 +1,7 @@ package com.whyc.controller; import com.whyc.dto.BattRtSetDto; import com.whyc.dto.DevalarmSet; import com.whyc.dto.Response; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet; import com.whyc.service.CKPowerDevBattRtStateSetService; @@ -32,5 +33,15 @@ return service.updateGroup(set); } @ApiOperation("核容终止时设置组端数据") @PostMapping("updateStateHrStop") public Response updateStateHrStop(@RequestBody CKPowerDevBattRtStateSet stateSet){ return service.updateStateHrStop(stateSet); } @ApiOperation("核容终止时设置单体数据") @PostMapping("updateDataHrStop") public Response updateDataHrStop(@RequestBody BattRtSetDto setDto){ return service.updateDataHrStop(setDto); } } src/main/java/com/whyc/controller/CkpowerdevBattRsalarmSetController.java
@@ -20,9 +20,11 @@ @Autowired private CkpowerdevBattRsalarmSetService service; @ApiOperation("告警设置") @PostMapping("setDevAlm") public Response setDevAlm(@RequestBody DevalarmSet almSet){ return service.setDevAlm(almSet); @ApiOperation("核容终止时告警设置") @PostMapping("setDevAlmHrStop") public Response setDevAlmHrStop(@RequestBody DevalarmSet almSet){ return service.setDevAlmHrStop(almSet); } } src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.constant.CMD_Constant; import com.whyc.dto.BattRtSetDto; import com.whyc.dto.DevalarmSet; import com.whyc.dto.Response; import com.whyc.mapper.CKPowerDevBattRtDataSetMapper; import com.whyc.mapper.CKPowerDevBattRtStateSetMapper; import com.whyc.mapper.CKPowerDevBattSetLogMapper; import com.whyc.mapper.CkpowerdevBattRsalarmSetMapper; import com.whyc.pojo.db_ckpwrdev_data_rt.*; import com.whyc.util.OpCmdUtil; import org.springframework.beans.BeanUtils; @@ -49,6 +52,12 @@ @Autowired private CkpowerdevBattRsalarmSetService rsAlarmSetService; @Resource private CkpowerdevBattRsalarmSetMapper rsalarmSetMapper; @Autowired(required = false) private CKPowerDevBattRtDataSetMapper rtDataSetMapper; public Response updateMon(BattRtSetDto setDto) { List<CKPowerDevBattRtDataSet> dataSetList = setDto.getDataSetList(); @@ -168,4 +177,59 @@ update.eq("batt_index",stateSet.getBattIndex()); mapper.update(stateSet,update); } //核容终止时设置组端数据 public Response updateStateHrStop(CKPowerDevBattRtStateSet stateSet) { //1.刷新rsAlarmSet,rtdataSet,rtState告警实时数据<指定默认刷第一组数据> rsAlarmSetService.updateDataFromDataAndStateAndRsAlarmToSetHrStop(); //设置state_set表 mapper.update(stateSet,null); //读取opCmd返回是否成功 QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query(); Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null); if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功 //记录日志 Date now = new Date(); List<CKPowerDevBattSetLog> logList = stateSet.getLogList(); //查询最大的操作编号 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); log.setCreateDay(now); }); setLogService.addBatch(logList); } return opStatus; } //核容终止时设置单体数据 public Response updateDataHrStop(BattRtSetDto setDto) { //1.刷新rsAlarmSet,rtdataSet,rtState告警实时数据<指定默认刷第一组数据> rsAlarmSetService.updateDataFromDataAndStateAndRsAlarmToSetHrStop(); //设置data_set表 rtDataSetMapper.updateBatchInRsAlarm(setDto.getDataSetList()); //读取opCmd返回是否成功 QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query(); Response opStatus = OpCmdUtil.getOpStatus(rsalarmSetMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null); if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功 //记录日志 Date now = new Date(); List<CKPowerDevBattSetLog> logList = setDto.getLogList(); //查询最大的操作编号 String opNum=setLogMapper.getOpNum()!=null?setLogMapper.getOpNum():"0"; logList.forEach(log->{ log.setOpNum(String.valueOf(Integer.valueOf(opNum)+1)); log.setCmdType(CMD_Constant.CMD_SetBattAlarm); log.setBattIndex(0); log.setCreateTime(now); log.setCreateDay(now); }); setLogService.addBatch(logList); } return opStatus; } } src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java
@@ -45,12 +45,12 @@ @Resource private CkpowerdevBattRsalarmSetLogService setLogService; //告警设置 public Response setDevAlm(DevalarmSet almSet) { //核容终止时的告警设置 public Response setDevAlmHrStop(DevalarmSet almSet) { //List<CKPowerDevBattRtDataSet> dataSetList = almSet.getRtDataSetList(); //Integer battIndex = dataSetList.get(0).getBattIndex(); //1.刷新rsAlarmSet,rtdataSet,rtState告警实时数据<指定默认刷第一组数据> updateDataFromDataAndStateAndRsAlarmToSet(); updateDataFromDataAndStateAndRsAlarmToSetHrStop(); //修改rsAlarmSet rsalarmSetMapper.update(almSet.getRsAlmSet(),null); @@ -78,7 +78,7 @@ return opStatus; } //1.刷新rsAlarmSet,rtdataSet,rtState告警实时数据<指定默认刷第一组数据> private void updateDataFromDataAndStateAndRsAlarmToSet() { public void updateDataFromDataAndStateAndRsAlarmToSetHrStop() { //获取默认第一组单体数据刷新至第一组0 List<CKPowerDevBattRtData> rtDataList = dataService.getDataList_index0(); List<CKPowerDevBattRtDataSet> rtSetDataList = new LinkedList<>(); @@ -91,29 +91,6 @@ rtDataSetMapper.updateBatch(rtSetDataList); //获取rtState默认第一组0表数据更新到set表中 CKPowerDevBattRtState state = stateService.getStateLsit_index0(0); BeanUtils.copyProperties(state,stateSet); updateStateSet(stateSet); //获取rsalarm更新到set表中 CkpowerdevBattRsalarm rsalarm=rsAlarmService.get(); CkpowerdevBattRsalarmSet rsalarmSet=new CkpowerdevBattRsalarmSet(); BeanUtils.copyProperties(rsalarm,rsalarmSet); updateRsAlarmSet(rsalarmSet); } private void updateDataFromDataAndStateAndRsAlarmToSet1(List<CKPowerDevBattRtDataSet> dataSetList) { Integer battIndex = dataSetList.get(0).getBattIndex(); List<Integer> monNumList = dataSetList.stream().map(CKPowerDevBattRtDataSet::getMonNum).collect(Collectors.toList()); //获取rtData数据并写入set表 List<CKPowerDevBattRtData> rtDataList = dataService.getMonList(battIndex,monNumList); List<CKPowerDevBattRtDataSet> rtSetDataList = new LinkedList<>(); CKPowerDevBattRtStateSet stateSet = new CKPowerDevBattRtStateSet(); for (CKPowerDevBattRtData temp : rtDataList) { CKPowerDevBattRtDataSet set = new CKPowerDevBattRtDataSet(); BeanUtils.copyProperties(temp,set); rtSetDataList.add(set); } rtDataSetMapper.updateBatch(rtSetDataList); //获取rtState表数据更新到set表中 CKPowerDevBattRtState state = stateService.get(battIndex); BeanUtils.copyProperties(state,stateSet); updateStateSet(stateSet); //获取rsalarm更新到set表中 @@ -135,4 +112,5 @@ public void update(CkpowerdevBattRsalarmSet rsAlarmSet) { rsalarmSetMapper.update(rsAlarmSet,null); } }