From 4d9364da736f322cfeeec2815e83f2a3f6534223 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/utils/JackSonUtil.java | 2 +
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java | 30 +++++++-------
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 6 +-
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 2
framework/src/main/java/com/yuanchu/mom/utils/RedisUtil.java | 9 ++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 6 +-
inspect-server/pom.xml | 5 ++
performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java | 56 ++++++++++++++++++++++++++++
8 files changed, 94 insertions(+), 22 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/JackSonUtil.java b/framework/src/main/java/com/yuanchu/mom/utils/JackSonUtil.java
index 27ce635..fcaedbe 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/JackSonUtil.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/JackSonUtil.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.stereotype.Component;
import java.io.File;
@@ -104,6 +105,7 @@
*/
public static <T> T unmarshal(String str, Class<T> valueType) throws Exception {
try {
+ OBJECT_MAPPER.registerModule(new JavaTimeModule());
return OBJECT_MAPPER.readValue(str, valueType);
} catch (JsonParseException e) {
throw new Exception(e);
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/RedisUtil.java b/framework/src/main/java/com/yuanchu/mom/utils/RedisUtil.java
index 00206d3..bdbb997 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/RedisUtil.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/RedisUtil.java
@@ -112,6 +112,15 @@
}
/**
+ * 妯＄硦鍖归厤鍒犻櫎澶氫釜缂撳瓨
+ * @param key 鍙互浼犱竴涓�� 鎴栧涓�
+ */
+ public static void delsLike(String key) {
+ Set<String> keys = redisTemplate.keys(key);
+ redisTemplate.delete(keys);
+ }
+
+ /**
* 鑾峰彇骞跺垹闄ょ紦瀛�
* @param key 閿�
* @return 鍊�
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
index d39376a..cc9a3e0 100644
--- a/inspect-server/pom.xml
+++ b/inspect-server/pom.xml
@@ -70,5 +70,10 @@
<artifactId>performance-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>2.13.0</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
index c7cf7fb..df0c1ae 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
@@ -14,25 +14,25 @@
@ValueTableShow(name = "鏍峰搧缂栧彿")
private String sampleCode;
- @ValueTableShow(value = 2, name = "鏍峰搧鍚嶇О")
+ @ValueTableShow(value = 1, name = "鏍峰搧鍚嶇О")
private String sample;
- @ValueTableShow(value = 4, name = "鏍峰搧鍨嬪彿")
+ @ValueTableShow(value = 2, name = "妫�楠岄」")
+ private String inspectionItem;
+
+ @ValueTableShow(value = 3, name = "妫�楠屽瓙椤�")
+ private String inspectionItemSubclass;
+
+ @ValueTableShow(value = 4, name = "鍗曚綅")
+ private String unit;
+
+ @ValueTableShow(value = 5, name = "鏍峰搧鍨嬪彿")
private String model;
// @ValueTableShow(value = 5, name = "鏍峰搧鐘舵��")
private Integer insState;
- @ValueTableShow(value = 15, name = "鍗曚綅")
- private String unit;
-
- @ValueTableShow(value = 7, name = "妫�楠岄」")
- private String inspectionItem;
-
- @ValueTableShow(value = 8, name = "妫�楠屽瓙椤�")
- private String inspectionItemSubclass;
-
- @ValueTableShow(value = 17, name = "瀹為獙瀹�")
+// @ValueTableShow(value = 17, name = "瀹為獙瀹�")
private String sonLaboratory;
private String inspectionItemType;
@@ -40,13 +40,13 @@
// @ValueTableShow(value = 11, name = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ValueTableShow(value = 12, name = "瑕佹眰鍊�")
+ @ValueTableShow(value = 12, name = "璇曢獙瑕佹眰")
private String ask;
- @ValueTableShow(value = 13, name = "鏈�缁堝��")
+ @ValueTableShow(value = 13, name = "妫�楠岀粨鏋�")
private String lastValue;
- @ValueTableShow(value = 14, name = "鏄惁鍚堟牸")
+ @ValueTableShow(value = 14, name = "缁撴灉鍒ゅ畾")
private Integer insResult;
private String equipValue;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index 94ff3c9..c57bf45 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -44,7 +44,7 @@
*/
@ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("濮旀墭浜�")
+ @ApiModelProperty("鍒跺崟浜�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
@@ -118,7 +118,7 @@
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String otcCode;
- @ValueTableShow(11)
+// @ValueTableShow(11)
@ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -203,7 +203,7 @@
private Long companyId;
- @ValueTableShow(value = 15, name = "鍒跺崟浜�")
+ @ValueTableShow(value = 15, name = "濮旀墭浜�")
private String prepareUser;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 11b1b15..b7c7873 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -3477,7 +3477,7 @@
}
@Override
- public int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode) {
+ public int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
@@ -3567,8 +3567,8 @@
return null;
});
// 鍒犻櫎鏁伴噰閲囬泦娆℃暟
- String key = "frequency" + ":" + entrustCode + ":" + sampleCode;
- RedisUtil.del(key);
+ String key = "frequency" + ":" + entrustCode + ":*";
+ RedisUtil.delsLike(key);
return 1;
}
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
index 0831c44..5006210 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
@@ -6,8 +6,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
+import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.pojo.PerformanceShift;
+import com.yuanchu.mom.service.EnumService;
import com.yuanchu.mom.service.PerformanceShiftService;
+import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.StyleMonthUtils;
import com.yuanchu.mom.utils.StyleYearUtils;
import com.yuanchu.mom.vo.Result;
@@ -16,11 +19,19 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.TemporalAdjusters;
+import java.time.temporal.WeekFields;
import java.util.Collection;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -99,4 +110,49 @@
.doWrite((Collection<?>) data.get("data"));
}
}
+
+ @Resource
+ private EnumService enumService;
+
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "涓存椂鎺ュ彛-娣诲姞7鏈堜唤8鏈堜唤鐨勬暟鎹�")
+ @GetMapping("temporaryInterface")
+ public void temporaryInterface() {
+ System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
+ // TODO 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
+ PerformanceShiftAddDto performanceShiftAddDto = new PerformanceShiftAddDto();
+ //鐝--鏃�(鏌ヨ瀛楀吀)
+ List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
+ List<String> collect = shiftType.stream().filter(enums -> enums.getLabel().equals("鏃�")).map(enums -> enums.getValue()).collect(Collectors.toList());
+ performanceShiftAddDto.setShift(collect.get(0));
+ //浜哄憳--鎵�鏈変汉
+ String userIds = userService.getDeviceManager().stream().map(user -> user.getId().toString()).distinct().collect(Collectors.joining(","));
+ performanceShiftAddDto.setUserId(userIds);
+ //鍛ㄦ--褰撴湀鎵�鏈�
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate today = LocalDate.of(2024, 8, 15);
+ // 鑾峰彇鏈湀鐨勭涓�澶╁拰鏈�鍚庝竴澶�
+ LocalDate firstDayOfMonth = today.with(TemporalAdjusters.firstDayOfMonth());
+ LocalDate lastDayOfMonth = today.with(TemporalAdjusters.lastDayOfMonth());
+ // 鑾峰彇鍛ㄥ瓧娈典俊鎭紙鏍规嵁鍖哄煙璁剧疆锛�
+ WeekFields weekFields = WeekFields.of(Locale.getDefault());
+ // 鑾峰彇鏈湀绗竴澶╃殑鍛ㄤ竴
+ LocalDate startOfWeek = firstDayOfMonth.with(TemporalAdjusters.previousOrSame(weekFields.getFirstDayOfWeek()));
+ // 閬嶅巻鏈湀鎵�鏈夊ぉ鏁帮紝鎵惧嚭姣忓懆鐨勭涓�澶╁拰鏈�鍚庝竴澶�
+ LocalDate endOfWeek;
+ while (startOfWeek.isBefore(firstDayOfMonth.plusMonths(1))) {
+ endOfWeek = startOfWeek.plusDays(6);
+ LocalDateTime startDateTime = LocalDateTime.of(startOfWeek, LocalTime.MIDNIGHT);
+ LocalDateTime endDateTime = LocalDateTime.of(endOfWeek, LocalTime.MIDNIGHT);
+ System.out.println("Week starts on " + startDateTime + " and ends on " + endDateTime);
+ performanceShiftAddDto.setStartWeek(startDateTime);
+ performanceShiftAddDto.setEndWeek(endDateTime);
+ performanceShiftService.performanceShiftAdd(performanceShiftAddDto);
+ startOfWeek = startOfWeek.plusWeeks(1);
+ }
+
+ System.out.println("鎺掔彮缁撴潫======end");
+ }
}
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 4324a38..ac10624 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -14,7 +14,7 @@
if(u2.department is not null and u2.department != '', CONCAT(u2.name, '锛�', u2.department, '锛�'), u2.name) name,
GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shift_time, u2.id user_id
FROM performance_shift s
- LEFT JOIN (SELECT u.* from
+ LEFT JOIN (SELECT distinct u.* from
user u
left join department_lims dl on FIND_IN_SET(dl.id,u.depart_lims_id)
where state=1
--
Gitblit v1.9.3