From f3cf05b74840f57f632af858ee27aab1d937cab8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 14 三月 2026 11:47:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java | 264 ++++++++++++++++++++++++++--------------------------
1 files changed, 130 insertions(+), 134 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
index 6446f4e..678cfd2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.production.service.impl;
-import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,8 +7,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.config.AliDingConfig;
+import com.ruoyi.framework.util.AliDingUtils;
import com.ruoyi.production.dto.ProductMaterialDto;
import com.ruoyi.production.dto.ProductMaterialGroupDto;
import com.ruoyi.production.enums.MaterialConfigTypeEnum;
@@ -25,13 +24,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.nio.charset.StandardCharsets;
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.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -58,15 +55,9 @@
private ProductMaterialSkuService productMaterialSkuService;
/**
- * 鍚屾閿�
+ * 鍚屾閿侊紝闃叉鎵嬪姩鍜屽畾鏃朵换鍔″悓鏃舵墽琛�
*/
private final ReentrantLock syncLock = new ReentrantLock();
-
- /**
- * config缂撳瓨
- */
- private final Map<String, Integer> configCache = new HashMap<>();
-
@Override
@Transactional(rollbackFor = Exception.class)
@@ -81,143 +72,186 @@
}
/**
- * 鍚屾鐗╂枡鏁版嵁
+ * 鍚屾鏁版嵁
*/
@Transactional(rollbackFor = Exception.class)
- public void syncProductMaterialData(Integer syncType) {
+ public void syncProductMaterialData(Integer dataSyncType) {
if (!syncLock.tryLock()) {
- log.warn("鍚屾浠诲姟姝ｅ湪鎵ц锛屾湰娆¤姹傝烦杩�");
+ log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩" : "瀹氭椂浠诲姟");
return;
}
+
try {
- String accessToken = getAccessToken();
- if (StringUtils.isEmpty(accessToken)) {
+
+
+ JSONArray searchConditions = new JSONArray();
+ JSONObject statusCondition = new JSONObject();
+ statusCondition.put("key", "processInstanceStatus");
+ JSONArray statusValueArray = new JSONArray();
+ statusValueArray.add("COMPLETED");
+ statusCondition.put("value", statusValueArray);
+ statusCondition.put("type", "ARRAY");
+ statusCondition.put("operator", "in");
+ statusCondition.put("componentName", "SelectField");
+ searchConditions.add(statusCondition);
+
+ JSONObject resultCondition = new JSONObject();
+ resultCondition.put("key", "processApprovedResult");
+ JSONArray resultValueArray = new JSONArray();
+ resultValueArray.add("agree");
+ resultCondition.put("value", resultValueArray);
+ resultCondition.put("type", "ARRAY");
+ resultCondition.put("operator", "in");
+ resultCondition.put("componentName", "SelectField");
+ searchConditions.add(resultCondition);
+
+ String searchFieldJson = searchConditions.toJSONString();
+
+ JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getMaterialCodeFormUuid(), searchFieldJson, productMaterialSkuService, ProductMaterialSku::getFormModifiedTime);
+
+ if (dataArr.isEmpty()) {
+ log.info("娌℃湁鏇村鏂版暟鎹渶瑕佸悓姝�");
return;
}
- LocalDateTime lastSyncTime = getLastSyncTime();
- log.info("寮�濮嬪悓姝ョ墿鏂欙紝鏈湴鏈�鍚庢椂闂� {}", lastSyncTime);
- int page = 1;
- int size = 50;
- boolean hasMore = true;
- int total = 0;
-
- while (hasMore) {
- JSONObject param = buildSearchParam(lastSyncTime, page, size);
- String res = HttpUtils.sendPostJson(
- aliDingConfig.getSearchFormDataUrl(),
- param.toJSONString(),
- StandardCharsets.UTF_8.name(),
- null,
- accessToken
- );
-
- JSONObject result = JSON.parseObject(res);
- JSONArray dataArr = result.getJSONArray("data");
- Integer totalCount = result.getInteger("totalCount");
- if (CollectionUtils.isEmpty(dataArr)) {
- break;
- }
- List<ProductMaterialSku> list = parseProductMaterials(dataArr);
+ // 瑙ｆ瀽骞朵繚瀛樻暟鎹�
+ List<ProductMaterialSku> list = parseProductMaterials(dataArr, dataArr.size());
+ if (!list.isEmpty()) {
+ // 澶勭悊鏇存柊鎴栨柊澧�
int affected = processSaveOrUpdate(list);
- total += affected;
- hasMore = page * size < totalCount;
- page++;
- log.info("鍚屾杩涘害 {} / {}", total, totalCount);
+ log.info("鐗╂枡鏁版嵁鍚屾瀹屾垚锛屽叡鍚屾 {} 鏉℃暟鎹�", affected);
}
- log.info("鐗╂枡鍚屾瀹屾垚 鍏� {} 鏉�", total);
+
} catch (Exception e) {
- log.error("鍚屾寮傚父", e);
+ log.error("鍚屾鐗╂枡缂栫爜寮傚父", e);
} finally {
+ // 閲婃斁閿�
syncLock.unlock();
}
}
- private List<ProductMaterialSku> parseProductMaterials(JSONArray arr) {
+ private List<ProductMaterialSku> parseProductMaterials(JSONArray dataArr, Integer totalCount) {
List<ProductMaterialSku> list = new ArrayList<>();
LocalDateTime now = LocalDateTime.now();
- for (int i = 0; i < arr.size(); i++) {
- JSONObject item = arr.getJSONObject(i);
- JSONObject formData = item.getJSONObject("formData");
- String materialName = formData.getString("textField_l92f36f5");
+ for (int i = 0; i < dataArr.size(); i++) {
+ JSONObject item = dataArr.getJSONObject(i);
+ String formInstanceId = item.getString("formInstanceId");
+
+ JSONObject originator = item.getJSONObject("originator");
+ String originatorName = originator != null && originator.containsKey("userName") ? originator.getJSONObject("userName").getString("nameInChinese") : "鏈煡";
+ JSONObject formData = item.getJSONObject("formData");
+ // 澶勭悊鐗╂枡涓昏〃鏁版嵁
ProductMaterial material = new ProductMaterial();
- material.setMaterialName(materialName);
+ material.setMaterialName(formData.getString("textField_l92f36f5"));
material.setBaseUnit(formData.getString("textField_la147lnw"));
- String type = formData.getString("selectField_l92f36fb");
- String inventory = formData.getString("selectField_la154noy");
- material.setMaterialTypeId(getOrCreateConfigId(type, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
- material.setInventoryCategoryId(getOrCreateConfigId(inventory, MaterialConfigTypeEnum.INVENTORY_CAT.name()));
+ material.setRemark(formData.getString("textareaField_l92f36f9"));
+
+ String materialType = formData.getString("selectField_l92f36fb");
+ String inventoryCat = formData.getString("selectField_la154noy");
+ material.setMaterialTypeId(getOrCreateConfigId(materialType, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
+ material.setInventoryCategoryId(getOrCreateConfigId(inventoryCat, MaterialConfigTypeEnum.INVENTORY_CAT.name()));
+
Long materialId = getOrCreateMaterial(material);
+
+ // 澶勭悊鐗╂枡瑙勬牸鏁版嵁
ProductMaterialSku sku = new ProductMaterialSku();
sku.setMaterialId(materialId);
+ sku.setFormInstanceId(formInstanceId);
+ sku.setIdentifierCode(formData.getString("textField_l92h77ju"));
sku.setMaterialCode(formData.getString("textField_l92f36f2"));
sku.setSpecification(formData.getString("textField_l92f36f6"));
- sku.setIdentifierCode(formData.getString("textField_l92h77ju"));
- sku.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
+ sku.setSupplyType(formData.getString("selectField_la14k51j"));
+ sku.setOriginatorName(originatorName);
+ sku.setOriginatorOrg("瀹佸涓垱缁胯兘瀹炰笟闆嗗洟鏈夐檺鍏徃");
+ sku.setFormModifiedTime(AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT")));
sku.setCreateTime(now);
sku.setUpdateTime(now);
+
list.add(sku);
}
return list;
}
private Long getOrCreateMaterial(ProductMaterial material) {
- ProductMaterial exist = this.getOne(
- new LambdaQueryWrapper<ProductMaterial>()
- .eq(ProductMaterial::getMaterialName, material.getMaterialName())
- );
+ LambdaQueryWrapper<ProductMaterial> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProductMaterial::getMaterialName, material.getMaterialName());
+
+ ProductMaterial exist = this.getOne(queryWrapper);
if (exist == null) {
material.setCreateTime(LocalDateTime.now());
material.setUpdateTime(LocalDateTime.now());
this.save(material);
return material.getId();
+ } else {
+ // 濡傛灉宸插瓨鍦紝浣嗗叧閿睘鎬у彂鐢熷彉鍖栵紝鍒欒繘琛屾洿鏂帮紙浠ュ疁鎼暟鎹负鍑嗭級
+ boolean needUpdate = false;
+ if (material.getMaterialTypeId() != null && !material.getMaterialTypeId().equals(exist.getMaterialTypeId())) {
+ exist.setMaterialTypeId(material.getMaterialTypeId());
+ needUpdate = true;
+ }
+ if (material.getInventoryCategoryId() != null && !material.getInventoryCategoryId().equals(exist.getInventoryCategoryId())) {
+ exist.setInventoryCategoryId(material.getInventoryCategoryId());
+ needUpdate = true;
+ }
+ if (StringUtils.isNotEmpty(material.getBaseUnit()) && !material.getBaseUnit().equals(exist.getBaseUnit())) {
+ exist.setBaseUnit(material.getBaseUnit());
+ needUpdate = true;
+ }
+ if (needUpdate) {
+ exist.setUpdateTime(LocalDateTime.now());
+ this.updateById(exist);
+ }
+ return exist.getId();
}
-
- return exist.getId();
}
-
private Integer getOrCreateConfigId(String name, String type) {
if (StringUtils.isEmpty(name)) {
return null;
}
- String key = type + "_" + name;
- if (configCache.containsKey(key)) {
- return configCache.get(key);
- }
- ProductMaterialConfig config = productMaterialConfigService.getOne(new LambdaQueryWrapper<ProductMaterialConfig>()
- .eq(ProductMaterialConfig::getConfigName, name)
- .eq(ProductMaterialConfig::getConfigType, type));
+ ProductMaterialConfig config = productMaterialConfigService.getOne(new LambdaQueryWrapper<ProductMaterialConfig>().eq(ProductMaterialConfig::getConfigName, name).eq(ProductMaterialConfig::getConfigType, type));
if (config == null) {
config = new ProductMaterialConfig();
config.setConfigName(name);
config.setConfigType(type);
productMaterialConfigService.save(config);
}
- configCache.put(key, config.getId());
return config.getId();
}
private int processSaveOrUpdate(List<ProductMaterialSku> list) {
- if (CollectionUtils.isEmpty(list)) {
+ if (list == null || list.isEmpty()) {
return 0;
}
int affected = 0;
+
for (ProductMaterialSku sku : list) {
- ProductMaterialSku exist = productMaterialSkuService.getOne(new LambdaQueryWrapper<ProductMaterialSku>()
- .eq(ProductMaterialSku::getMaterialId, sku.getMaterialId())
- .eq(ProductMaterialSku::getSpecification, sku.getSpecification()));
+ LambdaQueryWrapper<ProductMaterialSku> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductMaterialSku::getMaterialId, sku.getMaterialId())
+ .eq(ProductMaterialSku::getSpecification, sku.getSpecification());
+ if (StringUtils.isNotEmpty(sku.getMaterialCode())) {
+ wrapper.eq(ProductMaterialSku::getMaterialCode, sku.getMaterialCode());
+ } else {
+ wrapper.isNull(ProductMaterialSku::getMaterialCode);
+ }
+
+ ProductMaterialSku exist = productMaterialSkuService.getOne(wrapper);
if (exist == null) {
productMaterialSkuService.save(sku);
affected++;
- } else if (!Objects.equals(exist.getFormModifiedTime(), sku.getFormModifiedTime())) {
- sku.setId(exist.getId());
- sku.setCreateTime(exist.getCreateTime());
- productMaterialSkuService.updateById(sku);
- affected++;
+ log.info("鏂板鐗╂枡瑙勬牸 {}", sku.getSpecification());
+ } else {
+ if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(sku.getFormModifiedTime())) {
+ sku.setId(exist.getId());
+ sku.setCreateTime(exist.getCreateTime());
+ productMaterialSkuService.updateById(sku);
+
+ affected++;
+ log.info("鏇存柊鐗╂枡瑙勬牸 {}", sku.getSpecification());
+ }
}
}
return affected;
@@ -308,6 +342,15 @@
return result;
}
+ private ProductMaterialDto convert(ProductMaterial m) {
+ ProductMaterialDto dto = new ProductMaterialDto();
+ dto.setId(m.getId());
+ dto.setMaterialName(m.getMaterialName());
+ dto.setMaterialTypeId(m.getMaterialTypeId());
+ dto.setInventoryCategoryId(m.getInventoryCategoryId());
+ return dto;
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void addProductMaterial(ProductMaterial productMaterial) {
@@ -356,7 +399,6 @@
log.info("鍒犻櫎鐗╂枡鎴愬姛 ids={}", ids);
}
-
private void validateProductMaterial(ProductMaterial productMaterial, boolean requireId) {
if (productMaterial == null) {
throw new ServiceException("鍙傛暟涓嶈兘涓虹┖");
@@ -380,50 +422,4 @@
}
return this.count(queryWrapper) > 0;
}
-
- private ProductMaterialDto convert(ProductMaterial m) {
- ProductMaterialDto dto = new ProductMaterialDto();
- dto.setId(m.getId());
- dto.setMaterialName(m.getMaterialName());
- dto.setMaterialTypeId(m.getMaterialTypeId());
- dto.setInventoryCategoryId(m.getInventoryCategoryId());
- return dto;
- }
-
- private LocalDateTime parseUtcTime(String utc) {
- if (StringUtils.isEmpty(utc)) {
- return null;
- }
- try {
- return OffsetDateTime.parse(utc).toLocalDateTime();
- } catch (DateTimeParseException e) {
- log.warn("鏃堕棿瑙ｆ瀽澶辫触 {}", utc);
- return null;
- }
- }
-
- private String getAccessToken() {
- String params = "appkey=" + aliDingConfig.getAppKey() + "&appsecret=" + aliDingConfig.getAppSecret();
- String res = HttpUtils.sendGet(aliDingConfig.getAccessTokenUrl(), params);
- JSONObject obj = JSON.parseObject(res);
- return obj.getString("access_token");
- }
-
- private LocalDateTime getLastSyncTime() {
- ProductMaterialSku last = productMaterialSkuService.getOne(new LambdaQueryWrapper<ProductMaterialSku>()
- .orderByDesc(ProductMaterialSku::getFormModifiedTime)
- .last("limit 1"));
- return last == null ? null : last.getFormModifiedTime();
- }
-
- private JSONObject buildSearchParam(LocalDateTime lastTime, int page, int size) {
- JSONObject obj = new JSONObject();
- obj.put("appType", aliDingConfig.getAppType());
- obj.put("systemToken", aliDingConfig.getSystemToken());
- obj.put("formUuid", aliDingConfig.getMaterialCodeFormUuid());
- obj.put("currentPage", page);
- obj.put("pageSize", size);
-
- return obj;
- }
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3