feat: 添加同步记录，手动与自动不能同时拉取数据

gongchunyi

4 天以前 c7b6fb8f2303e4a35f92b18c1f2ef664dabb4905

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

@@ -3,6 +3,7 @@
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;
@@ -23,9 +24,11 @@
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 +49,11 @@

    @Autowired
    private ProductionPlanMapper productionPlanMapper;

    /**
     * 同步锁，确保手动和定时任务不同时执行
     */
    private final ReentrantLock syncLock = new ReentrantLock();

    @Override
    public IPage<ProductionPlanDto> listPage(Page page, ProductionPlanDto productionPlanDto) {
@@ -73,30 +81,32 @@
     */
    @Transactional(rollbackFor = Exception.class)
    public void syncProdData(Integer dataSyncType) {
        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");
            if (StringUtils.isEmpty(accessToken)) {
                log.error("获取钉钉AccessToken失败: {}", tokenRes);
        if (!syncLock.tryLock()) {
            log.warn("同步正在进行中，本次 {} 同步请求被跳过", dataSyncType == 1 ? "手动" : "定时任务");
                return;
            }

            log.info("获取AccessToken成功: {}", accessToken);
        try {
            //  获取 AccessToken
            String accessToken = getAccessToken();
            if (StringUtils.isEmpty(accessToken)) {
                return;
            }

            //  查询表单数据
            JSONObject searchParam = new JSONObject();
            searchParam.put("appType", aliDingConfig.getAppType());
            searchParam.put("systemToken", aliDingConfig.getSystemToken());
            searchParam.put("userId", aliDingConfig.getUserId());
            searchParam.put("formUuid", aliDingConfig.getFormUuid());
            //  获取本地最后同步时间
            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(),
@@ -106,52 +116,120 @@
            );

            if (StringUtils.isEmpty(dataRes)) {
                log.error("拉取宜搭数据为空");
                return;
                    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.warn("没有获取到表单数据");
                return;
                    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);
            }

            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\":\"+\"}");

        // 设置修改时间筛选区间 (格式必须为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);
        }

        // 截止时间：当前时间，确保获取最新的已修改/已新增数据
        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.getJSONObject("userName").getString("nameInChinese");
            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"));
@@ -162,57 +240,55 @@
                    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());
                        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) {
                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);
                    // 数据库时间
                    LocalDateTime now = LocalDateTime.now();
                    plan.setCreateTime(now);
                    plan.setUpdateTime(now);
                plan.setTotalCount(totalCount);

                    list.add(plan);
                }
            }

            if (!list.isEmpty()) {
                saveBatch(list);
        return list;
            }
            log.info("生产计划同步完成，共 {} 条", list.size());
        } catch (Exception e) {
            log.error("同步生产计划异常", e);

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