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

@@ -175,4 +175,29 @@

ALTER TABLE `product-inventory-management-zsjc`.`production_plan`
    DROP COLUMN `data_sync_type`,
    MODIFY COLUMN `data_source_type` tinyint NULL DEFAULT 1 COMMENT '数据来源类型：1=钉钉同步 2=手动新增' AFTER `form_modified_time`;
    MODIFY COLUMN `data_source_type` tinyint NULL DEFAULT 1 COMMENT '数据来源类型：1=钉钉同步 2=手动新增' AFTER `form_modified_time`;

DROP TABLE IF EXISTS `base_param`;
CREATE TABLE `base_param`
(
    id            BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
    param_key     VARCHAR(100) NOT NULL COMMENT '参数唯一标识',
    param_name    VARCHAR(100) NOT NULL COMMENT '参数名称',
    param_type    TINYINT      NOT NULL COMMENT '参数类型(1数字 2文本)',
    value_mode    TINYINT DEFAULT 1 COMMENT '值模式(1单值 2区间)',
    unit          VARCHAR(50) COMMENT '单位',
    default_value VARCHAR(200) COMMENT '默认值(单值参数)',
    default_min   DECIMAL(10, 2) COMMENT '默认最小值(区间参数)',
    default_max   DECIMAL(10, 2) COMMENT '默认最大值(区间参数)',
    is_required   TINYINT DEFAULT 0 COMMENT '是否必填(0否 1是)',
    remark        VARCHAR(255) COMMENT '备注',
    create_user   VARCHAR(64) COMMENT '创建人',
    create_time   DATETIME COMMENT '创建时间',
    update_user   VARCHAR(64) COMMENT '修改人',
    update_time   DATETIME COMMENT '修改时间',
    tenant_id     BIGINT       NOT NULL COMMENT '租户ID'
) COMMENT = '基础参数定义表';

ALTER TABLE `product-inventory-management-zsjc`.`customer`
    ADD COLUMN `form_instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '宜搭表单实例ID' AFTER `customer_type`,
    ADD COLUMN `form_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '宜搭修改时间' AFTER `form_instance_id`;

 src/main/java/com/ruoyi/basic/controller/BaseParamController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
package com.ruoyi.basic.controller;

import com.ruoyi.basic.pojo.BaseParam;
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <br>
 * åŸºç¡€å‚数定义控制层
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/13 16:42
 */
@RestController
@RequestMapping("/baseParam")
public class BaseParamController extends BaseController {

    @Autowired
    private BaseParamService baseParamService;

    @GetMapping("list")
    @Log(title = "基础参数数据集合", businessType = BusinessType.OTHER)
    @ApiOperation("基础参数数据集合")
    public AjaxResult baseParamList(BaseParam baseParam) {
        List<BaseParam> list = baseParamService.baseParamList(baseParam);
        return AjaxResult.success(list);
    }

    @PostMapping("/add")
    @Log(title = "新增基础参数", businessType = BusinessType.INSERT)
    @ApiOperation("新增基础参数")
    public AjaxResult baseParamAdd(@RequestBody BaseParam baseParam) {
        return toAjax(baseParamService.addBaseParam(baseParam));
    }

    @PutMapping("/edit")
    @Log(title = "修改基础参数", businessType = BusinessType.UPDATE)
    @ApiOperation("修改基础参数")
    public AjaxResult baseParamEdit(@RequestBody BaseParam baseParam) {
        return toAjax(baseParamService.updateBaseParam(baseParam));
    }

    @DeleteMapping("/remove/{ids}")
    @Log(title = "删除基础参数", businessType = BusinessType.DELETE)
    @ApiOperation("删除基础参数")
    public AjaxResult baseParamRemove(@PathVariable Long[] ids) {
        return toAjax(baseParamService.deleteBaseParamByIds(ids));
    }

}

 src/main/java/com/ruoyi/basic/dto/BaseParamDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package com.ruoyi.basic.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * <br>
 * åŸºç¡€å‚数定义Dto
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/13 17:40
 */
@Data
@Api("基础参数定义Dto")
public class BaseParamDto {

    @ApiModelProperty("主键ID")
    private Long id;

    @ApiModelProperty("参数唯一标识")
    private String paramKey;

    @ApiModelProperty("参数名称")
    private String paramName;

    @ApiModelProperty("参数类型(1数字 2文本)")
    private Integer paramType;

    @ApiModelProperty("参数格式")
    private String paramFormat;

    @ApiModelProperty("值模式(1单值 2区间)")
    private Integer valueMode;

    @ApiModelProperty("单位")
    private String unit;

    @ApiModelProperty("默认值(单值参数)")
    private String defaultValue;

    @ApiModelProperty("默认最小值(区间参数)")
    private BigDecimal defaultMin;

    @ApiModelProperty("默认最大值(区间参数)")
    private BigDecimal defaultMax;

    @ApiModelProperty("是否必填(0否 1是)")
    private Integer isRequired;

    @ApiModelProperty("产品类型表ID名称")
    private String baseProductTypeName;

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("创建人")
    private String createUser;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty("修改人")
    private String updateUser;

    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
}

 src/main/java/com/ruoyi/basic/mapper/BaseParamMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.basic.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.basic.pojo.BaseParam;

/**
 * <br>
 * åŸºç¡€å‚数定义Mapper
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/13 16:39
 */
public interface BaseParamMapper extends BaseMapper<BaseParam> {
}

 src/main/java/com/ruoyi/basic/pojo/BaseParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package com.ruoyi.basic.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * <br>
 * åŸºç¡€å‚数定义表
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/13 16:33
 */
@Data
@TableName("base_param")
@Api("基础参数定义")
public class BaseParam {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty("主键ID")
    private Long id;

    @ApiModelProperty("参数唯一标识")
    private String paramKey;

    @ApiModelProperty("参数名称")
    private String paramName;

    @ApiModelProperty("参数类型(1数字 2文本)")
    private Integer paramType;

    @ApiModelProperty("参数格式")
    private String paramFormat;

    @ApiModelProperty("值模式(1单值 2区间)")
    private Integer valueMode;

    @ApiModelProperty("单位")
    private String unit;

    @ApiModelProperty("默认值(单值参数)")
    private String defaultValue;

    @ApiModelProperty("默认最小值(区间参数)")
    private BigDecimal defaultMin;

    @ApiModelProperty("默认最大值(区间参数)")
    private BigDecimal defaultMax;

    @ApiModelProperty("是否必填(0否 1是)")
    private Integer isRequired;

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("创建人")
    private String createUser;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty("修改人")
    private String updateUser;

    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    @ApiModelProperty("租户ID")
    private Long tenantId;
}

 src/main/java/com/ruoyi/basic/pojo/Customer.java

@@ -115,4 +115,11 @@
    @ApiModelProperty(value = "开户行号")
    @Excel(name = "开户行号")
    private String bankCode;

    @ApiModelProperty("宜搭表单实例ID")
    private String formInstanceId;

    @ApiModelProperty("宜搭修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime formModifiedTime;
}

 src/main/java/com/ruoyi/basic/service/BaseParamService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.ruoyi.basic.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.BaseParam;

import java.util.List;

/**
 * <br>
 * åŸºç¡€å‚数定义接口
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/13 16:40
 */
public interface BaseParamService extends IService<BaseParam> {
    List<BaseParam> baseParamList(BaseParam baseParam);

    int addBaseParam(BaseParam baseParam);

    int updateBaseParam(BaseParam baseParam);

    int deleteBaseParamByIds(Long[] ids);
}

 src/main/java/com/ruoyi/basic/service/ICustomerService.java

@@ -78,4 +78,8 @@
    List<Customer> selectCustomerLists(Customer customer);

    AjaxResult importData(MultipartFile file);

    //同步客户数据
    void syncCustomerJob();

}

 src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,157 @@
package com.ruoyi.basic.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.BaseParamMapper;
import com.ruoyi.basic.pojo.BaseParam;
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

/**
 * <br>
 * åŸºç¡€å‚数定义接口实现类
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/13 16:41
 */
@Slf4j
@Service
@Api("基础参数定义接口实现类")
public class BaseParamServiceImpl extends ServiceImpl<BaseParamMapper, BaseParam> implements BaseParamService {

    @Override
    public List<BaseParam> baseParamList(BaseParam baseParam) {
        LambdaQueryWrapper<BaseParam> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotEmpty(baseParam.getParamName())) {
            queryWrapper.like(BaseParam::getParamName, baseParam.getParamName());
        }
        List<BaseParam> list = list(queryWrapper);
        if (list == null || list.isEmpty()) {
            return new ArrayList<>(0);
        }
        return list;
    }

    @Override
    public int addBaseParam(BaseParam baseParam) {

        if (baseParam == null) {
            throw new RuntimeException("新增参数不能为空");
        }
        // å‚数校验
        checkBaseParam(baseParam, false);
        // è‡ªåŠ¨ç”ŸæˆparamKey
        baseParam.setParamKey(generateParamKey());
        baseParam.setCreateUser(SecurityUtils.getUsername());
        baseParam.setCreateTime(LocalDateTime.now());

        return baseMapper.insert(baseParam);
    }

    @Override
    public int updateBaseParam(BaseParam baseParam) {
        if (baseParam == null || baseParam.getId() == null) {
            throw new RuntimeException("修改参数ID不能为空");
        }
        // å‚数校验
        checkBaseParam(baseParam, true);
        baseParam.setUpdateUser(SecurityUtils.getUsername());
        baseParam.setUpdateTime(LocalDateTime.now());

        return baseMapper.updateById(baseParam);
    }

    /**
     * ç”Ÿæˆå‚数唯一key
     */
    private String generateParamKey() {
        String prefix = "PARAM_";
        // æŸ¥è¯¢å½“前最大key
        LambdaQueryWrapper<BaseParam> wrapper = new LambdaQueryWrapper<>();
        wrapper.select(BaseParam::getParamKey)
                .likeRight(BaseParam::getParamKey, prefix)
                .orderByDesc(BaseParam::getParamKey)
                .last("limit 1");
        BaseParam last = baseMapper.selectOne(wrapper);
        int nextNum = 1;
        if (last != null) {
            String lastKey = last.getParamKey();
            String numStr = lastKey.replace(prefix, "");
            nextNum = Integer.parseInt(numStr) + 1;
        }
        return prefix + String.format("%04d", nextNum);
    }

    /**
     * å‚数合法性校验
     */
    private void checkBaseParam(BaseParam baseParam, boolean isUpdate) {
        if (baseParam == null) {
            throw new RuntimeException("参数对象不能为空");
        }
        if (StringUtils.isEmpty(baseParam.getParamName())) {
            throw new RuntimeException("参数名称不能为空");
        }
        if (baseParam.getParamType() == null ||
                !(baseParam.getParamType() == 1 || baseParam.getParamType() == 2)) {
            throw new RuntimeException("参数类型必须为1(数字)或2(文本)");
        }
        if (baseParam.getValueMode() == null ||
                !(baseParam.getValueMode() == 1 || baseParam.getValueMode() == 2)) {
            throw new RuntimeException("值模式必须为1(单值)或2(区间)");
        }

        // å•å€¼æ¨¡å¼
        if (baseParam.getValueMode() == 1) {
            if (StringUtils.isEmpty(baseParam.getDefaultValue())) {
                throw new RuntimeException("单值参数默认值不能为空");
            }
            if (baseParam.getParamType() == 1) {
                try {
                    new BigDecimal(baseParam.getDefaultValue());
                } catch (Exception e) {
                    throw new RuntimeException("默认值必须为数字");
                }
            }

            baseParam.setDefaultMin(null);
            baseParam.setDefaultMax(null);
        }

        // åŒºé—´æ¨¡å¼
        if (baseParam.getValueMode() == 2) {
            if (baseParam.getParamType() != 1) {
                throw new RuntimeException("只有数字类型才能使用区间模式");
            }
            if (baseParam.getDefaultMin() == null || baseParam.getDefaultMax() == null) {
                throw new RuntimeException("区间参数最小值和最大值不能为空");
            }
            if (baseParam.getDefaultMin().compareTo(baseParam.getDefaultMax()) > 0) {
                throw new RuntimeException("最小值不能大于最大值");
            }

            baseParam.setDefaultValue(null);
        }
    }

    @Override
    public int deleteBaseParamByIds(Long[] ids) {
        if (ids == null || ids.length == 0) {
            throw new RuntimeException("删除ID不能为空");
        }

        return baseMapper.deleteBatchIds(Arrays.asList(ids));
    }
}

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -1,6 +1,8 @@
package com.ruoyi.basic.service.impl;


import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,23 +22,33 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.util.AliDingUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.enums.MaterialConfigTypeEnum;
import com.ruoyi.production.pojo.ProductMaterial;
import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.productionPlan.enums.DataSourceTypeEnum;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;


@@ -58,6 +70,13 @@
    private CustomerFollowUpFileService customerFollowUpFileService;

    private CustomerReturnVisitService customerReturnVisitService;

    private AliDingConfig aliDingConfig;

    /**
     * åŒæ­¥é”ï¼Œé˜²æ­¢æ‰‹åŠ¨å’Œå®šæ—¶ä»»åŠ¡åŒæ—¶æ‰§è¡Œ
     */
    private final ReentrantLock syncLock = new ReentrantLock();

    /**
     * æŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆ
@@ -256,6 +275,11 @@
    }

    @Override
    public void syncCustomerJob() {
        syncCustomerData(2);
    }

    @Override
    public List<Map<String, Object>> customerList(Customer customer) {
        LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber);
@@ -292,4 +316,114 @@
        }
        return sb.toString();
    }


    /**
     * åŒæ­¥æ•°æ®
     */
    @Transactional(rollbackFor = Exception.class)
    public void syncCustomerData(Integer dataSyncType) {
        if (!syncLock.tryLock()) {
            log.warn("同步正在进行中，本次 {} åŒæ­¥è¯·æ±‚被跳过", dataSyncType == 1 ? "手动" : "定时任务");
            return;
        }
        try {
            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.getCustomerCodeFormUuid(), searchFieldJson, this, Customer::getFormModifiedTime);

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

            // è§£æžå¹¶ä¿å­˜æ•°æ®
            List<Customer> list = parseCustomer(dataArr);
            if (!list.isEmpty()) {
                // å¤„理更新或新增
                int affected = processSaveOrUpdate(list);
                log.info("客户数据同步完成，共同步 {} æ¡æ•°æ®", affected);
            }

        } catch (Exception e) {
            log.error("同步客户信息异常", e);
        } finally {
            // é‡Šæ”¾é”
            syncLock.unlock();
        }
    }

    private List<Customer> parseCustomer(JSONArray dataArr) {
        List<Customer> list = new ArrayList<>();
        for (int i = 0; i < dataArr.size(); i++) {
            JSONObject item = dataArr.getJSONObject(i);
            String formInstanceId = item.getString("formInstanceId");
            JSONObject formData = item.getJSONObject("formData");
            Customer customer = new Customer();
            customer.setCustomerName(formData.getString("textField_l7fwg8uh"));
            customer.setTaxpayerIdentificationNumber(formData.getString("textField_l88df8ae"));
            customer.setCompanyAddress(formData.getString("textField_l7fwg8uj"));
            customer.setCompanyPhone(formData.getString("textField_lb38bng2"));
            customer.setContactPerson(formData.getString("textField_l7fwg8ut"));
            customer.setContactPhone(formData.getString("textField_l7fwg8uu"));
            customer.setMaintainer("管理员账号");
            LocalDateTime dateTime = AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT"));
            ZoneId zoneId = ZoneId.of("Asia/Shanghai");
            Date date = Date.from(dateTime.atZone(zoneId).toInstant());
            customer.setMaintenanceTime(date);
            customer.setFormInstanceId(formInstanceId);
            customer.setFormModifiedTime(dateTime);
            list.add(customer);
        }
        return list;
    }

    private int processSaveOrUpdate(List<Customer> list) {
        if (list == null || list.isEmpty()) {
            return 0;
        }
        int affected = 0;

        for (Customer customer : list) {

            LambdaQueryWrapper<Customer> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(Customer::getFormInstanceId, customer.getFormInstanceId());

            Customer exist = this.getOne(wrapper);
            if (exist == null) {
                this.save(customer);
                affected++;
                log.info("新增客户信息 {}", customer.getCustomerName());
            } else {
                if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(customer.getFormModifiedTime())) {
                    customer.setId(exist.getId());
                    this.updateById(customer);
                    affected++;
                    log.info("更新客户信息 {}", customer.getCustomerName());
                }
            }
        }
        return affected;
    }
}

 src/main/java/com/ruoyi/basic/task/CustomerTask.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.ruoyi.basic.task;

import com.ruoyi.basic.service.ICustomerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@Component
public class CustomerTask {

    @Autowired
    private ICustomerService customerService;

    @Scheduled(cron = "0 0 * * * ?")
    public void syncCustomerDataJob() {
        customerService.syncCustomerJob();
    }
}

 src/main/java/com/ruoyi/framework/config/AliDingConfig.java

@@ -53,6 +53,11 @@
    private String materialCodeFormUuid;

    /**
     * å®¢æˆ·ä¿¡æ¯-宜搭表单ID
     */
    private String customerCodeFormUuid;

    /**
     * å®œæ­åº”用密钥
     * ç”¨äºŽè®¿é—®å®œæ­è¡¨å• API
     */

 src/main/java/com/ruoyi/framework/util/AliDingUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,173 @@
package com.ruoyi.framework.util;

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.toolkit.support.SFunction;
import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.config.AliDingConfig;
import lombok.extern.slf4j.Slf4j;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
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;

/**
 * <br>
 * æ ¹æ®å®œæ­è¡¨å• ID èŽ·å–数据
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/14 11:11
 */
@Slf4j
public class AliDingUtils {


    /**
     * æ ¹æ®è¡¨å• ID èŽ·å–宜搭数据
     *
     * @param aliDingConfig   é’‰é’‰å®œæ­æŽ¥å£é…ç½®
     * @param formUuid        èŽ·å–数据的表单ID
     * @param searchFieldJson éœ€è¦æºå¸¦çš„查询条件
     * @param service         èŽ·å–最近表单更新的日期Service
     * @param timeField       è¡¨å•ä¿®æ”¹æ—¥æœŸ
     * @param <T>             å®žä½“ç±»
     * @return å¯¹åº”表单的数据
     */
    public static <T> JSONArray getFormDataList(AliDingConfig aliDingConfig, String formUuid, String searchFieldJson, IService<T> service, SFunction<T, ?> timeField) {
        //  èŽ·å– accessToken
        String accessToken = getAccessToken(aliDingConfig);
        //  èŽ·å–最后同步时间
        LocalDateTime lastSyncTime = getLastSyncTime(service, timeField);
        log.info("开始同步数据，本地最后修改时间: {}", lastSyncTime);

        JSONArray allData = new JSONArray();
        int pageNumber = 1;
        int pageSize = 50;
        boolean hasMore = true;

        while (hasMore) {
            JSONObject searchParam = new JSONObject();
            searchParam.put("appType", aliDingConfig.getAppType());
            searchParam.put("systemToken", aliDingConfig.getSystemToken());
            searchParam.put("userId", aliDingConfig.getUserId());
            searchParam.put("formUuid", formUuid);
            searchParam.put("currentPage", pageNumber);
            searchParam.put("pageSize", pageSize);

            if (StringUtils.isNotEmpty(searchFieldJson)) {
                searchParam.put("searchFieldJson", searchFieldJson);
            }

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

            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;
            }
            allData.addAll(dataArr);
            hasMore = (pageNumber * pageSize) < totalCount;
            pageNumber++;

            log.info("正在提取宜搭分页数据，第 {} é¡µå·²å¤„理，当前提取数: {}/{}", pageNumber - 1, allData.size(), totalCount);
        }

        return allData;
    }

    /**
     * èŽ·å–钉钉 AccessToken
     */
    private static String getAccessToken(AliDingConfig aliDingConfig) {
        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;
    }

    /**
     * æ—¥æœŸæ ¼å¼åŒ–
     *
     * @param utcString æ—¥æœŸ
     * @return LocalDateTime
     */
    public static 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;
        }
    }

    private static <T> LocalDateTime getLastSyncTime(IService<T> service, SFunction<T, ?> timeField) {
        LambdaQueryWrapper<T> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.orderByDesc(timeField).last("LIMIT 1");
        T lastRecord = service.getOne(queryWrapper);
        if (lastRecord == null) {
            return null;
        }
        try {
            Method writeReplace = timeField.getClass().getDeclaredMethod("writeReplace");
            writeReplace.setAccessible(true);
            SerializedLambda lambda = (SerializedLambda) writeReplace.invoke(timeField);
            // èŽ·å–方法名
            String methodName = lambda.getImplMethodName();
            // è½¬å­—段名
            String fieldName = methodName.substring(3, 4).toLowerCase() + methodName.substring(4);
            Field field = lastRecord.getClass().getDeclaredField(fieldName);
            field.setAccessible(true);
            return (LocalDateTime) field.get(lastRecord);
        } catch (Exception e) {
            throw new RuntimeException("获取最后同步时间失败", e);
        }
    }
}

 src/main/java/com/ruoyi/production/controller/ProductMaterialController.java

@@ -1,5 +1,8 @@
package com.ruoyi.production.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;

 src/main/java/com/ruoyi/production/pojo/ProcessRoute.java

@@ -18,7 +18,7 @@
    private Long id;

    @ApiModelProperty(value = "产品ID")
    //product_model
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    @ApiModelProperty(value = "描述")

 src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java

@@ -22,6 +22,7 @@
    private Long processId;

    @ApiModelProperty(value ="产品id")
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    @ApiModelProperty(value = "租户ID")

 src/main/java/com/ruoyi/production/pojo/ProductBom.java

@@ -38,6 +38,7 @@
    private String bomNo;

    @ApiModelProperty("产品规格id")
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    @ApiModelProperty("备注")

 src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java

@@ -34,7 +34,7 @@
    private Long id;

    @ApiModelProperty("产品id")
    //product_model
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    @ApiModelProperty("描述")

 src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java

@@ -23,6 +23,7 @@
    private Long processId;

    @ApiModelProperty(value ="产品id")
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    @ApiModelProperty(value = "租户ID")

 src/main/java/com/ruoyi/production/pojo/ProductStructure.java

@@ -19,6 +19,7 @@
    /**
     * äº§å“åç§°
     */
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    /**

 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;

@@ -85,126 +82,52 @@
        }

        try {
            // èŽ·å– AccessToken
            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 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<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);
            // è§£æžå¹¶ä¿å­˜æ•°æ®
            List<ProductMaterialSku> list = parseProductMaterials(dataArr, dataArr.size());
            if (!list.isEmpty()) {
                // å¤„理更新或新增
                int affected = processSaveOrUpdate(list);
                log.info("物料数据同步完成，共同步 {} æ¡æ•°æ®", affected);
            }

            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() {
        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) {
@@ -241,7 +164,7 @@
            sku.setSupplyType(formData.getString("selectField_la14k51j"));
            sku.setOriginatorName(originatorName);
            sku.setOriginatorOrg("宁夏中创绿能实业集团有限公司");
            sku.setFormModifiedTime(parseUtcTime(item.getString("modifiedTimeGMT")));
            sku.setFormModifiedTime(AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT")));
            sku.setCreateTime(now);
            sku.setUpdateTime(now);

@@ -332,19 +255,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

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

@@ -51,17 +51,15 @@
     */
    @Override
    public Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSku> page, ProductMaterialSkuDto dto) {
        if (dto == null || dto.getMaterialId() == null) {
            return new Page<>();
        }
        LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(ProductMaterialSku::getMaterialId, dto.getMaterialId())
                .like(StringUtils.isNotBlank(dto.getSpecification()),
                        ProductMaterialSku::getSpecification, dto.getSpecification())
                .like(StringUtils.isNotBlank(dto.getMaterialCode()),
                        ProductMaterialSku::getMaterialCode, dto.getMaterialCode())
                .orderByAsc(ProductMaterialSku::getId);

        if (dto != null && dto.getMaterialId() != null) {
            queryWrapper.eq(ProductMaterialSku::getMaterialId, dto.getMaterialId())
                    .like(StringUtils.isNotBlank(dto.getSpecification()),
                            ProductMaterialSku::getSpecification, dto.getSpecification())
                    .like(StringUtils.isNotBlank(dto.getMaterialCode()),
                            ProductMaterialSku::getMaterialCode, dto.getMaterialCode())
                    .orderByAsc(ProductMaterialSku::getId);
        }
        Page<ProductMaterialSku> skuPage = this.page(page, queryWrapper);
        List<ProductMaterialSku> skuList = skuPage.getRecords();
        if (skuList == null || skuList.isEmpty()) {

 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,133 +245,41 @@
        }

        try {
            //  èŽ·å– AccessToken
            String accessToken = getAccessToken();
            if (StringUtils.isEmpty(accessToken)) {
            JSONArray searchConditions = new JSONArray();
            JSONObject condition = new JSONObject();
            condition.put("key", "processApprovedResult");
            JSONArray valueArray = new JSONArray();
            valueArray.add("agree");

            condition.put("value", valueArray);
            condition.put("type", "ARRAY");
            condition.put("operator", "in");
            condition.put("componentName", "SelectField");
            searchConditions.add(condition);

            String searchFieldJson = searchConditions.toJSONString();

            JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getProducePlanFormUuid(), searchFieldJson, this, ProductionPlan::getFormModifiedTime);

            if (dataArr.isEmpty()) {
                log.info("没有更多新数据需要同步");
                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);
            //  è§£æžå¹¶ä¿å­˜æ•°æ®
            List<ProductionPlan> list = parseProductionPlans(dataArr, dataSyncType, dataArr.size());
            if (!list.isEmpty()) {
                //  å¤„理更新或新增
                int affected = processSaveOrUpdate(list);
                log.info("数据同步完成，共同步 {} æ¡æ•°æ®", affected);
            }

            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");
        JSONArray valueArray = new JSONArray();
        valueArray.add("agree");

        condition.put("value", valueArray);
        condition.put("type", "ARRAY");
        condition.put("operator", "in");
        condition.put("componentName", "SelectField");
        searchConditions.add(condition);

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

        // é»˜è®¤æŒ‰ä¿®æ”¹æ—¶é—´å‡åºæŽ’序，确保分页拉取数据的连续性
        // "+" è¡¨ç¤ºå‡åºï¼Œ"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) {
@@ -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

 src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java

@@ -32,6 +32,7 @@
    private Integer id;

    @ApiModelProperty("产品ID")
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productId;

    @ApiModelProperty("关联检测标准主表id")

 src/main/resources/application-zsjc.yml

@@ -32,6 +32,7 @@
    app-type: "APP_UY8XMO7GNA8OF08EFNVQ"
    produce-plan-form-uuid: "FORM-4IA66891C5H3QWMDBSGO05C0OX9628GRPYF7L8"
    material-code-form-uuid: "FORM-8I666N718RW4ALO4ETYDDB0U6U8T3EIWTQ0ALL1"
    customer-code-form-uuid: "FORM-4V966QC1M8B5W4Q89M1VL4ZURJ6C3FVA021ALE"
    system-token: "4J766L91OFH3V612E7LG5B4DI8M13MQF9VF7LG4"
    # æŽ¥å£åœ°å€
    access-token-url: "https://oapi.dingtalk.com/gettoken"
@@ -264,4 +265,4 @@

file:
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads

 src/main/resources/mapper/basic/BaseParamMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.BaseParamMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.BaseParam">
        <id column="id" property="id"/>
        <result column="param_key" property="paramKey"/>
        <result column="param_name" property="paramName"/>
        <result column="param_type" property="paramType"/>
        <result column="param_format" property="paramFormat"/>
        <result column="value_mode" property="valueMode"/>
        <result column="unit" property="unit"/>
        <result column="default_value" property="defaultValue"/>
        <result column="default_min" property="defaultMin"/>
        <result column="default_max" property="defaultMax"/>
        <result column="is_required" property="isRequired"/>
        <result column="remark" property="remark"/>
        <result column="create_user" property="createUser"/>
        <result column="create_time" property="createTime"/>
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="tenant_id" property="tenantId"/>
    </resultMap>


</mapper>