From a3686cfa49bf53fb91a2ceb960cf15b3ebdac641 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 30 五月 2024 16:38:00 +0800
Subject: [PATCH] 测试代码
---
smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.xml | 2
smart-man-boot/src/main/resources/application-dev.yml | 2
smart-starter-redis/src/main/java/com/qianwen/core/redis/cache/BladeRedis.java | 6 +++
smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/CommonUtil.java | 7 +++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java | 4 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java | 7 ++-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java | 4 ++
smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/CollectDataServiceImpl.java | 3 +
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/jobHandler/CalendarCacheXxlJob.java | 7 ++-
smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/TimeSliceCache.java | 10 +++-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/dto/TelemetryDataResponseDTO.java | 3 +
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java | 3 +
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/ICalendarService.java | 5 ++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/jobHandler/CacheNewCollectXxlJob.java | 3 +
15 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/TimeSliceCache.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/TimeSliceCache.java
index 8b7b922..8a3239f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/TimeSliceCache.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/cache/cps/TimeSliceCache.java
@@ -86,7 +86,7 @@
if (Func.isEmpty(members)) {
ProductionCalendar calendar = (ProductionCalendar)CALENDAR_SERVICE.getOne(Wrappers.<ProductionCalendar>lambdaQuery().eq(ProductionCalendar::getCode, calendarCode));
- return (List) Optional.ofNullable(calendar).map(cal -> {
+ return Optional.ofNullable(calendar).map(cal -> {
ProductionCalendarDay calendarDay = CALENDAR_DAY_SERVICE.getOne((Wrappers.<ProductionCalendarDay>lambdaQuery().eq((v0) -> {
return v0.getCalendarId();
}, cal.getId())).eq((v0) -> {
@@ -189,15 +189,19 @@
return (Map<String, CurrentShiftInfoDTO>)currentShiftInfoDTOList.stream().distinct().collect(Collectors.toMap(CurrentShiftInfoDTO::getCalendarCode, v -> v));
}
+ /**
+ * 鏋勫缓鐢熶骇鏃ュ巻鍒囩墖缂撳瓨锛屼粠CalendarCacheXxlJob涓畾鏃惰皟鐢�
+ * @param cacheBuildDTO
+ */
public static void build(CacheBuildDTO cacheBuildDTO) {
String key = cacheBuildDTO.getTargetDate().format(DateTimeFormatter.ISO_LOCAL_DATE);
List<TimestampToProductionTimeCacheDto> data = CALENDAR_SERVICE.buildProductionTimeCache(cacheBuildDTO);
if (Func.isNotEmpty(data))
data.forEach(t -> {
- String redisKey = CommonUtil.getReallyCacheName("blade:cps::calendar", "calendars:code:".concat(t.getCalendarCode()).concat(":").concat("minute-point:"), key);
+ String redisKey = CommonUtil.getReallyCacheName("blade:cps::calendar", "calendars:code:".concat(t.getCalendarCode()).concat(":").concat("minute-point:"), key);//key鏍煎紡:yyyy-MM-dd
Map<Integer, CalendarShiftTimeSlicesDTO> timeSlicesDtoMap = t.getTimeSlicesDTOMap();
BLADE_REDIS.getRedisTemplate().opsForHash().putAll(redisKey, timeSlicesDtoMap);
- long oneDaySeconds = 86400L;
+ long oneDaySeconds = 86400L;//24灏忔椂鐨勭鏁�
BLADE_REDIS.expire(redisKey, oneDaySeconds * 40L);
});
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/CommonUtil.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/CommonUtil.java
index dc3d46b..9d4078d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/CommonUtil.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/utils/CommonUtil.java
@@ -28,6 +28,13 @@
return (int) ((size / 0.75d) + 1.0d);
}
+ /**
+ * 鎷兼帴redisKey锛孾cacheName]::[keyPrefix][key]
+ * @param cacheName 缂撳瓨鍚嶇О
+ * @param keyPrefix key鍓嶇紑
+ * @param key 鏈�鏈鐨刱ey
+ * @return
+ */
public static String getReallyCacheName(String cacheName, String keyPrefix, String key) {
return cacheName.concat("::").concat(keyPrefix).concat(key);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
index 4e49404..b233ed2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
@@ -2,7 +2,6 @@
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.core.tool.utils.Func;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/jobHandler/CalendarCacheXxlJob.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/jobHandler/CalendarCacheXxlJob.java
index 461b899..a564572 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/jobHandler/CalendarCacheXxlJob.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/jobHandler/CalendarCacheXxlJob.java
@@ -13,9 +13,10 @@
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.dto.CacheBuildDTO;
import org.springframework.stereotype.Component;
-
+/**
+ * 鐢熶骇鏃ュ巻鍒囩墖缂撳瓨浠诲姟
+ */
@Component
-
public class CalendarCacheXxlJob {
private static final Logger log = LoggerFactory.getLogger(CalendarCacheXxlJob.class);
@@ -26,7 +27,7 @@
targetDate = LocalDate.parse(param, DateTimeFormatter.ofPattern(DateConstant.PATTERN_DATE));
}
XxlJobLogger.log("XXL-JOB, 瀹氭椂鏋勫缓鐢熶骇鏃ュ巻鍒囩墖缂撳瓨,鏋勫缓寮�濮�.....", new Object[0]);
- CacheBuildDTO cacheBuildDTO = CacheBuildDTO.builder().tenantIds(Sets.newHashSet(new String[]{"000000"})).targetDate(targetDate).build();
+ CacheBuildDTO cacheBuildDTO = CacheBuildDTO.builder().tenantIds(Sets.newHashSet(new String[]{"000000"})).targetDate(targetDate).build();//娌℃湁calendarCode?
TimeSliceCache.build(cacheBuildDTO);
XxlJobLogger.log("XXL-JOB, 瀹氭椂鏋勫缓鐢熶骇鏃ュ巻鍒囩墖缂撳瓨,鏋勫缓缁撴潫", new Object[0]);
return ReturnT.SUCCESS;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/dto/TelemetryDataResponseDTO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/dto/TelemetryDataResponseDTO.java
index 5386d52..7c7d9bf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/dto/TelemetryDataResponseDTO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/message/dto/TelemetryDataResponseDTO.java
@@ -2,6 +2,9 @@
import java.io.Serializable;
+/**
+ * 閲囬泦鐨勬暟鎹�
+ */
public class TelemetryDataResponseDTO implements Serializable {
private String v;
private Long t;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/ICalendarService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/ICalendarService.java
index 57ea99d..e33edd3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/ICalendarService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/ICalendarService.java
@@ -44,6 +44,11 @@
ProductionCalendar saveYearCalendar(CalendarSaveVO calendarSaveVO);
+ /**
+ * 鏋勫缓鐢熶骇鏃ュ巻鍒囩墖缂撳瓨瀵硅薄
+ * @param cacheBuildDTO
+ * @return
+ */
List<TimestampToProductionTimeCacheDto> buildProductionTimeCache(CacheBuildDTO cacheBuildDTO);
List<CalendarSimpleVO> getCalendarList(@RequestParam("tenantId") String tenantId);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java
index 6a69eb1..2d80ae7 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/constant/CollectConstant.java
@@ -1,6 +1,9 @@
package com.qianwen.smartman.modules.mdc.constant;
public interface CollectConstant {
+ /**
+ * 閲囬泦鏁版嵁鐨勬渶澶ч暱搴�
+ */
public static final Integer MAX_VALUE = 256;
public static final Integer STRING_DATA_TYPE = 11;
public static final String ALARM = "ALARM";
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/jobHandler/CacheNewCollectXxlJob.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/jobHandler/CacheNewCollectXxlJob.java
index 62142cb..48ae66e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/jobHandler/CacheNewCollectXxlJob.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/jobHandler/CacheNewCollectXxlJob.java
@@ -8,6 +8,9 @@
import com.qianwen.smartman.modules.mdc.service.ICollectDataService;
import org.springframework.stereotype.Component;
+/**
+ * xxljob浠诲姟锛屽悓姝ュ綋鍓嶆椂闂村叏閲忓弬鏁帮紝浠庣紦瀛樺埌new_param_json_[宸ヤ綅id]琛�
+ */
@Component
public class CacheNewCollectXxlJob {
private static final Logger log = LoggerFactory.getLogger(CacheNewCollectXxlJob.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java
index adce897..2684219 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/ISuperNewCollectService.java
@@ -3,5 +3,9 @@
import java.util.Set;
public interface ISuperNewCollectService {
+ /**
+ * 鍚屾褰撳墠鏃堕棿鍏ㄩ噺鍙傛暟
+ * @param workstationIds 宸ヤ綅id闆嗗悎
+ */
void insertData(Set<String> workstationIds);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/CollectDataServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/CollectDataServiceImpl.java
index 9529b59..009ff98 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/CollectDataServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/CollectDataServiceImpl.java
@@ -11,6 +11,9 @@
import com.qianwen.smartman.modules.mdc.service.ISuperNewCollectService;
import org.springframework.stereotype.Service;
+/**
+ * super_collect_data_json琛ㄥ叆搴�
+ */
@Service
public class CollectDataServiceImpl implements ICollectDataService {
private static final Logger log = LoggerFactory.getLogger(CollectDataServiceImpl.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
index f571767..4855bf6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
@@ -23,7 +23,7 @@
public class SuperNewCollectServiceImpl implements ISuperNewCollectService {
private final SuperCollectJsonMapper collectJsonMapper;
private static final Logger log = LoggerFactory.getLogger(SuperNewCollectServiceImpl.class);
- private static final Map<Integer, String> PROCESS_PARAM_MAP = new HashMap();
+ private static final Map<Integer, String> PROCESS_PARAM_MAP = new HashMap<>();
static {
PROCESS_PARAM_MAP.put(1, "STATE");
@@ -39,16 +39,17 @@
this.collectJsonMapper = collectJsonMapper;
}
+
@Override
public void insertData(Set<String> workstationIds) {
List<NewParamSaveDTO> data = workstationIds.stream().map(workstationId -> {
- Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(workstationId);
+ Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(workstationId);//瀹炴椂鏁版嵁锛�
if (Func.isNotEmpty(realTimeData)) {
int size = realTimeData.size();
long time = DateUtil.now().getTime();
Map<String, String> valuesMap = new HashMap<>(size);
realTimeData.forEach((n, telemetry) -> {
- if (!n.toUpperCase().contains(CollectConstant.ALARM)) {
+ if (!n.toUpperCase().contains(CollectConstant.ALARM)) {//鍘婚櫎ALARM鏁版嵁
TelemetryDataResponseDTO dto = (TelemetryDataResponseDTO) telemetry;
String v = dto.getV();
if (Func.isNotEmpty(v) && v.length() <= CollectConstant.MAX_VALUE.intValue() && !v.contains("timestamp")) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
index 728cf06..e2e994f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
@@ -78,7 +78,7 @@
@Resource
private IEmployeeService employeeService;
- /* JADX WARN: Type inference failed for: r0v11, types: [org.springblade.modules.mdc.service.impl.WorkstationFeedbackServiceImpl$1] */
+
@Override
public IPage<WorkstationFeedbackInfoVO> workstationPage(Query query, boolean excludeImmediate) {
final List<WorkstationFeedback> immediateFeedback = this.selfService.getImmediateFeedback();
@@ -88,7 +88,7 @@
IPage<Workstation> page = this.workstationService.page(Condition.getPage(query), Lambda.notIn(excludeImmediate && Func.isNotEmpty(immediateFeedback), (v0) -> {
return v0.getId();
}, workstationList));
- return new BaseEntityWrapper<Workstation, WorkstationFeedbackInfoVO>() { // from class: org.springblade.modules.mdc.service.impl.WorkstationFeedbackServiceImpl.1
+ return new BaseEntityWrapper<Workstation, WorkstationFeedbackInfoVO>() {
public WorkstationFeedbackInfoVO entityVO(Workstation entity) {
WorkstationFeedbackInfoVO vo = new WorkstationFeedbackInfoVO();
vo.setWorkstationId(entity.getId());
diff --git a/smart-man-boot/src/main/resources/application-dev.yml b/smart-man-boot/src/main/resources/application-dev.yml
index 041ba49..648b049 100644
--- a/smart-man-boot/src/main/resources/application-dev.yml
+++ b/smart-man-boot/src/main/resources/application-dev.yml
@@ -45,7 +45,7 @@
# tdengine
tdengine:
driver: com.taosdata.jdbc.TSDBDriver
- url: jdbc:TAOS://116.63.155.153:6030/iot_data?charset=UTF-8&locale=en_US.UTF-8&cfgdir=taos.cfg
+ url: jdbc:TAOS://localhost:6030/iot_data?charset=UTF-8&locale=en_US.UTF-8&cfgdir=taos.cfg
username: root
password: taosdata
diff --git a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.xml b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.xml
index 9781f80..c422fac 100644
--- a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.xml
+++ b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperCollectJsonMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qianwen.smartman.modules.mdc.mapper.SuperCollectJsonMapper">
-
+ <!-- 鎻掑叆閲囬泦鐨勫弬鏁版暟鎹� -->
<insert id="insertValueJson">
insert into
<foreach separator=" " collection="list" item="item" index="index" >
diff --git a/smart-starter-redis/src/main/java/com/qianwen/core/redis/cache/BladeRedis.java b/smart-starter-redis/src/main/java/com/qianwen/core/redis/cache/BladeRedis.java
index 34c122d..397d532 100644
--- a/smart-starter-redis/src/main/java/com/qianwen/core/redis/cache/BladeRedis.java
+++ b/smart-starter-redis/src/main/java/com/qianwen/core/redis/cache/BladeRedis.java
@@ -192,6 +192,12 @@
return this.redisTemplate.move(key, dbIndex);
}
+ /**
+ * 璁剧疆鎸囧畾key鐨勮秴甯傛椂闂�
+ * @param key redisKey
+ * @param seconds 绉掓暟
+ * @return
+ */
public Boolean expire(String key, long seconds) {
return this.redisTemplate.expire(key, seconds, TimeUnit.SECONDS);
}
--
Gitblit v1.9.3