From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
index ad39965..df4c077 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/PipIrrMwTestWebApplication.java
@@ -1,18 +1,25 @@
package com.dy.pipIrrMwTestWeb;
+import com.dy.pipIrrGlobal.cert.WxCertUtil;
import com.dy.pipIrrMwTestWeb.p206V202404test.CommandP206V202404Ctrl;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
+import org.springframework.core.io.ResourceLoader;
+
+import java.io.InputStream;
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) //绂佹鍚姩鏁版嵁搴撹繛鎺ユ睜
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.pipIrrMwTestWeb"},
excludeFilters = {
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
- com.dy.common.apiDoc.SpringApiConfig.class //涓�绉嶆帓闄ょ被鐨勬柟寮�
+ //涓�绉嶆帓闄ょ被鐨勬柟寮�
+ com.dy.common.apiDoc.SpringApiConfig.class,
+ com.dy.pipIrrGlobal.config.DingTalk.class
}),
@ComponentScan.Filter(type = FilterType.REGEX, pattern = {
//浜岀鎺掗櫎绫荤殑鏂瑰紡锛屽啓姝ｅ垯琛ㄨ揪寮忥紝闇�瑕佸鐩爣绫荤殑瀹屽叏闄愬畾鍚嶅畬鍏ㄥ尮閰嶏紝鍚﹀垯涓嶇敓鏁�
@@ -22,14 +29,44 @@
"com.dy.common.mybatis..*",
"com.dy.common.singleDataSource..*",
"com.dy.common.webFilter..*",
- "com.dy.common.webListener..*"
+ "com.dy.common.webListener..*",
+ "com.dy.pipIrrGlobal.webCtrls..*"
})
}
)
-public class PipIrrMwTestWebApplication{
+public class PipIrrMwTestWebApplication implements CommandLineRunner {
+ @Autowired
+ private ResourceLoader resourceLoader;
public static void main(String[] args) {
SpringApplication.run(PipIrrMwTestWebApplication.class, args);
}
+ /**
+ * Spring瀹瑰櫒鍚姩瀹屾垚鍚庯紝鎵ц涓嬮潰鏂规硶
+ * @param args 鍙傛暟
+ * @throws Exception 寮傚父
+ */
+ @Override
+ public void run(String... args) throws Exception {
+ try{
+ //绛夊緟涓�涓�
+ Thread.sleep(500L);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ finally {
+ this.test() ;
+ }
+ }
+ private void test() throws Exception{
+ InputStream in = WxCertUtil.getCert_p12InputStream(resourceLoader) ;
+ System.out.println(in.available());
+
+
+ System.out.println("=====================");
+
+ byte[] bs = WxCertUtil.getKey_pemBytes(resourceLoader) ;
+ System.out.println(new String(bs));
+ }
}
--
Gitblit v1.8.0