feat: 根据宜搭表单 ID 获取数据工具类

gongchunyi

6 小时以前 ef7458a6eb8ad72f45b65a4e417a9d04f5015246

 src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.productionPlan.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;
@@ -12,10 +11,9 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.production.pojo.ProductMaterial;
import com.ruoyi.framework.util.AliDingUtils;
import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductMaterialService;
@@ -38,10 +36,9 @@

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -248,101 +245,6 @@
        }

        try {
            //  获取 AccessToken
            String accessToken = getAccessToken();
            if (StringUtils.isEmpty(accessToken)) {
                return;
            }

            //  获取本地最后同步时间
            LocalDateTime lastSyncTime = getLastSyncTime();
            log.info("开始增量同步，本地最后修改时间: {}", lastSyncTime);

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

            while (hasMore) {
                //  查询参数
                JSONObject searchParam = buildSearchParam(lastSyncTime, pageNumber, pageSize);

                //  调用宜搭接口拉取数据
                String dataRes = HttpUtils.sendPostJson(
                        aliDingConfig.getSearchFormDataUrl(),
                        searchParam.toJSONString(),
                        StandardCharsets.UTF_8.name(),
                        null,
                        accessToken
                );

                if (StringUtils.isEmpty(dataRes)) {
                    log.warn("第 {} 页拉取数据为空", pageNumber);
                    break;
                }

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

                if (dataArr == null || dataArr.isEmpty()) {
                    log.info("没有更多新数据需要同步");
                    break;
                }

                //  解析并保存数据
                List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, 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);
        } 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.getProducePlanFormUuid());
        searchParam.put("currentPage", pageNumber);
        searchParam.put("pageSize", pageSize);

        JSONArray searchConditions = new JSONArray();
        JSONObject condition = new JSONObject();
        condition.put("key", "processApprovedResult");
@@ -355,26 +257,29 @@
        condition.put("componentName", "SelectField");
        searchConditions.add(condition);

        searchParam.put("searchFieldJson", searchConditions.toJSONString());
            String searchFieldJson = searchConditions.toJSONString();

        // 默认按修改时间升序排序，确保分页拉取数据的连续性
        // "+" 表示升序，"gmt_modified" 是官方内置字段
        searchParam.put("orderConfigJson", "{\"gmt_modified\":\"+\"}");
            JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getProducePlanFormUuid(), searchFieldJson, this, ProductionPlan::getFormModifiedTime);

        // 设置修改时间筛选区间 (格式必须为yyyy-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);
            if (dataArr.isEmpty()) {
                log.info("没有更多新数据需要同步");
                return;
        }

        // 截止时间：当前时间，确保获取最新的已修改/已新增数据
        String endTime = LocalDateTime.now().atZone(ZoneId.systemDefault())
                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
        searchParam.put("modifiedToTimeGMT", endTime);
            //  解析并保存数据
            List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, dataArr.size());
            if (!list.isEmpty()) {
                //  处理更新或新增
                int affected = processSaveOrUpdate(list);
                log.info("数据同步完成，共同步 {} 条数据", affected);
            }

        return searchParam;
        } catch (Exception e) {
            log.error("同步生产计划异常", e);
        } finally {
            // 释放锁
            syncLock.unlock();
        }
    }

    private List<ProductionPlan> parseProductionPlans(JSONArray dataArr, Integer dataSyncType, Integer totalCount) {
@@ -458,8 +363,8 @@
                    plan.setModifierName(modifyUser.getJSONObject("userName").getString("nameInChinese"));
                }

                plan.setFormCreatedTime(parseUtcTime(item.getString("createdTimeGMT")));
                plan.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
                plan.setFormCreatedTime(AliDingUtils.parseUtcTime(item.getString("createdTimeGMT")));
                plan.setFormModifiedTime(AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT")));
                plan.setDataSourceType(DataSourceTypeEnum.DING_TALK.getCode());
                plan.setCreateTime(now);
                plan.setUpdateTime(now);
@@ -513,19 +418,6 @@
            }
        }
        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