From 44c1da90d18396b4c78c588571e71eaa8e49c8d6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 18 十二月 2023 16:57:35 +0800
Subject: [PATCH] mdc修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java
index 50fee45..745a902 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java
@@ -1,19 +1,24 @@
package org.jeecg.modules.mdc.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.mdc.dto.MdcProcessCountDto;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcProcessCountMapper;
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.MdcDeviceCalendarVo;
+import org.jeecg.modules.mdc.vo.MdcProcessCountVo;
import org.jeecg.modules.mdc.vo.MdcShiftDateVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -47,7 +52,8 @@
@Transactional(rollbackFor = {Exception.class})
public void runningProcessCount() {
// 鑾峰彇鎵�鏈夎澶�
- List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2140244"));
+ //List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2240074"));
+ List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list();
List<MdcProcessCount> result = new ArrayList<>();
for (MdcEquipment mdcEquipment : mdcEquipmentList) {
List<MdcProcessCount> mdcProcessCountList = processCount(mdcEquipment);
@@ -58,6 +64,49 @@
if (!result.isEmpty()) {
this.saveBatch(result);
}
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param userId
+ * @param page
+ * @param mdcProcessCountVo
+ * @param req
+ * @return
+ */
+ @Override
+ public IPage<MdcProcessCountDto> pageList(String userId, Page<MdcProcessCountDto> page, MdcProcessCountVo mdcProcessCountVo, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcProcessCountVo.getParentId()) && StringUtils.isEmpty(mdcProcessCountVo.getEquipmentId())) {
+ if ("2".equals(mdcProcessCountVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcProcessCountVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcProcessCountVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcProcessCountVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcProcessCountVo.setMdcSectionIds(Collections.singletonList(mdcProcessCountVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcProcessCountVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+ if (mdcProcessCountVo.getMdcSectionIds() == null || mdcProcessCountVo.getMdcSectionIds().isEmpty()) {
+ mdcProcessCountVo.setMdcSectionIds(equipmentIds);
+ }
+
+ if (mdcProcessCountVo.getMdcSectionIds() == null || mdcProcessCountVo.getMdcSectionIds().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, mdcProcessCountVo);
}
@Transactional(readOnly = true)
@@ -90,7 +139,7 @@
}
// 鑾峰彇璁惧鐝淇℃伅
Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(mdcEquipment.getEquipmentId(), stringDates);
- if (listMap.isEmpty()) {
+ if (listMap == null || listMap.isEmpty()) {
listMap = new HashMap<>();
}
List<MdcProcessCount> resultList = new ArrayList<>();
@@ -146,27 +195,32 @@
mdcProcessCount.setStartTime(startDate);
}
if ("FANUC".equals(mdcEquipment.getDriveType())) {
- // 娉曞叞鍏嬭澶囨牴鎹甈roductCount瀛楁鍒ゆ柇
- String productCount = mdcEquipmentDtoList.get(0).get("ProductCount").toString();
- for (int i = 0; i < mdcEquipmentDtoList.size(); i++) {
- if (!productCount.equals(mdcEquipmentDtoList.get(i).get("ProductCount").toString())) {
- productCount = mdcEquipmentDtoList.get(i).get("ProductCount").toString();
- if (mdcEquipmentDtoList.get(i - 1).get("CollectTime") != null) {
- mdcProcessCount.setEndTime(DateUtils.toDate(mdcEquipmentDtoList.get(i - 1).get("CollectTime").toString(), DateUtils.STR_DATE_TIME));
- mdcProcessCount.setDuration(TimeFieldUtils.duration(mdcProcessCount.getStartTime(), mdcProcessCount.getEndTime()));
- mdcProcessCount.setSequenceNumber(mdcEquipmentDtoList.get(i - 1).get("Sequencenumber").toString());
- resultList.add(mdcProcessCount);
- if (TimeFieldUtils.duration(mdcProcessCount.getEndTime(), mdcEquipmentRunningSection.getEndTime()) > 60) {
- //mdcProcessCount.setStartTime(mdcProcessCount.getEndTime());
- startDate = mdcProcessCount.getEndTime();
- } else if (j + 1 < equipmentRunningSectionList.size()) {
- //mdcProcessCount.setStartTime(equipmentRunningSectionList.get(j + 1).getStartTime());
- startDate = equipmentRunningSectionList.get(j + 1).getStartTime();
- } else {
- startDate = null;
+ try {
+ // 娉曞叞鍏嬭澶囨牴鎹甈roductCount瀛楁鍒ゆ柇
+ String productCount = mdcEquipmentDtoList.get(0).get("ProductCount").toString();
+ for (int i = 0; i < mdcEquipmentDtoList.size(); i++) {
+ if (!productCount.equals(mdcEquipmentDtoList.get(i).get("ProductCount").toString())) {
+ productCount = mdcEquipmentDtoList.get(i).get("ProductCount").toString();
+ if (mdcEquipmentDtoList.get(i - 1).get("CollectTime") != null) {
+ mdcProcessCount.setEndTime(DateUtils.toDate(mdcEquipmentDtoList.get(i - 1).get("CollectTime").toString(), DateUtils.STR_DATE_TIME));
+ mdcProcessCount.setDuration(TimeFieldUtils.duration(mdcProcessCount.getStartTime(), mdcProcessCount.getEndTime()));
+ mdcProcessCount.setSequenceNumber(mdcEquipmentDtoList.get(i - 1).get("Sequencenumber").toString());
+ resultList.add(mdcProcessCount);
+ if (TimeFieldUtils.duration(mdcProcessCount.getEndTime(), mdcEquipmentRunningSection.getEndTime()) > 60) {
+ //mdcProcessCount.setStartTime(mdcProcessCount.getEndTime());
+ startDate = mdcProcessCount.getEndTime();
+ } else if (j + 1 < equipmentRunningSectionList.size()) {
+ //mdcProcessCount.setStartTime(equipmentRunningSectionList.get(j + 1).getStartTime());
+ startDate = equipmentRunningSectionList.get(j + 1).getStartTime();
+ } else {
+ startDate = null;
+ }
}
}
}
+ } catch (Exception e) {
+ log.error("璁＄畻鍔犲伐宸ヤ欢绠楁硶澶辫触锛佽澶囩紪鍙凤細" + mdcEquipment.getEquipmentId(), e);
+ //System.out.println("璁＄畻鍔犲伐宸ヤ欢绠楁硶澶辫触锛佽澶囩紪鍙凤細" + mdcEquipment.getEquipmentId());
}
}
}
--
Gitblit v1.9.3