refactor: 代码回退

gongchunyi

昨天 f78c1d5feb1b800b5afdf743821bf4c8672843a6

 src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java

@@ -58,15 +58,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,146 +75,276 @@
    }

    /**
     * 同步物料数据
     * 同步数据
     */
    @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 {
            // 获取 AccessToken
            String accessToken = getAccessToken();
            if (StringUtils.isEmpty(accessToken)) {
                return;
            }
            LocalDateTime lastSyncTime = getLastSyncTime();
            log.info("开始同步物料，本地最后时间 {}", lastSyncTime);

            int page = 1;
            int size = 50;
            // 获取本地最后同步时间
            LocalDateTime lastSyncTime = getLastSyncTime();
            log.info("开始物料编码增量同步，本地最后修改时间: {}", lastSyncTime);

            int pageNumber = 1;
            int pageSize = 50;
            boolean hasMore = true;
            int total = 0;
            int totalSynced = 0;

            while (hasMore) {
                JSONObject param = buildSearchParam(lastSyncTime, page, size);
                String res = HttpUtils.sendPostJson(
                        aliDingConfig.getSearchFormDataUrl(),
                        param.toJSONString(),
                        StandardCharsets.UTF_8.name(),
                        null,
                        accessToken
                );
                // 查询参数
                JSONObject searchParam = buildSearchParam(lastSyncTime, pageNumber, pageSize);

                JSONObject result = JSON.parseObject(res);
                JSONArray dataArr = result.getJSONArray("data");
                Integer totalCount = result.getInteger("totalCount");
                if (CollectionUtils.isEmpty(dataArr)) {
                // 调用宜搭接口拉取数据
                String dataRes = HttpUtils.sendPostJson(aliDingConfig.getSearchFormDataUrl(), searchParam.toJSONString(), StandardCharsets.UTF_8.name(), null, accessToken);

                if (StringUtils.isEmpty(dataRes)) {
                    log.warn("第 {} 页拉取数据为空", pageNumber);
                    break;
                }
                List<ProductMaterialSku> list = parseProductMaterials(dataArr);
                int affected = processSaveOrUpdate(list);
                total += affected;
                hasMore = page * size < totalCount;
                page++;
                log.info("同步进度 {} / {}", total, totalCount);

                JSONObject resultObj = JSON.parseObject(dataRes);
                JSONArray dataArr = resultObj.getJSONArray("data");
                Integer totalCount = resultObj.getInteger("totalCount");

                if (dataArr == null || dataArr.isEmpty()) {
                    log.info("没有更多新数据需要同步");
                    break;
            }
            log.info("物料同步完成 共 {} 条", total);

                // 解析并保存数据
                List<ProductMaterialSku> list = parseProductMaterials(dataArr, totalCount);
                if (!list.isEmpty()) {
                    // 处理更新或新增
                    int affected = processSaveOrUpdate(list);
                    totalSynced += affected;
                }

                // 判断是否还有下一页
                hasMore = (pageNumber * pageSize) < totalCount;
                pageNumber++;

                log.info("正在同步第 {} 页，当前已同步 {}/{}", pageNumber - 1, totalSynced, totalCount);
            }

            log.info("物料数据同步完成，共同步 {} 条数据", totalSynced);
        } catch (Exception e) {
            log.error("同步异常", e);
            log.error("同步物料编码异常", e);
        } finally {
            // 释放锁
            syncLock.unlock();
        }
    }

    private List<ProductMaterialSku> parseProductMaterials(JSONArray arr) {
    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() {
        LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.orderByDesc(ProductMaterialSku::getFormModifiedTime).last("LIMIT 1");
        ProductMaterialSku lastRecord = productMaterialSkuService.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.getMaterialCodeFormUuid());
        searchParam.put("currentPage", pageNumber);
        searchParam.put("pageSize", pageSize);

        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);

        searchParam.put("searchFieldJson", searchConditions.toJSONString());
        searchParam.put("orderConfigJson", "{\"gmt_modified\":\"+\"}");

        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<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.setSupplyType(formData.getString("selectField_la14k51j"));
            sku.setOriginatorName(originatorName);
            sku.setOriginatorOrg("宁夏中创绿能实业集团有限公司");
            sku.setFormModifiedTime(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();
    }

    }

    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())) {
                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;
    }

    private LocalDateTime parseUtcTime(String utcString) {
        if (StringUtils.isEmpty(utcString)) {
            return null;
        }
        try {
            OffsetDateTime odt = OffsetDateTime.parse(utcString);
            return odt.toLocalDateTime();
        } catch (DateTimeParseException ex) {
            log.warn("解析时间 {} 失败: {}", utcString, ex.getMessage());
            return null;
        }
    }

    @Override
@@ -308,6 +432,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 +489,6 @@
        log.info("删除物料成功 ids={}", ids);
    }


    private void validateProductMaterial(ProductMaterial productMaterial, boolean requireId) {
        if (productMaterial == null) {
            throw new ServiceException("参数不能为空");
@@ -379,51 +511,5 @@
            queryWrapper.ne(ProductMaterial::getId, excludeId);
        }
        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;
    }
}