Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-11-07 094a9290c836827bc1f45fd3549e7cd2ea1e1e45

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.mdc.dto.EquipmentMachingDto;
import org.jeecg.modules.mdc.dto.MdcEquipmentRunningSectionDto;
import org.jeecg.modules.mdc.entity.*;
@@ -10,7 +11,9 @@
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.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +41,12 @@

    @Resource
    private IEquipmentWorkLineService equipmentWorkLineService;

    @Resource
    private ISysDictService sysDictService;

    @Resource
    private IEquipmentRunningTraceService equipmentRunningTraceService;

    @Override
    public List<MdcEquipmentRunningSectionDto> logList(MdcEquipmentRunningSectionVo equipmentRunningSectionVo) {
@@ -482,7 +491,50 @@
                //save errorList
                super.saveBatch(errorList);
            }
            List<DictModel> dictList = sysDictService.queryDictItemsByCode("data_synchronization_flag");
            if (dictList != null && !dictList.isEmpty() && "0".equals(dictList.get(0).getValue())) {
                this.dataSynchronizationHandler(list, errorList);
            }
        }
    }

    /**
     * 数据同步处理
     * @param list
     * @param errorList
     */
    private void dataSynchronizationHandler(List<MdcEquipmentRunningSection> list, List<MdcEquipmentRunningSection> errorList) {
        // 数据转换
        List<EquipmentRunningTrace> equipList = new ArrayList<>();
        if (list != null && !list.isEmpty()) {
            list.forEach(item -> {
                EquipmentRunningTrace equipmentRunningSection = new EquipmentRunningTrace();
                equipmentRunningSection.setEquipment(item.getEquipmentId());
                equipmentRunningSection.setAlarm(item.getAlarm());
                equipmentRunningSection.setCreateTime(item.getCreateTime());
                equipmentRunningSection.setDuration(item.getDuration());
                equipmentRunningSection.setEndTime(item.getEndTime());
                equipmentRunningSection.setStartTime(item.getStartTime());
                equipmentRunningSection.setStatus(item.getStatus());
                equipmentRunningSection.setSequencenumber(item.getSequenceNumber());
                equipList.add(equipmentRunningSection);
            });
        }
        if (errorList != null && !errorList.isEmpty()) {
            errorList.forEach(item -> {
                EquipmentRunningTrace equipmentRunningSection = new EquipmentRunningTrace();
                equipmentRunningSection.setEquipment(item.getEquipmentId());
                equipmentRunningSection.setAlarm(item.getAlarm());
                equipmentRunningSection.setCreateTime(item.getCreateTime());
                equipmentRunningSection.setDuration(item.getDuration());
                equipmentRunningSection.setEndTime(item.getEndTime());
                equipmentRunningSection.setStartTime(item.getStartTime());
                equipmentRunningSection.setStatus(item.getStatus());
                equipmentRunningSection.setSequencenumber(item.getSequenceNumber());
                equipList.add(equipmentRunningSection);
            });
        }
        equipmentRunningTraceService.saveBatch(equipList);
    }

    /**
@@ -588,6 +640,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<>();