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

gongchunyi

4 天以前 c7b6fb8f2303e4a35f92b18c1f2ef664dabb4905

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

 doc/ÄþÏÄ-ÖÐÊ¢½¨²Ä.sql

@@ -3,44 +3,32 @@
CREATE TABLE production_plan
(
    id                 BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键',

    form_instance_id   VARCHAR(64) COMMENT '表单实例ID',
    serial_no          VARCHAR(50) COMMENT '流水号',

    apply_no           VARCHAR(100) COMMENT '申请单编号',
    customer_name      VARCHAR(200) COMMENT '客户名称',

    material_code      VARCHAR(100) COMMENT '物料编码',
    product_name       VARCHAR(200) COMMENT '产品名称',
    product_spec       VARCHAR(200) COMMENT '产品规格',

    length             INT COMMENT '长',
    width              INT COMMENT '宽',
    height             INT COMMENT '高',

    quantity           INT COMMENT '块数',
    total_count        INT COMMENT '此次统计数量',
    volume             DECIMAL(10, 4) COMMENT '方数',

    strength           VARCHAR(50) COMMENT '强度',

    start_date         DATETIME COMMENT '开始日期',
    end_date           DATETIME COMMENT '结束日期',

    submitter          VARCHAR(100) COMMENT '提交人',
    submit_org         VARCHAR(200) COMMENT '提交人组织',

    remark_one         TEXT COMMENT '备注1',
    remark_two         TEXT COMMENT '备注2',

    creator_name       VARCHAR(100) COMMENT '创建人',
    modifier_name      VARCHAR(100) COMMENT '修改人',

    form_created_time  DATETIME COMMENT '表单创建时间',
    form_modified_time DATETIME COMMENT '表单修改时间',

    data_sync_type     TINYINT  DEFAULT 1 COMMENT '数据同步类型：1=手动 2=定时任务',
    data_source_type   TINYINT  DEFAULT 1 COMMENT '数据来源类型：1=销售订单 2=销售预测',

    create_time        DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '数据库创建时间',
    update_time        DATETIME COMMENT '数据库更新时间',

@@ -48,7 +36,6 @@
    INDEX idx_serial_no (serial_no),
    INDEX idx_form_instance_id (form_instance_id),
    INDEX idx_material_code (material_code)

) ENGINE = InnoDB
  DEFAULT CHARSET = utf8mb4 COMMENT ='销售生产计划';


 src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java

@@ -168,4 +168,9 @@
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime updateTime;

    /**
     * å½“前更新数量
     */
    private Integer totalCount;
}

 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,146 +81,214 @@
     */
    @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\":\"+\"}");

        // è®¾ç½®ä¿®æ”¹æ—¶é—´ç­›é€‰åŒºé—´ (格式必须为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 != 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);
            }
        }
    }


 src/main/java/com/ruoyi/productionPlan/task/ProductionPlanTask.java

@@ -1,5 +1,11 @@
package com.ruoyi.productionPlan.task;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import com.ruoyi.productionPlan.service.ProductionPlanService;

/**
 * <br>
 * é”€å”®ç”Ÿäº§éœ€æ±‚定时任务
@@ -9,5 +15,16 @@
 * @version 1.0
 * @since 2026/03/09 17:02
 */


@Component
public class ProductionPlanTask {

    @Autowired
    private ProductionPlanService productionPlanService;

    @Scheduled(cron = "0 0 * * * ?")
    public void syncProdDataJob() {
        productionPlanService.syncProdDataJob();
    }
}

 src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml

@@ -34,6 +34,7 @@
        <result property="dataSourceType" column="data_source_type"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="totalCount" column="total_count"/>
    </resultMap>