Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java

@@ -10,6 +10,7 @@
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.TimeFieldUtils;
import org.jeecg.modules.mdc.vo.MdcAlarmAnalyzeQueryVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentRunningSectionVo;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -463,7 +464,7 @@
     * 设备运行状态点时间转为段时间
     */
    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void runningAllEquipmentTraceProcess() {
        //获取所有设备
        List<Equipment> equipmentList = equipmentService.list();
@@ -588,6 +589,21 @@
        return this.baseMapper.listEquipmentRunningSectionError(equipmentid, start, end);
    }

    @Override
    public List<MdcEquipmentRunningSection> findAlarmList(MdcAlarmAnalyzeQueryVo vo) {
        return this.baseMapper.findAlarmList(vo);
    }

    @Override
    public Integer findAlarmCount(String equipmentId, String startDate, String endDate, String alarmCode) {
        return this.baseMapper.findAlarmCount(equipmentId, startDate, endDate, alarmCode);
    }

    @Override
    public Integer findAlarmCountByDate(String startDate, String endDate, MdcAlarmAnalyzeQueryVo vo) {
        return this.baseMapper.findAlarmCountByDate(startDate, endDate, vo);
    }

    private Map<String, List<MdcEquipmentRunningSectionDto>> logCharts(MdcEquipmentRunningSectionVo equipmentRunningSectionVo, String date) {
        Map<String, List<MdcEquipmentRunningSectionDto>> map = new HashMap<>();
        List<MdcEquipmentRunningSectionDto> normal = new ArrayList<>();