From adb589891e12a843601fdbd848bb8a6c107ec3b1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 11:06:50 +0800
Subject: [PATCH] 合并下发生产计划
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 375 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 252 insertions(+), 123 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index 9911a70..595db7e 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -3,12 +3,16 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.pojo.Product;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.config.AliDingConfig;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.mapper.ProductionPlanMapper;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
@@ -18,14 +22,17 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
/**
* <br>
@@ -46,6 +53,14 @@
@Autowired
private ProductionPlanMapper productionPlanMapper;
+
+ @Autowired
+ private ProductOrderService productOrderService;
+
+ /**
+ * 鍚屾閿侊紝纭繚鎵嬪姩鍜屽畾鏃朵换鍔′笉鍚屾椂鎵ц
+ */
+ private final ReentrantLock syncLock = new ReentrantLock();
@Override
public IPage<ProductionPlanDto> listPage(Page page, ProductionPlanDto productionPlanDto) {
@@ -69,150 +84,264 @@
}
/**
+ * 鍚堝苟鐢熶骇璁″垝
+ */
+ @Override
+ public boolean combine(ProductionPlanDto productionPlanDto) {
+ if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ return false;
+ }
+
+ // 鏌ヨ涓荤敓浜ц鍒�
+ List<ProductionPlan> plans = productionPlanMapper.selectBatchIds(productionPlanDto.getIds());
+
+ // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
+ String firstProductName = plans.get(0).getProductName();
+ if (plans.stream().anyMatch(p -> !p.getProductName().equals(firstProductName))) {
+ log.warn("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
+ return false;
+ }
+
+ // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
+ String firstProductSpec = plans.get(0).getProductSpec();
+ if (plans.stream().anyMatch(p -> !p.getProductSpec().equals(firstProductSpec))) {
+ log.warn("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
+ return false;
+ }
+
+
+ // 鍙犲姞鏂规暟
+ BigDecimal totalVolume = plans.stream()
+ .map(ProductionPlan::getVolume)
+ .filter(v -> v != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ // 鍒涘缓鐢熶骇璁㈠崟
+ ProductOrder productOrder = new ProductOrder();
+ // 鍚堝苟鐢熶骇璁″垝ids
+ String combineIds = StringUtils.join(productionPlanDto.getIds(), ",");
+ productOrder.setCombineProductionPlanIds(combineIds);
+ // 涓嬪彂鏁伴噺
+ productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
+ productOrderService.addProductOrder(productOrder);
+
+ return true;
+ }
+
+ /**
* 鍚屾鏁版嵁
*/
@Transactional(rollbackFor = Exception.class)
public void syncProdData(Integer dataSyncType) {
+ if (!syncLock.tryLock()) {
+ log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩" : "瀹氭椂浠诲姟");
+ return;
+ }
+
try {
- // 鑾峰彇AccessToken
- String params = "appkey=" + aliDingConfig.getAppKey()
- + "&appsecret=" + aliDingConfig.getAppSecret();
-
- String tokenRes = HttpUtils.sendGet(aliDingConfig.getAccessTokenUrl(), params);
-
- JSONObject tokenObj = JSON.parseObject(tokenRes);
-
- String accessToken = tokenObj.getString("access_token");
+ // 鑾峰彇 AccessToken
+ String accessToken = getAccessToken();
if (StringUtils.isEmpty(accessToken)) {
- log.error("鑾峰彇閽夐拤AccessToken澶辫触: {}", tokenRes);
return;
}
- log.info("鑾峰彇AccessToken鎴愬姛: {}", accessToken);
+ // 鑾峰彇鏈湴鏈�鍚庡悓姝ユ椂闂�
+ LocalDateTime lastSyncTime = getLastSyncTime();
+ log.info("寮�濮嬪閲忓悓姝ワ紝鏈湴鏈�鍚庝慨鏀规椂闂�: {}", lastSyncTime);
- // 鏌ヨ琛ㄥ崟鏁版嵁
- JSONObject searchParam = new JSONObject();
- searchParam.put("appType", aliDingConfig.getAppType());
- searchParam.put("systemToken", aliDingConfig.getSystemToken());
- searchParam.put("userId", aliDingConfig.getUserId());
- searchParam.put("formUuid", aliDingConfig.getFormUuid());
+ int pageNumber = 1;
+ int pageSize = 50;
+ boolean hasMore = true;
+ int totalSynced = 0;
- String dataRes = HttpUtils.sendPostJson(
- aliDingConfig.getSearchFormDataUrl(),
- searchParam.toJSONString(),
- StandardCharsets.UTF_8.name(),
- null,
- accessToken
- );
+ while (hasMore) {
+ // 鏌ヨ鍙傛暟
+ JSONObject searchParam = buildSearchParam(lastSyncTime, pageNumber, pageSize);
- if (StringUtils.isEmpty(dataRes)) {
- log.error("鎷夊彇瀹滄惌鏁版嵁涓虹┖");
- return;
- }
+ // 璋冪敤瀹滄惌鎺ュ彛鎷夊彇鏁版嵁
+ String dataRes = HttpUtils.sendPostJson(
+ aliDingConfig.getSearchFormDataUrl(),
+ searchParam.toJSONString(),
+ StandardCharsets.UTF_8.name(),
+ null,
+ accessToken
+ );
- JSONObject resultObj = JSON.parseObject(dataRes);
- JSONArray dataArr = resultObj.getJSONArray("data");
-
- if (dataArr == null || dataArr.isEmpty()) {
- log.warn("娌℃湁鑾峰彇鍒拌〃鍗曟暟鎹�");
- return;
- }
-
- List<ProductionPlan> list = new ArrayList<>();
-
- // 瑙ｆ瀽琛ㄥ崟
- for (int i = 0; i < dataArr.size(); i++) {
-
- JSONObject item = dataArr.getJSONObject(i);
-
- String formInstanceId = item.getString("formInstanceId");
- String serialNo = item.getString("serialNo");
- // 鍙戣捣浜�
- JSONObject originator = item.getJSONObject("originator");
- String originatorName = originator.getJSONObject("userName").getString("nameInChinese");
-
- JSONObject formData = item.getJSONObject("formData");
- // 鏄庣粏琛�
- JSONArray tableArr = formData.getJSONArray("tableField_l7fytfcn");
- if (tableArr == null || tableArr.isEmpty()) {
- continue;
+ if (StringUtils.isEmpty(dataRes)) {
+ log.warn("绗� {} 椤垫媺鍙栨暟鎹负绌�", pageNumber);
+ break;
}
- // 瑙ｆ瀽鏄庣粏
- for (int j = 0; j < tableArr.size(); j++) {
- JSONObject row = tableArr.getJSONObject(j);
- ProductionPlan plan = new ProductionPlan();
+ JSONObject resultObj = JSON.parseObject(dataRes);
+ JSONArray dataArr = resultObj.getJSONArray("data");
+ Integer totalCount = resultObj.getInteger("totalCount");
- // 琛ㄥ崟淇℃伅
- plan.setFormInstanceId(formInstanceId);
- plan.setSerialNo(serialNo);
-
- // 琛ㄥご瀛楁
- plan.setApplyNo(formData.getString("textField_l7fytfco"));
- plan.setCustomerName(formData.getString("textField_lbkozohg"));
-
- // 鏄庣粏瀛楁
- plan.setMaterialCode(row.getString("textField_l9xo62q5"));
- plan.setProductName(row.getString("textField_l9xo62q7"));
- plan.setProductSpec(row.getString("textField_l9xo62q8"));
- plan.setLength(row.getInteger("numberField_lb7lgatg_value"));
- plan.setWidth(row.getInteger("numberField_lb7lgath_value"));
- plan.setHeight(row.getInteger("numberField_lb7lgati_value"));
- plan.setQuantity(row.getInteger("numberField_lb7lgatj_value"));
- plan.setVolume(row.getBigDecimal("numberField_l7fytfd3_value"));
- plan.setStrength(row.getString("radioField_m9urarr2_id"));
-
- // 鏃ユ湡鍖洪棿
- JSONArray dateArr = row.getJSONArray("cascadeDateField_lfxqqluw");
-
- if (dateArr != null && dateArr.size() == 2) {
- long start = Long.parseLong(dateArr.getString(0));
- long end = Long.parseLong(dateArr.getString(1));
-
- plan.setStartDate(Instant.ofEpochMilli(start)
- .atZone(ZoneId.systemDefault())
- .toLocalDateTime());
-
- plan.setEndDate(Instant.ofEpochMilli(end)
- .atZone(ZoneId.systemDefault())
- .toLocalDateTime());
- }
-
- // 鎻愪氦浜�
- plan.setSubmitter(originatorName);
- // 缁勭粐
- plan.setSubmitOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
- // 澶囨敞
- plan.setRemarkOne(formData.getString("textareaField_l7fytfcy"));
- plan.setRemarkTwo(formData.getString("textField_l7fytfcx"));
- // 鍒涘缓浜�
- plan.setCreatorName(originatorName);
- // 淇敼浜�
- JSONObject modifyUser = item.getJSONObject("modifyUser");
- if (modifyUser != null) {
- plan.setModifierName(modifyUser.getJSONObject("userName").getString("nameInChinese"));
- }
- // 琛ㄥ崟鏃堕棿
- plan.setFormCreatedTime(parseUtcTime(item.getString("createdTimeGMT")));
- plan.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
- // 鍚屾淇℃伅
- plan.setDataSyncType(dataSyncType);
- plan.setDataSourceType(1);
- // 鏁版嵁搴撴椂闂�
- LocalDateTime now = LocalDateTime.now();
- plan.setCreateTime(now);
- plan.setUpdateTime(now);
-
- list.add(plan);
+ if (dataArr == null || dataArr.isEmpty()) {
+ log.info("娌℃湁鏇村鏂版暟鎹渶瑕佸悓姝�");
+ break;
}
+
+ // 瑙ｆ瀽骞朵繚瀛樻暟鎹�
+ List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, totalCount);
+ if (!list.isEmpty()) {
+ // 澶勭悊鏇存柊鎴栨柊澧�
+ processSaveOrUpdate(list);
+ totalSynced += list.size();
+ }
+
+ // 鍒ゆ柇鏄惁杩樻湁涓嬩竴椤�
+ hasMore = (pageNumber * pageSize) < totalCount;
+ pageNumber++;
+
+ log.info("姝ｅ湪鍚屾绗� {} 椤碉紝褰撳墠宸插悓姝� {}/{}", pageNumber - 1, totalSynced, totalCount);
}
- if (!list.isEmpty()) {
- saveBatch(list);
- }
- log.info("鐢熶骇璁″垝鍚屾瀹屾垚锛屽叡 {} 鏉�", list.size());
+ log.info("鏁版嵁鍚屾瀹屾垚锛屽叡鍚屾 {} 鏉℃暟鎹�", totalSynced);
} catch (Exception e) {
log.error("鍚屾鐢熶骇璁″垝寮傚父", e);
+ } finally {
+ // 閲婃斁閿�
+ syncLock.unlock();
+ }
+ }
+
+ private String getAccessToken() {
+ String params = "appkey=" + aliDingConfig.getAppKey()
+ + "&appsecret=" + aliDingConfig.getAppSecret();
+ String tokenRes = HttpUtils.sendGet(aliDingConfig.getAccessTokenUrl(), params);
+ JSONObject tokenObj = JSON.parseObject(tokenRes);
+ String accessToken = tokenObj.getString("access_token");
+ if (StringUtils.isEmpty(accessToken)) {
+ log.error("鑾峰彇閽夐拤AccessToken澶辫触: {}", tokenRes);
+ }
+ return accessToken;
+ }
+
+ private LocalDateTime getLastSyncTime() {
+ // 鏌ヨ鏈湴鏁版嵁搴撲腑 formModifiedTime 鏈�澶х殑璁板綍
+ LambdaQueryWrapper<ProductionPlan> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.orderByDesc(ProductionPlan::getFormModifiedTime).last("LIMIT 1");
+ ProductionPlan lastRecord = this.getOne(queryWrapper);
+ return lastRecord != null ? lastRecord.getFormModifiedTime() : null;
+ }
+
+ private JSONObject buildSearchParam(LocalDateTime lastSyncTime, int pageNumber, int pageSize) {
+ JSONObject searchParam = new JSONObject();
+ searchParam.put("appType", aliDingConfig.getAppType());
+ searchParam.put("systemToken", aliDingConfig.getSystemToken());
+ searchParam.put("userId", aliDingConfig.getUserId());
+ searchParam.put("formUuid", aliDingConfig.getFormUuid());
+ searchParam.put("pageSize", pageSize);
+ searchParam.put("pageNumber", pageNumber);
+
+ // 榛樿鎸変慨鏀规椂闂村崌搴忔帓搴忥紝纭繚鍒嗛〉鎷夊彇鏁版嵁鐨勮繛缁��
+ // "+" 琛ㄧず鍗囧簭锛�"gmt_modified" 鏄畼鏂瑰唴缃瓧娈�
+ searchParam.put("orderConfigJson", "{\"gmt_modified\":\"+\"}");
+
+ // 璁剧疆淇敼鏃堕棿绛涢�夊尯闂� (鏍煎紡蹇呴』涓簓yyy-MM-dd HH:mm:ss)
+ if (lastSyncTime != null) {
+ // 璧峰鏃堕棿锛氫笂娆″悓姝ュ埌鐨勬渶鍚庝竴鏉℃暟鎹殑淇敼鏃堕棿
+ String startTime = lastSyncTime.plusSeconds(1).atZone(ZoneId.systemDefault())
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ searchParam.put("modifiedFromTimeGMT", startTime);
+ }
+
+ // 鎴鏃堕棿锛氬綋鍓嶆椂闂达紝纭繚鑾峰彇鏈�鏂扮殑宸蹭慨鏀�/宸叉柊澧炴暟鎹�
+ String endTime = LocalDateTime.now().atZone(ZoneId.systemDefault())
+ .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ searchParam.put("modifiedToTimeGMT", endTime);
+
+ return searchParam;
+ }
+
+ private List<ProductionPlan> parseProductionPlans(JSONArray dataArr, Integer dataSyncType, Integer totalCount) {
+ List<ProductionPlan> list = new ArrayList<>();
+ LocalDateTime now = LocalDateTime.now();
+
+ for (int i = 0; i < dataArr.size(); i++) {
+ JSONObject item = dataArr.getJSONObject(i);
+ String formInstanceId = item.getString("formInstanceId");
+ String serialNo = item.getString("serialNo");
+
+ JSONObject originator = item.getJSONObject("originator");
+ String originatorName = originator != null && originator.containsKey("userName")
+ ? originator.getJSONObject("userName").getString("nameInChinese") : "鏈煡";
+
+ JSONObject formData = item.getJSONObject("formData");
+ JSONArray tableArr = formData.getJSONArray("tableField_l7fytfcn");
+ if (tableArr == null || tableArr.isEmpty()) {
+ continue;
+ }
+
+ for (int j = 0; j < tableArr.size(); j++) {
+ JSONObject row = tableArr.getJSONObject(j);
+ ProductionPlan plan = new ProductionPlan();
+
+ plan.setFormInstanceId(formInstanceId);
+ plan.setSerialNo(serialNo);
+ plan.setApplyNo(formData.getString("textField_l7fytfco"));
+ plan.setCustomerName(formData.getString("textField_lbkozohg"));
+
+ plan.setMaterialCode(row.getString("textField_l9xo62q5"));
+ plan.setProductName(row.getString("textField_l9xo62q7"));
+ plan.setProductSpec(row.getString("textField_l9xo62q8"));
+ plan.setLength(row.getInteger("numberField_lb7lgatg_value"));
+ plan.setWidth(row.getInteger("numberField_lb7lgath_value"));
+ plan.setHeight(row.getInteger("numberField_lb7lgati_value"));
+ plan.setQuantity(row.getInteger("numberField_lb7lgatj_value"));
+ plan.setVolume(row.getBigDecimal("numberField_l7fytfd3_value"));
+ plan.setStrength(row.getString("radioField_m9urarr2_id"));
+
+ JSONArray dateArr = row.getJSONArray("cascadeDateField_lfxqqluw");
+ if (dateArr != null && dateArr.size() == 2) {
+ try {
+ long start = Long.parseLong(dateArr.getString(0));
+ long end = Long.parseLong(dateArr.getString(1));
+ plan.setStartDate(Instant.ofEpochMilli(start).atZone(ZoneId.systemDefault()).toLocalDateTime());
+ plan.setEndDate(Instant.ofEpochMilli(end).atZone(ZoneId.systemDefault()).toLocalDateTime());
+ } catch (Exception e) {
+ log.warn("瑙ｆ瀽鏃ユ湡澶辫触: {}", dateArr);
+ }
+ }
+
+ plan.setSubmitter(originatorName);
+ plan.setSubmitOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
+ plan.setRemarkOne(formData.getString("textareaField_l7fytfcy"));
+ plan.setRemarkTwo(formData.getString("textField_l7fytfcx"));
+ plan.setCreatorName(originatorName);
+
+ JSONObject modifyUser = item.getJSONObject("modifyUser");
+ if (modifyUser != null && modifyUser.containsKey("userName")) {
+ plan.setModifierName(modifyUser.getJSONObject("userName").getString("nameInChinese"));
+ }
+
+ plan.setFormCreatedTime(parseUtcTime(item.getString("createdTimeGMT")));
+ plan.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
+ plan.setDataSyncType(dataSyncType);
+ plan.setDataSourceType(1);
+ plan.setCreateTime(now);
+ plan.setUpdateTime(now);
+ plan.setTotalCount(totalCount);
+
+ list.add(plan);
+ }
+ }
+ return list;
+ }
+
+ private void processSaveOrUpdate(List<ProductionPlan> list) {
+ for (ProductionPlan plan : list) {
+ LambdaQueryWrapper<ProductionPlan> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductionPlan::getFormInstanceId, plan.getFormInstanceId())
+ .eq(ProductionPlan::getMaterialCode, plan.getMaterialCode());
+ ProductionPlan existing = this.getOne(queryWrapper);
+ if (existing != null) {
+ plan.setId(existing.getId());
+ this.updateById(plan);
+ } else {
+ this.save(plan);
+ }
}
}
--
Gitblit v1.9.3