From fbb90c31d56348ec3fcc49af49c66b19992f58df Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 16 五月 2025 17:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 16 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
index 8e3c6ce..51e6618 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -1,43 +1,52 @@
package com.aps.core.service.impl;
-import java.util.List;
-import java.util.Optional;
-
+import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
+import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlatePlanTemp;
import com.aps.core.mapper.ApsPartPlanTempMapper;
+import com.aps.core.mapper.ApsPlatePlanMapper;
import com.aps.core.mapper.ApsPlatePlanTempMapper;
+import com.aps.core.service.IApsPlatePlanService;
import com.aps.system.api.domain.SysDictData;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
-import com.aps.core.mapper.ApsPlatePlanMapper;
-import com.aps.core.domain.ApsPlatePlan;
-import com.aps.core.service.IApsPlatePlanService;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 閽ｉ噾璁″垝绠＄悊Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2025-04-08
*/
@Service
-public class ApsPlatePlanServiceImpl implements IApsPlatePlanService
+public class ApsPlatePlanServiceImpl implements IApsPlatePlanService
{
@Autowired
private ApsPlatePlanMapper apsPlatePlanMapper;
@Autowired
private ApsPartPlanTempMapper apsPartPlanTempMapper;
+
@Autowired
private ApsPlatePlanTempMapper apsPlatePlanTempMapper;
+ @Autowired
+ public RedisTemplate redisTemplate;
+
/**
* 鏌ヨ閽ｉ噾璁″垝绠＄悊
- *
+ *
* @param id 閽ｉ噾璁″垝绠＄悊涓婚敭
* @return 閽ｉ噾璁″垝绠＄悊
*/
@@ -49,7 +58,7 @@
/**
* 鏌ヨ閽ｉ噾璁″垝绠＄悊鍒楄〃
- *
+ *
* @param apsPlatePlan 閽ｉ噾璁″垝绠＄悊
* @return 閽ｉ噾璁″垝绠＄悊
*/
@@ -61,21 +70,21 @@
/**
* 鏂板閽ｉ噾璁″垝绠＄悊
- *
+ *
* @param apsPlatePlan 閽ｉ噾璁″垝绠＄悊
* @return 缁撴灉
*/
@Override
public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
{
- apsPlatePlan.setId(IdUtils.fastUUID());
+ apsPlatePlan.setId(IdUtil.getSnowflakeNextId());
apsPlatePlan.setCreateTime(DateUtils.getNowDate());
return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
}
/**
* 淇敼閽ｉ噾璁″垝绠＄悊
- *
+ *
* @param apsPlatePlan 閽ｉ噾璁″垝绠＄悊
* @return 缁撴灉
*/
@@ -87,7 +96,7 @@
/**
* 鎵归噺鍒犻櫎閽ｉ噾璁″垝绠＄悊
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑閽ｉ噾璁″垝绠＄悊涓婚敭
* @return 缁撴灉
*/
@@ -99,7 +108,7 @@
/**
* 鍒犻櫎閽ｉ噾璁″垝绠＄悊淇℃伅
- *
+ *
* @param id 閽ｉ噾璁″垝绠＄悊涓婚敭
* @return 缁撴灉
*/
@@ -111,6 +120,8 @@
@Override
public int confirmPlan(ApsPlatePlanTemp tempPlan) {
+ //鍏堝垹闄ゆ墍鏈�
+ apsPlatePlanMapper.removeAllPlatePlans();
//鏌ヨ涓存椂琛ㄦ暟鎹�
List<ApsPlatePlanTemp> apsPartPlanTemps=apsPlatePlanTempMapper.selectApsPlatePlanTempList(tempPlan);
int count=0;
@@ -120,7 +131,8 @@
ids[i]=apsPartPlanTemps.get(i).getId();
ApsPlatePlan platePlan=new ApsPlatePlan();
BeanUtils.copyProperties(apsPartPlanTemps.get(i), platePlan);
- platePlan.setId(IdUtils.fastUUID());
+ platePlan.setId(IdUtil.getSnowflakeNextId());
+ platePlan.setCreateTime(DateUtils.getNowDate());
//鎻掑叆姝ｅ紡琛紝骞惰褰�
apsPlatePlanMapper.insertApsPlatePlan(platePlan);
count++;
@@ -178,4 +190,65 @@
return Strings.EMPTY;
}
}
+
+ /**
+ * 閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃
+ * @param apsPlatePlan
+ * @return
+ */
+ @Override
+ public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan) {
+ return apsPlatePlanMapper.selectPlateRedundantOrderList(apsPlatePlan);
+ }
+
+ @Override
+ public ApsPlatePlan selectUnMatchPlateSubPlan(String plant, String itemNumber, Hashtable<String, List<ApsPlatePlan>> subPlans) {
+ if(subPlans.containsKey(itemNumber)) {
+ List<ApsPlatePlan> subPlanList = subPlans.get(itemNumber);
+ Optional<ApsPlatePlan> planOptional = subPlanList.stream().filter(x -> x.getUnmatchedQuantity().compareTo(BigDecimal.ZERO) > 0).findFirst();
+ return planOptional.orElse(null);
+ }else {
+ List<ApsPlatePlan> plans = getSubPlansFromRedis(itemNumber);
+ if (!plans.isEmpty()) {
+ subPlans.put(itemNumber, plans);
+ return selectUnMatchPlateSubPlan(plant, itemNumber, subPlans);
+ } else {
+ return null;
+ }
+ }
+ }
+
+ @Override
+ public boolean setSubPlansToRedis() {
+ try {
+ Set<String> keys = redisTemplate.keys("PLATE_SUB_PLAN:*");
+ if (keys != null && !keys.isEmpty()) {
+ redisTemplate.delete(keys);
+ }
+ List<JSONObject> subPlans = apsPlatePlanMapper.selectApsSubPlatePlan();
+// ApsPlatePlan a = JSONObject.parseObject(String.valueOf(subPlans.get(0)), ApsPlatePlan.class);
+ Map<String, List<JSONObject>> groupByItemNumber = subPlans.stream().collect(Collectors.groupingBy(obj -> obj.getString("itemNumber")));
+ Map<String, Object> bulkData = new HashMap<>();
+ for (Map.Entry<String, List<JSONObject>> entry : groupByItemNumber.entrySet()) {
+ String key = entry.getKey();
+ List<JSONObject> value = entry.getValue();
+ bulkData.put("PLATE_SUB_PLAN:"+key, value);
+ }
+ redisTemplate.opsForValue().multiSet(bulkData);
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+
+ public List<ApsPlatePlan> getSubPlansFromRedis(String itemNumber) {
+ List<ApsPlatePlan> subPlans=new ArrayList<>();
+ JSONArray jsonArray =(JSONArray) redisTemplate.opsForValue().get("PLATE_SUB_PLAN:" + itemNumber);
+ if (jsonArray != null && !jsonArray.isEmpty()) {
+ subPlans = jsonArray.stream().map(obj -> JSONObject.parseObject(String.valueOf(obj), ApsPlatePlan.class)).toList();
+ subPlans.forEach(subPlan -> subPlan.setVersion(0));
+ }
+ return subPlans;
+ }
}
--
Gitblit v1.9.3