问题反馈

Lius

2024-05-16 5bbbefadb317d2d9c0c66d86c7ee7f8c3dcb19a3

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

@@ -35,8 +35,12 @@
    @Override
    @Transactional(readOnly = true)
    public List<EquipmentMachingDto> getEquipmentSequencenumber(String tableName, Date startTime, Date endTime) {
        List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
        return convertData(list);
        try {
            List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
            return convertData(list);
        } catch (Exception e) {
            return null;
        }
    }

    @Override
@@ -45,6 +49,34 @@
        return count != 0;
    }

    @Override
    public List<String> findRunningData(String tableName, Date startTime, Date endTime) {
        return equipmentWorkLineMapper.findRunningData(tableName, startTime, endTime);
    }

    @Override
    public List<EquipmentMachingDto> getEquipProgramNum(String drivetype, String equipmentid, Date startTime, Date endTime) {
        return equipmentWorkLineMapper.getEquipProgramNum(drivetype + "_" + equipmentid, startTime, endTime);
    }

    @Override
    public MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount, Date startTime, Date endTime) {
        try {
            return equipmentWorkLineMapper.findProductCountStartTime(saveTableName, productCount, startTime, endTime);
        } catch (Exception e) {
            return null;
        }
    }

    @Override
    public MdcEquipmentDto findProductCountEndTime(String saveTableName, String productCount, Date startTime, Date endTime) {
        try {
            return equipmentWorkLineMapper.findProductCountEndTime(saveTableName, productCount, startTime, endTime);
        } catch (Exception e) {
            return null;
        }
    }

    private List<EquipmentMachingDto> convertData(List<Map<String, Object>> list) {
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
        List<EquipmentMachingDto> dto = new ArrayList<>();