From 30613a5c9e36e4c60f1f77793739ac954dfbe522 Mon Sep 17 00:00:00 2001
From: Administrator <2856754968@qq.com>
Date: 星期二, 18 十一月 2025 09:02:03 +0800
Subject: [PATCH] 111
---
src/main/java/com/gs/xky/entity/VwCjScSjTsBbMonth.java | 55 ++++++++++--------
src/main/java/com/gs/xky/task/ScheduledTasks.java | 2
src/main/java/com/gs/xky/entity/VwCjScSjTsBb.java | 35 ++++++-----
src/main/java/com/gs/xky/service/Impl/VwCjScSjTsBbServiceImpl.java | 4 -
src/test/java/com/gs/xky/XkyApplicationTests.java | 30 +++++-----
5 files changed, 65 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/gs/xky/entity/VwCjScSjTsBb.java b/src/main/java/com/gs/xky/entity/VwCjScSjTsBb.java
index a524c53..f2439e2 100644
--- a/src/main/java/com/gs/xky/entity/VwCjScSjTsBb.java
+++ b/src/main/java/com/gs/xky/entity/VwCjScSjTsBb.java
@@ -7,74 +7,77 @@
import java.io.Serializable;
/**
- *
+ *
* @TableName VW_CJ_SC_SJ_TS_BB
*/
-@TableName(value = "VW_CJ_SC_SJ_TS_BB")
+@TableName(value ="VW_CJ_SC_SJ_TS_BB")
@Data
public class VwCjScSjTsBb implements Serializable {
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
/**
* 鐗╂枡鍚嶇О
*/
private String itemName;
+
/**
* 鐗╂枡缂栫爜
*/
private String itemNo;
+
/**
* 杞﹂棿鍚嶇О
*/
private String departmentname;
+
/**
* 杞﹂棿缂栫爜
*/
- private String departmentcode;
+ private String daa001;
+
/**
* 宸ュ崟鍙�
*/
- private String daa001;
+ private String lineName;
+
/**
* 绾夸綋鍚嶇О
*/
- private String lineName;
- /**
- * 绾夸綋缂栫爜
- */
- private String lineNo;
- /**
- * 宸ュ崟鏁伴噺
- */
private String daa008;
+
/**
* 棰勮寮�宸�
*/
private String yjkg;
+
/**
* 瀹為檯寮�宸�
*/
private String sjkg;
+
/**
- * 鐢宠鍏ュ簱鏁�
+ *
*/
private String sq;
+
/**
* 鍏ュ簱
*/
private String rk;
+
/**
* 鐢宠鏈畬宸ユ暟
*/
private String sqwwg;
+
/**
* 鍏ュ簱鏈畬宸�
*/
private String rkwwg;
+
/**
* 鐢宠鏈叆搴�
*/
private String sqwrk;
-
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/entity/VwCjScSjTsBbMonth.java b/src/main/java/com/gs/xky/entity/VwCjScSjTsBbMonth.java
index 5ffcdfe..7a5fca0 100644
--- a/src/main/java/com/gs/xky/entity/VwCjScSjTsBbMonth.java
+++ b/src/main/java/com/gs/xky/entity/VwCjScSjTsBbMonth.java
@@ -7,72 +7,77 @@
import java.io.Serializable;
/**
- *
+ *
* @TableName VW_CJ_SC_SJ_TS_BB_MONTH
*/
-@TableName(value = "VW_CJ_SC_SJ_TS_BB_MONTH")
+@TableName(value ="VW_CJ_SC_SJ_TS_BB_MONTH")
@Data
public class VwCjScSjTsBbMonth implements Serializable {
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
/**
- *
+ *
*/
private String itemName;
+
/**
- *
+ *
*/
private String itemNo;
+
/**
- *
+ *
*/
private String departmentname;
+
/**
- *
- */
- private String departmentcode;
- /**
- *
+ *
*/
private String daa001;
+
/**
- *
+ *
*/
private String lineName;
+
/**
- *
- */
- private String lineNo;
- /**
- *
+ *
*/
private String daa008;
+
/**
- *
+ *
*/
private String yjkg;
+
/**
- *
+ *
*/
private String sjkg;
+
/**
- *
+ *
*/
private String sq;
+
/**
- *
+ *
*/
private String rk;
+
/**
- *
+ *
*/
private String sqwwg;
+
/**
- *
+ *
*/
private String rkwwg;
+
/**
- *
+ *
*/
private String sqwrk;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/service/Impl/VwCjScSjTsBbServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/VwCjScSjTsBbServiceImpl.java
index a0e39fd..17ab47e 100644
--- a/src/main/java/com/gs/xky/service/Impl/VwCjScSjTsBbServiceImpl.java
+++ b/src/main/java/com/gs/xky/service/Impl/VwCjScSjTsBbServiceImpl.java
@@ -138,8 +138,6 @@
writer.addHeaderAlias("itemName", "鐗╂枡鍚嶇О");
writer.addHeaderAlias("departmentname", "杞﹂棿鍚嶇О");
writer.addHeaderAlias("lineName", "绾夸綋鍚嶇О");
- writer.addHeaderAlias("departmentcode", "杞﹂棿缂栫爜");
- writer.addHeaderAlias("lineNo", "绾夸綋缂栫爜");
writer.addHeaderAlias("daa008", "宸ュ崟鏁伴噺");
writer.addHeaderAlias("yjkg", "棰勮寮�宸�");
writer.addHeaderAlias("sjkg", "瀹為檯寮�宸�");
@@ -170,8 +168,6 @@
writer.addHeaderAlias("itemName", "鐗╂枡鍚嶇О");
writer.addHeaderAlias("departmentname", "杞﹂棿鍚嶇О");
writer.addHeaderAlias("lineName", "绾夸綋鍚嶇О");
- writer.addHeaderAlias("departmentcode", "杞﹂棿缂栫爜");
- writer.addHeaderAlias("lineNo", "绾夸綋缂栫爜");
writer.addHeaderAlias("daa008", "宸ュ崟鏁伴噺");
writer.addHeaderAlias("yjkg", "棰勮寮�宸�");
writer.addHeaderAlias("sjkg", "瀹為檯寮�宸�");
diff --git a/src/main/java/com/gs/xky/task/ScheduledTasks.java b/src/main/java/com/gs/xky/task/ScheduledTasks.java
index d72876e..54567d8 100644
--- a/src/main/java/com/gs/xky/task/ScheduledTasks.java
+++ b/src/main/java/com/gs/xky/task/ScheduledTasks.java
@@ -34,7 +34,7 @@
* 瀵煎嚭鐢熶骇鏁版嵁骞跺彂閫侀拤閽夋秷鎭�
*/
@Async("taskExecutor")
- @Scheduled(cron = "0 0 9 * * ?")
+ @Scheduled(cron = "0 0 8,16 * * ?")
public void exportAndSendProductionDataTask() {
if (!exportTaskRunning.compareAndSet(false, true)) {
log.warn("鐢熶骇鏁版嵁瀵煎嚭浠诲姟姝ｅ湪鎵ц涓紝璺宠繃鏈鎵ц");
diff --git a/src/test/java/com/gs/xky/XkyApplicationTests.java b/src/test/java/com/gs/xky/XkyApplicationTests.java
index 50450be..53e20dc 100644
--- a/src/test/java/com/gs/xky/XkyApplicationTests.java
+++ b/src/test/java/com/gs/xky/XkyApplicationTests.java
@@ -31,21 +31,21 @@
void testExportAndSendProductionData() throws Exception {
System.out.println("=== 寮�濮嬫祴璇曞鍑虹敓浜ф暟鎹苟鍙戦�侀拤閽� ===");
- try {
- boolean result = vwCjScSjTsBbService.exportAndSendToDingtalk();
-
- if (result) {
- System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭骞跺彂閫佹垚鍔�");
- System.out.println(" - 鏁版嵁宸蹭粠 VW_CJ_SC_SJ_TS_BB 琛ㄦ煡璇�");
- System.out.println(" - Excel 鏂囦欢宸茬敓鎴愬苟淇濆瓨鍒� D:\\BIFile\\");
- System.out.println(" - 閽夐拤鏂囦欢娑堟伅宸插彂閫�");
- } else {
- System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭鎴栧彂閫佸け璐�");
- }
- } catch (Exception e) {
- System.out.println("鉁� 瀵煎嚭骞跺彂閫佹椂鍙戠敓寮傚父: " + e.getMessage());
- e.printStackTrace();
- }
+// try {
+// boolean result = vwCjScSjTsBbService.exportAndSendToDingtalk();
+//
+// if (result) {
+// System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭骞跺彂閫佹垚鍔�");
+// System.out.println(" - 鏁版嵁宸蹭粠 VW_CJ_SC_SJ_TS_BB 琛ㄦ煡璇�");
+// System.out.println(" - Excel 鏂囦欢宸茬敓鎴愬苟淇濆瓨鍒� D:\\BIFile\\");
+// System.out.println(" - 閽夐拤鏂囦欢娑堟伅宸插彂閫�");
+// } else {
+// System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭鎴栧彂閫佸け璐�");
+// }
+// } catch (Exception e) {
+// System.out.println("鉁� 瀵煎嚭骞跺彂閫佹椂鍙戠敓寮傚父: " + e.getMessage());
+// e.printStackTrace();
+// }
System.out.println("=== 娴嬭瘯缁撴潫 ===");
}
--
Gitblit v1.9.3