From 67ca8b45a975a41093c0e52d8129624657089b44 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 十一月 2024 13:24:36 +0800
Subject: [PATCH] 状态和绩效时间设置，修改值后清空缓存的key修正，修改位与collect一致
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java | 14 +++-
smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/EmployeeCache.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/GlobalWcsServiceImpl.java | 4
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java | 4
smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml | 8 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java | 6 +-
smart-man-boot/src/main/resources/application-dev.yml | 6 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java | 13 ++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java | 4
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualStatusController.java | 5 +
smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ChartNameConstant.java | 6 ++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/TimeStatusVO.java | 3 +
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java | 4
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java | 26 ++------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualBaseVO.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ExtCacheConstant.java | 12 +++-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/IVisualStatusService.java | 6 ++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java | 11 +++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java | 5 +
20 files changed, 96 insertions(+), 48 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/EmployeeCache.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/EmployeeCache.java
index c478f58..52dce7b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/EmployeeCache.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/EmployeeCache.java
@@ -53,7 +53,7 @@
public static void clearPerfCache(List<Long> workstationIds) {
List<String> keys = Lists.newArrayList();
workstationIds.forEach(wId -> {
- String redisKey = StringUtil.format(ExtCacheConstant.POSTING_WORKSTATION.concat("::").concat(WORK), new Object[]{wId});
+ String redisKey = StringUtil.format(ExtCacheConstant.COLLECT_WORKSTATION.concat("::").concat(WORK), new Object[]{wId});
keys.add(redisKey);
});
BLADE_REDIS.del(keys);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ChartNameConstant.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ChartNameConstant.java
index 265911c..937be7d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ChartNameConstant.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ChartNameConstant.java
@@ -1,7 +1,13 @@
package com.qianwen.smartman.common.constant;
+/**
+ * 鍥捐〃鍚嶇О甯搁噺
+ */
public interface ChartNameConstant {
public static final String DEVICE_RUN_DURATION = "璁惧杩愯鏃堕暱鍓�";
+ /**
+ * 鐗规寚杩愯鐘舵��
+ */
public static final Integer DEVICE_RUN_STATUS = 2;
public static final Integer DEVICE_WAIT_STATUS = 3;
public static final String DEVICE_WAIT_DURATION = "璁惧绛夊緟鏃堕暱鍓�";
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ExtCacheConstant.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ExtCacheConstant.java
index 1d2cab4..21c7e4a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ExtCacheConstant.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ExtCacheConstant.java
@@ -1,13 +1,19 @@
package com.qianwen.smartman.common.constant;
-
+/**
+ * 缂撳瓨甯搁噺瀹氫箟
+ */
public interface ExtCacheConstant {
public static final String CPS_CACHE = "blade:cps";
public static final String I18N_CACHE = "blade:i18n";
public static final String WORKSTATION_MACHINE = "blade:machine";
public static final String POSTING_MACHINE = "posting:machine";
public static final String CODE_RULE_CACHE = "blade:codeRule";
- public static final String POSTING_WORKSTATION = "posting:workstation";
- public static final String POSTING_CALENDAR = "posting:calendar";
+ //public static final String POSTING_WORKSTATION = "posting:workstation";
+ /**
+ * 涓庨噰闆嗙▼搴忛�氫俊鐨剅ediskey鍓嶇紑锛屽繀椤讳笌閲囬泦绋嬪簭collect鍙栨暟鎹畾涔夌殑涓�鑷淬�傛敼鍔ㄨ鍊奸渶瑕佷袱涓▼搴忎竴璧锋敼鍔�
+ */
+ public static final String COLLECT_WORKSTATION = "collect:workstation";
+
public static final String EMPLOYEE = "blade:employee";
public static final String GLOBAL_WCS = "blade:global:wcs";
public static final String WORK_FEEDBACK = "blade:feedback";
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java
index 369dd60..6ccc614 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/StatusRecordController.java
@@ -91,6 +91,11 @@
return R.data(this.statusRecordService.getTimeDistribution(statusRecordDetailSelectVO));
}
+ /**
+ * 宸ヤ綅鏁版嵁锛岀鍔ㄧ巼锛屾姤璀︾巼锛岃繍琛岀巼
+ * @param statusRecordDetailSelectVO
+ * @return
+ */
@ApiOperationSupport(order = 4)
@PostResource({"/equipment-efficiency"})
@ApiOperation(value = "鏌ヨ璁惧鏁堢巼", notes = "浼犲叆statusRecordDetailSelectVO")
@@ -122,12 +127,18 @@
return R.data(this.statusRecordService.exportStatusRecord(vo));
}
+ /**
+ * 鎴戜滑鑷繁鍓嶇娌℃湁璋冪敤yys
+ * @param vo
+ * @return
+ */
+ /*
@ApiOperationSupport(order = 8)
@PostResource({"/cross-days"})
@ApiOperation("鍒嗗壊鐘舵�佹暟鎹法澶╂暟鎹�")
public R<List<List<SuperAggregateStateVO>>> crossDayState(@Valid @RequestBody CrossDayStateVO vo) {
return R.data(this.statusRecordService.crossDayState(vo));
- }
+ }*/
@ApiOperationSupport(order = 9)
@PostResource({"/status-record-by-dates"})
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java
index 8f91747..9333eae 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.java
@@ -17,7 +17,7 @@
@DS("iotdb")
@InterceptorIgnore(tenantLine = FmsConstant.AUTOMATIC)
public interface SuperAggregateStateMapper {
- void createTable(@Param("workstationId") Long workstationId);
+ //void createTable(@Param("workstationId") Long workstationId);
void insertData(@Param("workstationId") Long workstationId, @Param("sql") String sql);
@@ -128,7 +128,7 @@
List<SuperAggregateState> listCrossDay(@Param("startTime") String startTime, @Param("endTime") String endTime);
- void saveState(@Param("workstationId") Long workstationId, @Param("list") List<SuperAggregateState> list);
+ //void saveState(@Param("workstationId") Long workstationId, @Param("list") List<SuperAggregateState> list);
List<SuperAggregateState> listInTime(@Param("workstationIds") List<Long> workstationIdList, @Param("startTime") String startTime, @Param("endTime") String endTime);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java
index 13c1e1c..d90196d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IStatusRecordService.java
@@ -41,7 +41,8 @@
BladeFile exportStatusRecord(StatusRecordExcelVO vo);
- List<List<SuperAggregateStateVO>> crossDayState(CrossDayStateVO vo);
+ //鍒嗗壊鐘舵�佹暟鎹法澶╂暟鎹�
+ //List<List<SuperAggregateStateVO>> crossDayState(CrossDayStateVO vo);
IPage<StatusRecordDateVO> getStatusRecordByDates(IPage<StatusRecordDateVO> page, StatusRecordDateTimeSelectVO statusRecordDateTimeSelectVO);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java
index fff19f3..a0cf493 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperAggregateStateService.java
@@ -39,6 +39,15 @@
*/
List<SuperAggregateState> getStatusByTimeSection(List<Long> workstationIds, LocalDateTime startTime, LocalDateTime endTime);
+ /**
+ * 鏍规嵁鐘舵�侊紝璧锋鏃堕棿鑾峰彇鑱氬悎鐘舵�佹暟鎹垪琛�
+ * @param workstationIds
+ * @param startTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @param status 鐘舵�佸�硷紝鏌ヨwcs=status鐨勬暟鎹�
+ * @param top top澶氬皯(缁熻鍚庡彇鍑烘渶楂樼殑top涓暟鎹�)
+ * @return 鏁版嵁鍒楄〃
+ */
List<StatusTimeTopVO> getStatusTimeByWcs(List<Long> workstationIds, LocalDateTime startTime, LocalDateTime endTime, Integer status, Integer top);
List<SuperAggregateState> getOeeAnalysis(List<Long> workStationIdList, LocalDateTime startTime, LocalDateTime endTime);
@@ -55,7 +64,7 @@
List<SuperAggregateState> crossDay(LocalDateTime start, LocalDateTime end);
- void saveState(List<SuperAggregateState> collect);
+ //void saveState(List<SuperAggregateState> collect);
List<SuperAggregateState> getStatusDataByTime(List<Long> workstationIdList, LocalDateTime startTime, LocalDateTime endTime);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
index 8962f0a..f66c76a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/StatusRecordServiceImpl.java
@@ -312,7 +312,7 @@
MultipartFile multipartFile = ExcelUtil.exportToMultipartFile(fileName, ExcelConstant.STATUS_RECORD, exportList, StatusRecordExport.class);
return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
}
-
+ /*
@Override
public List<List<SuperAggregateStateVO>> crossDayState(CrossDayStateVO vo) {
LocalDate date = vo.getDate();
@@ -331,7 +331,7 @@
}).collect(Collectors.toList());
this.superAggregateStateService.saveState(collect);
return list;
- }
+ }*/
@Override
public IPage<StatusRecordDateVO> getStatusRecordByDates(IPage<StatusRecordDateVO> page, StatusRecordDateTimeSelectVO statusRecordDateTimeSelectVO) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
index 8a987b7..3c91cd0 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperAggregateStateServiceImpl.java
@@ -104,25 +104,19 @@
@Override
public List<StatusTimeTopVO> getStatusTimeByWcs(List<Long> workstationIds, LocalDateTime startTime, LocalDateTime endTime, Integer status, Integer top) {
List<StatusTimeTopVO> voList = new ArrayList<>();
-
+ //鏌ヨ闄ゆ墍鏈夌姸鎬佹椂鍙敤鐨勫伐浣嶏紝杞崲浣� 宸ヤ綅id -> 宸ヤ綅 鐨刴ap
Map<Long, Workstation> workstationMap = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
.eq(Workstation::getStatus, CommonConstant.ENABLE)).stream().collect(Collectors.toMap(Workstation::getId, Function.identity()));
- /*
- Map<Long, Workstation> workstationMap = (Map) this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).stream().collect(Collectors.toMap((v0) -> {
- return v0.getId();
- }, Function.identity()));*/
- //List<SuperAggregateState> equipmentStatusDuration = this.baseMapper.getEquipmentStatusDuration(workstationIds, LocalDateTimeUtil.format(startTime, DateConstant.PATTERN_DATE_TIME), LocalDateTimeUtil.format(endTime, DateConstant.PATTERN_DATE_TIME), status);
-
+
// Date startTimeD = LocalDateUtil.localDateTimeToDate(startTime);
//startTimeD = new Date(124,8,2);
//Date endTimeD = LocalDateUtil.localDateTimeToDate(endTime);
//endTimeD = new Date(124,8,3);
+ //鏌ヨ鍑烘椂闂存鍐厀cs=status鐨勬墍鏈夋暟鎹�
List<SuperAggregateState> equipmentStatusDuration = this.baseMapper.getEquipmentStatusDuration(workstationIds, DateTimeUtil.toDate(startTime), DateTimeUtil.toDate(endTime), status);
- List<SuperAggregateState> equipmentStatusDuration2 = FilterOffUtils.filterOffDay(equipmentStatusDuration, OpenTypeEnums.TIME_USED_ANALYSIS);
+ List<SuperAggregateState> equipmentStatusDuration2 = FilterOffUtils.filterOffDay(equipmentStatusDuration, OpenTypeEnums.TIME_USED_ANALYSIS);//杩囨护鏁版嵁锛孴IME_USED_ANALYSIS open =1鍒欒繃婊�
Map<Long, Long> timeMap = buildDuration(startTime, equipmentStatusDuration2).stream().collect(Collectors.groupingBy(SuperAggregate::getWorkstationId, Collectors.summingLong(SuperAggregateState::getDurationCollect))).entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).limit(top.intValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, java.util.LinkedHashMap::new));
//yangys鏀逛簡buildDuration锛屽幓鎺変簡startTime鍙傛暟
//Map<Long, Long> timeMap = buildDuration(equipmentStatusDuration2,ChronoUnit.SECONDS).stream().collect(Collectors.groupingBy(SuperAggregate::getWorkstationId, Collectors.summingLong(SuperAggregateState::getDurationCollect))).entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).limit(top.intValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, java.util.LinkedHashMap::new));
@@ -195,20 +189,14 @@
List<SuperAggregateState> res = this.baseMapper.listCrossDay(startTime, endTime);
return buildDuration(res);
}
-
+ /*
@Override
public void saveState(List<SuperAggregateState> collect) {
Map<Long, List<SuperAggregateState>> map = collect.stream().collect(Collectors.groupingBy(SuperAggregate::getWorkstationId));
map.forEach(this.baseMapper::saveState);
- /*
- Map<Long, List<SuperAggregateState>> map = collect.stream().collect(Collectors.groupingBy((v0) -> {
- return v0.getWorkstationId();
- }));
- SuperAggregateStateMapper superAggregateStateMapper = this.baseMapper;
- superAggregateStateMapper.getClass();
- map.forEach(this::saveState);*/
+
}
-
+*/
@Override
public List<SuperAggregateState> getStatusDataByTime(List<Long> workstationIdList, LocalDateTime start, LocalDateTime end) {
List<SuperAggregateState> superAggregateStateList = new ArrayList<>();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
index 7316983..4a247ee 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
@@ -12,7 +12,7 @@
public class FilterOffUtils {
/**
- * 杩囨护浼戞伅鏃ワ紵
+ * 杩囨护鏁版嵁
* @param <R>
* @param data 鑱氬悎鐘舵�佹暟鎹垪琛�
* @param openTypeEnums RUNNING/ALARM/OEE绛�
@@ -22,9 +22,9 @@
if (Func.isEmpty(data)) {
return data;
}
- boolean filterType = whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, openTypeEnums);//mdc_open_type锛屾槸鍚﹁繃婊よ绫诲瀷
- boolean filterShift = whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, openTypeEnums);//mdc_open_shift锛屾槸鍚﹁繃婊ょ彮鍒�
- //杩欓噷绠�鍖栵紝涓嶈繃婊や簡锛屾暟鎹湪win鏈嶅姟鍣ㄦ湁锛宐lade_boot_blade_param-0418bak.sql鏈夛紝鏄釜json鏁扮粍
+ //鑾峰彇"鍒嗘瀽璁剧疆"鐣岄潰涓殑杩囨护閰嶇疆锛屾病鏈夎缃暟鎹垯杩斿洖false(涓嶈繃婊�)
+ boolean filterType = whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, openTypeEnums);//mdc_open_type锛屾槸鍚﹁繃婊ゆ帀浼戞伅鏃舵(shiftTimeType=2)
+ boolean filterShift = whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, openTypeEnums);//mdc_open_shift锛屾槸鍚﹁繃婊ょ彮鍒�(shiftIndex>0鐨勬暟鎹繚鐣�)
if (!filterType && !filterShift) {
return data;
@@ -43,6 +43,12 @@
return data;
}
+ /**
+ * 鏄惁杩囨护鏁版嵁(鏍规嵁绯荤粺鍙傛暟涓殑json鏁版嵁,open==1灏辫繃婊�)
+ * @param typeEnums 杩囨护鍒嗙被(鐝埗/鎴栫被鍨�) mdc_open_shift/mdc_open_type
+ * @param enums 杩囨护鐨勯」鐩甌IME_USED_ANALYSIS/ALARM_ANALYSIS ...
+ * @return
+ */
public static boolean whetherToFilter(OpenTypeEnums typeEnums, OpenTypeEnums enums) {
String value = ParamCache.getValue(typeEnums.getMsg());
if (Func.isNull(value)) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/GlobalWcsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/GlobalWcsServiceImpl.java
index 7b9f3f2..726c0ab 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/GlobalWcsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/GlobalWcsServiceImpl.java
@@ -55,7 +55,7 @@
globalWcsOfRps.setRps(wcsAchievements.getRps());
globalWcsOfRps.setIsPlan(wcsAchievements.getIsPlan());
globalWcsOfRps.insertOrUpdate();
- CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
+ CacheUtil.clear(ExtCacheConstant.COLLECT_WORKSTATION, Boolean.FALSE);
}
@Override
@@ -71,7 +71,7 @@
globalWcsOfRps.setRps(wcsAchievementsUpdateVO.getRps());
globalWcsOfRps.setIsPlan(wcsAchievementsUpdateVO.getIsPlan());
globalWcsOfRps.insertOrUpdate();
- CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
+ CacheUtil.clear(ExtCacheConstant.COLLECT_WORKSTATION, Boolean.FALSE);
return save(globalWcs);
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
index 243498e..eddc38f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
@@ -213,7 +213,7 @@
submitWorkstationWorkbench(workstationSubmitVO, workstation);
WorkstationCache.clearWorkstationCache();
WorkstationCache.clearWorkstationRealTime(workstation.getId());
- CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
+ CacheUtil.clear(ExtCacheConstant.COLLECT_WORKSTATION, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.WORKSTATION_MACHINE, Boolean.FALSE);
String redisKey = ExtCacheConstant.CPS_CACHE.concat(":").concat(":").concat(WorkstationCache.CRC);
@@ -364,14 +364,14 @@
return v0.getItemId();
}, workstationIds));*/
WorkstationCache.clearWorkstationCache();
- CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
+ CacheUtil.clear(ExtCacheConstant.COLLECT_WORKSTATION, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.WORKSTATION_MACHINE, Boolean.FALSE);
CacheUtil.clear(redisKey, Boolean.FALSE);
}
changeStatus(workstationIds, CommonConstant.DEACTIVATE);
WorkstationCache.clearWorkstationCache();
- CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
+ CacheUtil.clear(ExtCacheConstant.COLLECT_WORKSTATION, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.WORKSTATION_MACHINE, Boolean.FALSE);
CacheUtil.clear(redisKey, Boolean.FALSE);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualStatusController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualStatusController.java
index c772077..8c5ed0c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualStatusController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/controller/VisualStatusController.java
@@ -40,6 +40,11 @@
return R.data(this.visualStatusService.getVisualStatusRecord(visualBaseVO));
}
+ /**
+ * 棣栭〉鍗＄墖杩愯鏃堕暱鎺掑悕
+ * @param timeStatusVO
+ * @return
+ */
@ApiOperationSupport(order = 2)
@PostResource({"/running-top"})
@ApiOperation(value = "璁惧杩愯鏃堕暱TOP", notes = "浼犲叆timeStatusVO")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/IVisualStatusService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/IVisualStatusService.java
index 200b2ce..b0a48a3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/IVisualStatusService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/IVisualStatusService.java
@@ -15,6 +15,12 @@
public interface IVisualStatusService {
ChartGanttStatusDataVO getVisualStatusRecord(VisualBaseVO visualBaseVO);
+ /**
+ * 鏌ヨ鍥捐〃
+ * @param timeStatusVO
+ * @param status 璁惧鐘舵�佸��
+ * @return
+ */
ChartSeriesDataVO getDeviceStatusDuration(TimeStatusVO timeStatusVO, Integer status);
ChartNameValueDataVO getStatusDistribution(VisualBaseVO vo);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
index 2211986..fff031b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
@@ -105,8 +105,8 @@
return new ChartSeriesDataVO();
}
List<Long> workStationIdList = timeStatusVO.getWorkStationIdList();
- String timeLevel = timeStatusVO.getTimeLevel();
- Integer top = timeStatusVO.getTop();
+ String timeLevel = timeStatusVO.getTimeLevel();//灏忔椂鏁帮紝濡�24灏忔椂
+ Integer top = timeStatusVO.getTop();//鏌ヨ澶氬皯涓�
VisualTimeDTO visualTimeDTO = VisualUtils.getTimeSectionByLevel(timeLevel);
List<StatusTimeTopVO> statusTimeByWcs = this.superAggregateStateService.getStatusTimeByWcs(workStationIdList, visualTimeDTO.getStartTime(), visualTimeDTO.getEndTime(), status, top);
return this.wrapper.deviceStatusDuration(statusTimeByWcs, status, top);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java
index 6d8c308..6661b86 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/utils/VisualUtils.java
@@ -40,6 +40,11 @@
private static final IOssService ossService = (IOssService) SpringUtil.getBean(IOssService.class);
+ /**
+ * 鏍规嵁level锛堝皬鏃舵暟锛夎幏鍙栬捣姝㈡椂闂�
+ * @param level 灏忔椂鏁�
+ * @return 鍖呭惈璧锋鏃堕棿瀵硅薄
+ */
public static VisualTimeDTO getTimeSectionByLevel(String level) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime startTime = now.minusHours(Long.parseLong(level));
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/TimeStatusVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/TimeStatusVO.java
index 42ec9b5..b2eaaa4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/TimeStatusVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/TimeStatusVO.java
@@ -4,6 +4,9 @@
public class TimeStatusVO extends VisualBaseVO {
+ /**
+ * top x,鏌ヨ鏈�楂樼殑鍑犳潯
+ */
@ApiModelProperty("璁惧top鏁版嵁")
private Integer top;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualBaseVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualBaseVO.java
index 7843125..0fb365d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualBaseVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/vo/VisualBaseVO.java
@@ -12,7 +12,7 @@
@Size(min = 1, message = "宸ヤ綅ID涓嶈兘涓虹┖")
private List<Long> workStationIdList;
@ApiModelProperty("鏃堕棿绛夌骇")
- private String timeLevel;
+ private String timeLevel;//running-top涓槸灏忔椂鏁�
public void setWorkStationIdList(final List<Long> workStationIdList) {
this.workStationIdList = workStationIdList;
diff --git a/smart-man-boot/src/main/resources/application-dev.yml b/smart-man-boot/src/main/resources/application-dev.yml
index b059813..71d0a58 100644
--- a/smart-man-boot/src/main/resources/application-dev.yml
+++ b/smart-man-boot/src/main/resources/application-dev.yml
@@ -1,16 +1,16 @@
# redis
redis:
- host: localhost
+ host: 120.46.212.231
port: 6379
password: root
- database: 1
+ database: 5
ssl: false
# database config
datasource:
type: mysql
url: 120.46.212.231
port: 3306
- database: smart_boot
+ database: smartman
username: qwmdc
password: Kknd_1234
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml
index ab0a931..80f425b 100644
--- a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml
+++ b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateMapper.xml
@@ -6,7 +6,7 @@
insert into iot_data.aggregate_state_${workstationId}
values ${sql}
</insert>
-
+ <!--
<insert id="saveState">
insert into iot_data.aggregate_state_${workstationId} USING iot_data.super_aggregate_state
TAGS(${workstationId}) values
@@ -16,14 +16,14 @@
#{item.shiftIndex}, #{item.shiftTimeType}, #{item.wcs}, #{item.rps}, #{item.isDeleted},#{item.isPlan})
</foreach>
</insert>
-
+
<update id="createTable">
create table if not exists iot_data.aggregate_state_${workstationId} using super_aggregate_state tags
(
#{workstationId}
)
</update>
-
+ -->
<select id="countStatsShiftEndTimeNotNull" resultType="com.qianwen.smartman.modules.mdc.dto.CountResult">
select sum(duration_collect) as nums, value_collect status
from iot_data.super_aggregate_state
@@ -484,6 +484,8 @@
</foreach>
align by device
</select>
+
+ <!-- 杩欎釜鏈夌敤鍚� -->
<select id="listCrossDay" resultType="com.qianwen.smartman.modules.mdc.entity.SuperAggregateState">
select ts as startTime,
end_time as endTime,
--
Gitblit v1.9.3