src/main/java/com/whyc/dto/BattRtSetDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/CKPowerDevBattRsAlarmService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/dto/BattRtSetDto.java
@@ -3,13 +3,19 @@ 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.CKPowerDevBattSetLog; import com.whyc.pojo.db_ckpwrdev_data_rt.CkpowerdevBattRsalarmSet; import java.util.List; public class BattRtSetDto { //单体 private List<CKPowerDevBattRtDataSet> dataSetList; //组端 private CKPowerDevBattRtStateSet stateSet; //追加 核容设备告警实时状态 private CkpowerdevBattRsalarmSet rsAlarmSet; //日志 private List<CKPowerDevBattSetLog> logList; public List<CKPowerDevBattRtDataSet> getDataSetList() { @@ -35,4 +41,12 @@ public void setLogList(List<CKPowerDevBattSetLog> logList) { this.logList = logList; } public CkpowerdevBattRsalarmSet getRsAlarmSet() { return rsAlarmSet; } public void setRsAlarmSet(CkpowerdevBattRsalarmSet rsAlarmSet) { this.rsAlarmSet = rsAlarmSet; } } src/main/java/com/whyc/service/CKPowerDevBattRsAlarmService.java
@@ -1,5 +1,7 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.dto.Response; import com.whyc.mapper.CkpowerdevBattRsalarmMapper; import com.whyc.pojo.db_ckpwrdev_data_rt.CkpowerdevBattRsalarm; @@ -18,4 +20,10 @@ List<CkpowerdevBattRsalarm> list=mapper.selectList(null); return new Response<>().setII(1,list!=null,list,"组端告警"); } public CkpowerdevBattRsalarm get() { QueryWrapper<CkpowerdevBattRsalarm> query = Wrappers.query(); query.last(" limit 1"); return mapper.selectOne(query); } } src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -44,11 +44,18 @@ @Autowired private CKPowerDevBattRtStateService stateService; @Autowired private CKPowerDevBattRsAlarmService rsAlarmService; @Autowired private CkpowerdevBattRsalarmSetService rsAlarmSetService; public Response updateMon(BattRtSetDto setDto) { List<CKPowerDevBattRtDataSet> dataSetList = setDto.getDataSetList(); Integer battIndex = dataSetList.get(0).getBattIndex(); CkpowerdevBattRsalarmSet rsAlarmSet = setDto.getRsAlarmSet(); //查询data和state表数据并设置到对应的set表 updateDataFromDataAndStateToSet(dataSetList); updateDataFromDataAndStateAndAlarmToSet(dataSetList); //设置state_set表,与李军沟通确定,组端和单体设置,都采用设置下面这个cmd值.因为单体和组端会一起设置 int opCmd; if(battIndex == 0) { @@ -65,6 +72,8 @@ stateSet.setBattIndex(battIndex); stateSet.setOpCmd(opCmd); update(stateSet); //设置rsalarm_set rsAlarmSetService.update(rsAlarmSet); //读取opCmd返回是否成功 QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query(); Response opStatus =OpCmdUtil.getOpStatus(mapper, query, opCmd,20,battIndex); @@ -128,25 +137,29 @@ update(stateSet); } private void updateDataFromDataAndStateToSet(List<CKPowerDevBattRtDataSet> dataSetList) { private void updateDataFromDataAndStateAndAlarmToSet(List<CKPowerDevBattRtDataSet> dataSetList) { Integer battIndex = dataSetList.get(0).getBattIndex(); List<Integer> monNumList = dataSetList.stream().map(CKPowerDevBattRtDataSet::getMonNum).collect(Collectors.toList()); //获取实时表数据并写入set表 List<CKPowerDevBattRtData> rtDataList = dataService.getMonList(battIndex,monNumList); CKPowerDevBattRtState state = stateService.get(battIndex); CkpowerdevBattRsalarm rsAlarm = rsAlarmService.get(); //属性迁移 List<CKPowerDevBattRtDataSet> rtSetDataList = new LinkedList<>(); CKPowerDevBattRtStateSet stateSet = new CKPowerDevBattRtStateSet(); CkpowerdevBattRsalarmSet rsAlarmSet = new CkpowerdevBattRsalarmSet(); for (CKPowerDevBattRtData temp : rtDataList) { CKPowerDevBattRtDataSet set = new CKPowerDevBattRtDataSet(); BeanUtils.copyProperties(temp,set); rtSetDataList.add(set); } BeanUtils.copyProperties(state,stateSet); BeanUtils.copyProperties(rsAlarm,rsAlarmSet); //rt表数据更新到set表中 dataSetService.updateBatch(rtSetDataList); update(stateSet); rsAlarmSetService.update(rsAlarmSet); } src/main/java/com/whyc/service/CkpowerdevBattRsalarmSetService.java
@@ -1,6 +1,7 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.constant.CMD_Constant; import com.whyc.dto.DevalarmSet; @@ -29,4 +30,8 @@ QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query(); return OpCmdUtil.getOpStatus(rsMapper,query, CMD_Constant.CMD_SetBattAlarm,20,null); } public void update(CkpowerdevBattRsalarmSet rsAlarmSet) { rsMapper.update(rsAlarmSet,null); } }