From dbf3089d808f869d99d3bac744c3d10da58b2102 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 16:32:40 +0800
Subject: [PATCH] refactor: 销售生产计划表字段修改
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 148 +++++++-------
src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java | 11
/dev/null | 27 --
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 197 +++++++++++++++++++
src/main/java/com/ruoyi/productionPlan/enums/DataSyncTypeEnum.java | 39 +++
doc/宁夏-中盛建材.sql | 85 +++++---
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 41 ++--
src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java | 11 +
src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java | 39 +++
9 files changed, 441 insertions(+), 157 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 3407354..0c8b704 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -1,37 +1,56 @@
-CREATE TABLE `production_plan`
+DROP TABLE IF EXISTS `production_plan`;
+
+CREATE TABLE production_plan
(
- `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
- `form_instance_id` VARCHAR(64) NOT NULL COMMENT '琛ㄥ崟瀹炰緥ID',
- `serial_no` VARCHAR(64) DEFAULT NULL COMMENT '鍗曟嵁娴佹按鍙�',
- `title` VARCHAR(128) DEFAULT NULL COMMENT '鍗曟嵁鏍囬',
- `originator_user_id` VARCHAR(64) DEFAULT NULL COMMENT '鍙戣捣浜篒D',
- `originator_name` VARCHAR(64) DEFAULT NULL COMMENT '鍙戣捣浜哄鍚�',
- `biz_create_time` DATETIME DEFAULT NULL COMMENT '鍗曟嵁鍒涘缓鏃堕棿',
- `project_name` VARCHAR(128) DEFAULT NULL COMMENT '椤圭洰鍚嶇О',
- `batch_no` VARCHAR(128) DEFAULT NULL COMMENT '鎵规鍙�',
- `contact_person` VARCHAR(128) DEFAULT NULL COMMENT '鑱旂郴浜�',
- `ext_text1` VARCHAR(128) DEFAULT NULL COMMENT '棰勭暀1',
- `ext_text2` VARCHAR(128) DEFAULT NULL COMMENT '棰勭暀2',
- `material_code` VARCHAR(64) DEFAULT NULL COMMENT '鐗╂枡缂栫爜',
- `material_category` VARCHAR(64) DEFAULT NULL COMMENT '鐗╂枡鍒嗙被',
- `spec_desc` VARCHAR(128) DEFAULT NULL COMMENT '瑙勬牸鎻忚堪',
- `grade_type` VARCHAR(32) DEFAULT NULL COMMENT '绛夌骇',
- `length` DECIMAL(10, 2) DEFAULT NULL COMMENT '闀垮害',
- `width` DECIMAL(10, 2) DEFAULT NULL COMMENT '瀹藉害',
- `thickness` DECIMAL(10, 2) DEFAULT NULL COMMENT '鍘氬害',
- `quantity` INT DEFAULT NULL COMMENT '鏁伴噺',
- `volume` DECIMAL(10, 4) DEFAULT NULL COMMENT '鎬讳綋绉�',
- `date_start` DATETIME DEFAULT NULL COMMENT '寮�濮嬫椂闂�',
- `date_end` DATETIME DEFAULT NULL COMMENT '缁撴潫鏃堕棿',
- `association_receipt` TEXT 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,
- `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- PRIMARY KEY (`id`),
- KEY `idx_form_instance_id` (`form_instance_id`)
-) ENGINE = INNODB
- DEFAULT CHARSET = utf8mb4 COMMENT = '閿�鍞敓浜ч渶姹�';
+ 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 '鍧楁暟',
+ 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 '鏁版嵁搴撴洿鏂版椂闂�',
+
+ INDEX idx_apply_no (apply_no),
+ 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 ='閿�鍞敓浜ц鍒�';
CREATE TABLE `product-inventory-management-zsjc`.`energy` (
`id` int NOT NULL AUTO_INCREMENT,
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
index a851947..af1965b 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -1,11 +1,11 @@
package com.ruoyi.productionPlan.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.service.ProductionPlanService;
-import com.ruoyi.productionPlan.service.impl.ProdDemandService;
-import com.ruoyi.staff.dto.StaffLeaveDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -36,4 +36,11 @@
public AjaxResult productionPlanListPage(Page page, ProductionPlanDto productionPlanDto) {
return AjaxResult.success(productionPlanService.listPage(page, productionPlanDto));
}
+
+ @GetMapping("/loadProdData")
+ @Log(title = "鎷夊彇閿�鍞敓浜ц鍒�", businessType = BusinessType.INSERT)
+ public AjaxResult loadProdData() {
+ productionPlanService.loadProdData();
+ return AjaxResult.success();
+ }
}
diff --git a/src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java b/src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java
new file mode 100644
index 0000000..d14ccc7
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/enums/DataSourceTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.productionPlan.enums;
+
+import lombok.Getter;
+
+/**
+ * <br>
+ * 鏁版嵁鏉ユ簮鏂瑰紡鏋氫妇绫�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 10:37
+ */
+@Getter
+public enum DataSourceTypeEnum {
+
+ SALES_ORDER(1, "閿�鍞鍗�"),
+ PRODUCTION_FORECAST(2, "鐢熶骇棰勬祴");
+
+ private final Integer code;
+ private final String desc;
+
+ DataSourceTypeEnum(Integer code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ public static DataSourceTypeEnum getByCode(Integer code) {
+ if (code == null) {
+ return null;
+ }
+ for (DataSourceTypeEnum type : DataSourceTypeEnum.values()) {
+ if (type.getCode().equals(code)) {
+ return type;
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/productionPlan/enums/DataSyncTypeEnum.java b/src/main/java/com/ruoyi/productionPlan/enums/DataSyncTypeEnum.java
new file mode 100644
index 0000000..02de6c5
--- /dev/null
+++ b/src/main/java/com/ruoyi/productionPlan/enums/DataSyncTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.productionPlan.enums;
+
+import lombok.Getter;
+
+/**
+ * <br>
+ * 鏁版嵁鏂瑰紡鏋氫妇绫�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/10 10:36
+ */
+@Getter
+public enum DataSyncTypeEnum {
+
+ MANUAL(1, "鎵嬪姩"),
+ SCHEDULED(2, "瀹氭椂");
+
+ private final Integer code;
+ private final String desc;
+
+ DataSyncTypeEnum(Integer code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ public static DataSyncTypeEnum getByCode(Integer code) {
+ if (code == null) {
+ return null;
+ }
+ for (DataSyncTypeEnum type : DataSyncTypeEnum.values()) {
+ if (type.getCode().equals(code)) {
+ return type;
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index 94602ad..9de571a 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -23,7 +23,7 @@
public class ProductionPlan {
/**
- * 鑷涓婚敭
+ * 涓婚敭
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -34,55 +34,19 @@
private String formInstanceId;
/**
- * 鍗曟嵁娴佹按鍙�
+ * 娴佹按鍙�
*/
private String serialNo;
/**
- * 鍗曟嵁鏍囬
+ * 鐢宠鍗曠紪鍙�
*/
- private String title;
+ private String applyNo;
/**
- * 鍙戣捣浜篒D
+ * 瀹㈡埛鍚嶇О
*/
- private String originatorUserId;
-
- /**
- * 鍙戣捣浜哄鍚�
- */
- private String originatorName;
-
- /**
- * 鍗曟嵁鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime bizCreateTime;
-
- /**
- * 椤圭洰鍚嶇О
- */
- private String projectName;
-
- /**
- * 鎵规鍙�
- */
- private String batchNo;
-
- /**
- * 鑱旂郴浜�
- */
- private String contactPerson;
-
- /**
- * 棰勭暀1
- */
- private String extText1;
-
- /**
- * 棰勭暀2
- */
- private String extText2;
+ private String customerName;
/**
* 鐗╂枡缂栫爜
@@ -90,82 +54,118 @@
private String materialCode;
/**
- * 鐗╂枡鍒嗙被
+ * 浜у搧鍚嶇О
*/
- private String materialCategory;
+ private String productName;
/**
- * 瑙勬牸鎻忚堪
+ * 浜у搧瑙勬牸
*/
- private String specDesc;
+ private String productSpec;
/**
- * 绛夌骇
+ * 闀�
*/
- private String gradeType;
+ private Integer length;
/**
- * 闀垮害
+ * 瀹�
*/
- private BigDecimal length;
+ private Integer width;
/**
- * 瀹藉害
+ * 楂�
*/
- private BigDecimal width;
+ private Integer height;
/**
- * 鍘氬害
- */
- private BigDecimal thickness;
-
- /**
- * 鏁伴噺
+ * 鍧楁暟
*/
private Integer quantity;
/**
- * 鎬讳綋绉�
+ * 鏂规暟
*/
private BigDecimal volume;
/**
- * 寮�濮嬫椂闂�
+ * 寮哄害
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime dateStart;
+ private String strength;
/**
- * 缁撴潫鏃堕棿
+ * 寮�濮嬫棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime dateEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startDate;
/**
- * 鍏宠仈鍗曟嵁
+ * 缁撴潫鏃ユ湡
*/
- private String associationReceipt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endDate;
/**
- * 鏁版嵁鏂瑰紡: 1=鎵嬪姩 2=瀹氭椂
+ * 鎻愪氦浜�
+ */
+ private String submitter;
+
+ /**
+ * 鎻愪氦浜虹粍缁�
+ */
+ private String submitOrg;
+
+ /**
+ * 澶囨敞1
+ */
+ private String remarkOne;
+
+ /**
+ * 澶囨敞2
+ */
+ private String remarkTwo;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private String creatorName;
+
+ /**
+ * 淇敼浜�
+ */
+ private String modifierName;
+
+ /**
+ * 琛ㄥ崟鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime formCreatedTime;
+
+ /**
+ * 琛ㄥ崟淇敼鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime formModifiedTime;
+
+ /**
+ * 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
*/
private Integer dataSyncType;
/**
- * 鏁版嵁鏉ユ簮: 1=閿�鍞鍗� 2=鐢熶骇棰勬祴
+ * 鏁版嵁鏉ユ簮绫诲瀷锛�1=閿�鍞鍗� 2=閿�鍞娴�
*/
private Integer dataSourceType;
/**
- * 鍒涘缓鏃堕棿
+ * 鏁版嵁搴撳垱寤烘椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
/**
- * 鏇存柊鏃堕棿
+ * 鏁版嵁搴撴洿鏂版椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
index 0638f1b..7d26b9b 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/ProductionPlanService.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
-import com.ruoyi.staff.dto.StaffLeaveDto;
/**
* <br>
@@ -18,4 +17,14 @@
*/
public interface ProductionPlanService extends IService<ProductionPlan> {
IPage<ProductionPlanDto> listPage(Page page, ProductionPlanDto productionPlanDto);
+
+ /**
+ * 鎵嬪姩鍚屾
+ */
+ void loadProdData();
+
+ /**
+ * 瀹氭椂鍚屾
+ */
+ void syncProdDataJob();
}
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java
deleted file mode 100644
index 59ad625..0000000
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProdDemandService.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.ruoyi.productionPlan.service.impl;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.framework.config.AliDingConfig;
-import com.ruoyi.productionPlan.pojo.ProductionPlan;
-import com.ruoyi.productionPlan.service.ProductionPlanService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <br>
- * 鎷夊彇閽夐拤鏁版嵁骞跺鍏�
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/09 17:31
- */
-@Slf4j
-@Service
-public class ProdDemandService {
-
- @Autowired
- private ProductionPlanService productionPlanService;
-
- @Autowired
- private AliDingConfig aliDingConfig;
-
- @Transactional(rollbackFor = Exception.class)
- public void LoadProdDemandData(Integer currentPage, Integer pageSize) {
- 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;
- }
- log.info("鎴愬姛鑾峰彇閽夐拤 AccessToken: {}", accessToken);
-
- JSONObject searchParam = new JSONObject();
- searchParam.put("appType", aliDingConfig.getAppType());
- searchParam.put("systemToken", aliDingConfig.getSystemToken());
- searchParam.put("userId", aliDingConfig.getUserId());
- searchParam.put("formUuid", aliDingConfig.getFormUuid());
- if (currentPage == null || currentPage <= 0) {
- currentPage = 1;
- }
- searchParam.put("currentPage", currentPage);
- if (pageSize == null || pageSize <= 0) {
- pageSize = 1;
- }
- searchParam.put("pageSize", pageSize);
-
- String dataRes = HttpUtils.sendPostJson(
- aliDingConfig.getSearchFormDataUrl(),
- searchParam.toJSONString(),
- StandardCharsets.UTF_8.name(),
- null,
- accessToken
- );
-
- if (StringUtils.isEmpty(dataRes)) {
- log.error("鎷夊彇瀹滄惌琛ㄥ崟鏁版嵁涓虹┖锛�");
- return;
- }
-
- 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");
- String title = item.getString("title");
-
- JSONObject originator = item.getJSONObject("originator");
- String originatorUserId = originator.getString("userId");
- String originatorName = originator.getJSONObject("userName").getString("nameInChinese");
-
- JSONObject formData = item.getJSONObject("formData");
- String projectName = formData.getString("textField_lbkozohg");
- String batchNo = formData.getString("textField_l7fytfco");
- String contactPerson = formData.getString("textareaField_l7fytfcy");
-
- JSONArray tableArr = formData.getJSONArray("tableField_l7fytfcn");
-
- if (tableArr == null) {
- 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.setTitle(title);
- plan.setOriginatorUserId(originatorUserId);
- plan.setOriginatorName(originatorName);
- plan.setProjectName(projectName);
- plan.setBatchNo(batchNo);
- plan.setContactPerson(contactPerson);
- plan.setMaterialCode(row.getString("textField_l9xo62q5"));
- plan.setMaterialCategory(row.getString("textField_l9xo62q7"));
- plan.setSpecDesc(row.getString("textField_l9xo62q8"));
- plan.setGradeType(row.getString("radioField_m9urarr2"));
- plan.setLength(row.getBigDecimal("numberField_lb7lgatg"));
- plan.setWidth(row.getBigDecimal("numberField_lb7lgath"));
- plan.setThickness(row.getBigDecimal("numberField_lb7lgati"));
- plan.setQuantity(row.getInteger("numberField_lb7lgatj"));
- plan.setVolume(row.getBigDecimal("numberField_l7fytfd3"));
-
- // 鏃ユ湡
- JSONArray dateArr = row.getJSONArray("cascadeDateField_lfxqqluw");
- if (dateArr != null && dateArr.size() == 2) {
- long start = dateArr.getLongValue(0);
- long end = dateArr.getLongValue(1);
-
- plan.setDateStart(Instant.ofEpochMilli(start)
- .atZone(ZoneId.systemDefault())
- .toLocalDateTime());
-
- plan.setDateEnd(Instant.ofEpochMilli(end)
- .atZone(ZoneId.systemDefault())
- .toLocalDateTime());
- }
- plan.setDataSyncType(2);
- plan.setDataSourceType(1);
- plan.setCreateTime(LocalDateTime.now());
-
- list.add(plan);
- }
- }
-
- if (!list.isEmpty()) {
- productionPlanService.saveBatch(list);
- }
- log.info("鍚屾鐢熶骇闇�姹傛暟鎹畬鎴愶紝鍏� {} 鏉�", list.size());
- }
-
-}
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index 3af485b..9911a70 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -1,8 +1,14 @@
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.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.mapper.ProductionPlanMapper;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
@@ -10,6 +16,16 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.List;
/**
* <br>
@@ -24,6 +40,10 @@
@Slf4j
@Service
public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
+
+ @Autowired
+ private AliDingConfig aliDingConfig;
+
@Autowired
private ProductionPlanMapper productionPlanMapper;
@@ -31,4 +51,181 @@
public IPage<ProductionPlanDto> listPage(Page page, ProductionPlanDto productionPlanDto) {
return productionPlanMapper.listPage(page, productionPlanDto);
}
+
+ /**
+ * 椤甸潰鎵嬪姩鍚屾
+ */
+ @Override
+ public void loadProdData() {
+ syncProdData(1);
+ }
+
+ /**
+ * 瀹氭椂浠诲姟鍚屾
+ */
+ @Override
+ public void syncProdDataJob() {
+ syncProdData(2);
+ }
+
+ /**
+ * 鍚屾鏁版嵁
+ */
+ @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);
+ return;
+ }
+
+ log.info("鑾峰彇AccessToken鎴愬姛: {}", accessToken);
+
+ // 鏌ヨ琛ㄥ崟鏁版嵁
+ JSONObject searchParam = new JSONObject();
+ searchParam.put("appType", aliDingConfig.getAppType());
+ searchParam.put("systemToken", aliDingConfig.getSystemToken());
+ searchParam.put("userId", aliDingConfig.getUserId());
+ searchParam.put("formUuid", aliDingConfig.getFormUuid());
+
+ String dataRes = HttpUtils.sendPostJson(
+ aliDingConfig.getSearchFormDataUrl(),
+ searchParam.toJSONString(),
+ StandardCharsets.UTF_8.name(),
+ null,
+ accessToken
+ );
+
+ if (StringUtils.isEmpty(dataRes)) {
+ log.error("鎷夊彇瀹滄惌鏁版嵁涓虹┖");
+ return;
+ }
+
+ 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;
+ }
+
+ // 瑙ｆ瀽鏄庣粏
+ 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) {
+ 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 (!list.isEmpty()) {
+ saveBatch(list);
+ }
+ log.info("鐢熶骇璁″垝鍚屾瀹屾垚锛屽叡 {} 鏉�", list.size());
+ } catch (Exception e) {
+ log.error("鍚屾鐢熶骇璁″垝寮傚父", e);
+ }
+ }
+
+ 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;
+ }
+ }
}
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 9c85b11..22812ac 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -9,37 +9,38 @@
<id property="id" column="id"/>
<result property="formInstanceId" column="form_instance_id"/>
<result property="serialNo" column="serial_no"/>
- <result property="title" column="title"/>
- <result property="originatorUserId" column="originator_user_id"/>
- <result property="originatorName" column="originator_name"/>
- <result property="bizCreateTime" column="biz_create_time"/>
- <result property="projectName" column="project_name"/>
- <result property="batchNo" column="batch_no"/>
- <result property="contactPerson" column="contact_person"/>
- <result property="extText1" column="ext_text1"/>
- <result property="extText2" column="ext_text2"/>
+ <result property="applyNo" column="apply_no"/>
+ <result property="customerName" column="customer_name"/>
<result property="materialCode" column="material_code"/>
- <result property="materialCategory" column="material_category"/>
- <result property="specDesc" column="spec_desc"/>
- <result property="gradeType" column="grade_type"/>
+ <result property="productName" column="product_name"/>
+ <result property="productSpec" column="product_spec"/>
<result property="length" column="length"/>
<result property="width" column="width"/>
- <result property="thickness" column="thickness"/>
+ <result property="height" column="height"/>
<result property="quantity" column="quantity"/>
<result property="volume" column="volume"/>
- <result property="dateStart" column="date_start"/>
- <result property="dateEnd" column="date_end"/>
- <result property="associationReceipt" column="association_receipt"/>
+ <result property="strength" column="strength"/>
+ <result property="startDate" column="start_date"/>
+ <result property="endDate" column="end_date"/>
+ <result property="submitter" column="submitter"/>
+ <result property="submitOrg" column="submit_org"/>
+ <result property="remarkOne" column="remark_one"/>
+ <result property="remarkTwo" column="remark_two"/>
+ <result property="creatorName" column="creator_name"/>
+ <result property="modifierName" column="modifier_name"/>
+ <result property="formCreatedTime" column="form_created_time"/>
+ <result property="formModifiedTime" column="form_modified_time"/>
<result property="dataSyncType" column="data_sync_type"/>
<result property="dataSourceType" column="data_source_type"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
- <select id="listPage" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
- SELECT
- production_plan.*
+
+ <select id="listPage" resultMap="ProductionPlanResultMap">
+ SELECT *
FROM production_plan
- where 1=1
+ WHERE 1 = 1
</select>
+
</mapper>
\ No newline at end of file
diff --git a/src/test/com/ruoyi/productionPlan/service/ProdDemandServiceTest.java b/src/test/com/ruoyi/productionPlan/service/ProdDemandServiceTest.java
deleted file mode 100644
index dbd35d4..0000000
--- a/src/test/com/ruoyi/productionPlan/service/ProdDemandServiceTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.productionPlan.service;
-
-import com.ruoyi.productionPlan.service.impl.ProdDemandService;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-/**
- * <br>
- *
- * </br>
- *
- * @author deslrey
- * @version 1.0
- * @since 2026/03/10 9:15
- */
-@SpringBootTest
-class ProdDemandServiceTest {
-
- @Autowired
- private ProdDemandService prodDemandService;
-
- @Test
- void loadProdDemandData() {
- prodDemandService.LoadProdDemandData(1, 1);
- }
-}
\ No newline at end of file
--
Gitblit v1.9.3