From f112d1263921940234671e5788f6cf2655dbc353 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 25 十月 2024 10:47:58 +0800
Subject: [PATCH] 过程参数，图形展示修改为使用数据点的paramChartType属性来判断
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/DatapointDTO.java | 44 ++++++++++++++++++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java | 19 +++++++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java | 10 ++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java | 10 +++++
smart-man-boot/src/main/resources/application-dev.yml | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java | 2
6 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
index 11366a6..77a8ca8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
@@ -293,7 +293,7 @@
while (true) {
long i = j;
if (i <= difference) {
- LocalDate needHandleDate = year.equals(currentYear) ? LocalDate.now().plus(difference - i, (TemporalUnit) ChronoUnit.DAYS) : LocalDate.of(year.intValue(), 1, 1).plus(difference - i, (TemporalUnit) ChronoUnit.DAYS);
+ LocalDate needHandleDate = year.equals(currentYear) ? LocalDate.now().plus(difference - i, ChronoUnit.DAYS) : LocalDate.of(year.intValue(), 1, 1).plus(difference - i, ChronoUnit.DAYS);// (TemporalUnit) ChronoUnit.DAYS
LocalDate nextNeedHandleDate = needHandleDate.plus(1L, (TemporalUnit) ChronoUnit.DAYS);
buildCurrentDayTime(dateDTOList, calendarId, year, dateList, offDay, productionCalendarDaytimeList, productionCalendarDayList, shiftDetailMap, snowflake, curProductionCalendarDayTimeList, needHandleDate);
handleConflietDayTime(calenadar, year, productionCalendarDaytimeList, todayDateTimeList, curProductionCalendarDayTimeList, difference, i, needHandleDate, nextNeedHandleDate);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java
index 9a43c65..91036d8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java
@@ -17,6 +17,7 @@
import com.qianwen.core.tool.api.R;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
+import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterRealVO;
import com.qianwen.smartman.modules.mdc.service.IProcessParameterService;
import com.qianwen.smartman.modules.mdc.vo.AllShiftTimeDetail;
@@ -78,9 +79,18 @@
@GetResource({"/param"})
@ApiOperation("鍙傛暟閫夋嫨")
@PreAuth
+ //TODO 璋冭瘯鏂拌繃绋嬪弬鏁板睍绀哄悗鍒犻櫎
public R<List<WorkstationWcsDmpDTO>> processParam(@RequestParam("workstationId") String workstationId) {
return R.data(this.processParameterService.processParam(workstationId));
}
+
+ @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
+ @GetResource({"/params"})
+ @ApiOperation("灞曠ず鏁版嵁鐐瑰垪琛�")
+ @PreAuth
+ public R<List<DatapointDTO>> params(@RequestParam("workstationId") String workstationId) {
+ return R.data(this.processParameterService.processParams(workstationId));
+ }
@ApiOperationSupport(order = 6)
@PostResource({"/excel/export"})
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/DatapointDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/DatapointDTO.java
new file mode 100644
index 0000000..d04dfc4
--- /dev/null
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/DatapointDTO.java
@@ -0,0 +1,44 @@
+package com.qianwen.smartman.modules.mdc.dto;
+
+import java.io.Serializable;
+/**
+ * 鏁版嵁鐐癸紝鐢ㄤ簬鑾峰彇杩囩▼鍙傛暟灞曠ず椤�
+ */
+public class DatapointDTO implements Serializable {
+ private static final long serialVersionUID = -27216320873573146L;
+
+ private String dpLabel;
+ private String dpName;
+ private Boolean isProcessParam;
+ /**
+ * 灞曠ず鍥捐〃绫诲瀷.鈥濇洸绾垮浘鈥滐紙鍊糽ine锛夊拰鈥濆垎甯冨浘鈥滐紙鍊糳istribute锛�
+ */
+ private String paramChartType;
+ public String getDpLabel() {
+ return dpLabel;
+ }
+ public void setDpLabel(String dpLabel) {
+ this.dpLabel = dpLabel;
+ }
+
+ public String getDpName() {
+ return dpName;
+ }
+ public void setDpName(String dpName) {
+ this.dpName = dpName;
+ }
+ public String getParamChartType() {
+ return paramChartType;
+ }
+ public void setParamChartType(String paramChartType) {
+ this.paramChartType = paramChartType;
+ }
+ public Boolean getIsProcessParam() {
+ return isProcessParam;
+ }
+ public void setIsProcessParam(Boolean isProcessParam) {
+ this.isProcessParam = isProcessParam;
+ }
+
+
+}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
index 32345b2..545d1c5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
@@ -6,6 +6,7 @@
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
+import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterRealVO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterVO;
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
@@ -28,7 +29,7 @@
IPage<ProcessParameterRealVO> pageProcessParameter(Query query, ProcessParameterItemSearchVO vo);
/**
- * 鑾峰彇宸ヤ綅鐨勬墍鏈夐噰闆嗗弬鏁板垪琛�
+ * 鑾峰彇宸ヤ綅鐨勬墍鏈夐噰闆嗗弬鏁板垪琛�,璋冭瘯瀹屾垚鍚庨渶瑕佸垹闄�
* @param workstationId
* @return
*/
@@ -62,6 +63,13 @@
* @return
*/
List<WorkstationCollectData> queryLastParameter(long workstationId);
+
+ /**
+ * 鑾峰彇宸ヤ綅鐨勬墍鏈夋暟鎹偣鍙傛暟(鍏佽杩囩▼鍙傛暟灞曠ず鐨�)
+ * @param workstationId 宸ヤ綅id
+ * @return
+ */
+ List<DatapointDTO> processParams(String workstationId);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
index 81a49e0..62bc4b1 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
@@ -55,6 +55,7 @@
import com.qianwen.smartman.modules.cps.utils.ThrowFun;
import com.qianwen.smartman.modules.cps.vo.ShiftTimeDetailVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsVO;
+import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.GroupWorkDTO;
import com.qianwen.smartman.modules.mdc.dto.NewParamDTO;
import com.qianwen.smartman.modules.mdc.dto.ParamDTO;
@@ -219,6 +220,24 @@
}
return dps;
}
+
+ @Override
+ public List<DatapointDTO> processParams(String workstationId) {
+ //鑾峰彇灞曠ず鍦ㄨ繃绋嬪弬鏁颁腑鐨勫彉閲�
+ if(ObjectUtil.isEmpty(workstationId)) {
+ return Collections.emptyList();
+ }
+ WorkstationDatapointsVO dpVo = dpService.getDatapoints(Long.parseLong(workstationId));
+ if(ObjectUtil.isEmpty(dpVo.getDpConfig())) {
+ return Collections.emptyList();
+ }
+
+ //JSONArray dpArrJson = JSONArray.parseArray(dpVo.getDpConfig());
+ List<DatapointDTO> list = JSONObject.parseArray(dpVo.getDpConfig(),DatapointDTO.class);
+
+ return list.stream().filter(dp -> dp.getIsProcessParam()!=null && dp.getIsProcessParam()).collect(Collectors.toList());
+
+ }
@Override
public ProParamSheetVO queryProcessParameterSheet(ProcessParameterSearchVO vo, Boolean isFilterProcessParameter) {
diff --git a/smart-man-boot/src/main/resources/application-dev.yml b/smart-man-boot/src/main/resources/application-dev.yml
index ff02333..9c2356a 100644
--- a/smart-man-boot/src/main/resources/application-dev.yml
+++ b/smart-man-boot/src/main/resources/application-dev.yml
@@ -71,7 +71,7 @@
addresses: http://localhost:8080/xxl-job-admin
### xxl-job executor address
executor:
- appname: phoenix
+ appname: smartman
ip:
# 閮ㄧ讲39锛屼复鏃惰皟鏁� 7079ori
port: 7089
--
Gitblit v1.9.3