Browse Source

Merge remote-tracking branch 'origin/release-dev-1.0-mac' into release-1.0_yc

gxt 1 year ago
parent
commit
09a00409d2

+ 2 - 2
src/main/java/com/gct/aoid/config/QuartzTaskConfig.java

@@ -319,7 +319,7 @@ public class QuartzTaskConfig {
319
      * 稀油标定系数任务
319
      * 稀油标定系数任务
320
      * @return
320
      * @return
321
      */
321
      */
322
-    @Bean
322
+//    @Bean
323
     public JobDetail CalibrationParameterJob() {
323
     public JobDetail CalibrationParameterJob() {
324
 
324
 
325
         CalibrationParameterJobProperties property = jobConfigProperties.getCalibrationParameterJob();
325
         CalibrationParameterJobProperties property = jobConfigProperties.getCalibrationParameterJob();
@@ -343,7 +343,7 @@ public class QuartzTaskConfig {
343
      * 稀油标定系数任务触发器
343
      * 稀油标定系数任务触发器
344
      * @return
344
      * @return
345
      */
345
      */
346
-    @Bean
346
+//    @Bean
347
     public Trigger CalibrationParameterJobTrigger() throws IOException{
347
     public Trigger CalibrationParameterJobTrigger() throws IOException{
348
         CalibrationParameterJobProperties property = jobConfigProperties.getCalibrationParameterJob();
348
         CalibrationParameterJobProperties property = jobConfigProperties.getCalibrationParameterJob();
349
         try {
349
         try {

+ 7 - 0
src/test/java/com/gct/aoid/service/impl/Dgns_gtbaseparamServiceImplTest.java

@@ -0,0 +1,7 @@
1
+package com.gct.aoid.service.impl;
2
+
3
+import static org.junit.jupiter.api.Assertions.*;
4
+
5
+class Dgns_gtbaseparamServiceImplTest {
6
+
7
+}