微调

jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -4,9 +4,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.catalina.Context;
 import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.jeecg.common.util.oConvertUtils;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -23,26 +20,15 @@ import java.net.UnknownHostException;
 @SpringBootApplication
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-//        return application.sources(JeecgSystemApplication.class);
-//    }
-    public static class CustomGenerator implements BeanNameGenerator {
-
-        @Override
-        public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
-            return definition.getBeanClassName();
-        }
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(JeecgSystemApplication.class);
     }
 
     public static void main(String[] args) throws UnknownHostException {
-
-        ConfigurableApplicationContext application = new SpringApplicationBuilder(JeecgSystemApplication.class)
-                .beanNameGenerator(new CustomGenerator())
-                .run(args);
         //System.setProperty("spring.devtools.restart.enabled", "true");
 
-//        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
+        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
         Environment env = application.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/WebApi.java

@@ -10,6 +10,7 @@ import kingdee.bos.webapi.client.K3CloudApiClient;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.base.service.BaseCommonService;
 import org.jeecg.modules.iost.ims.Dao.CategoryDao;
 import org.jeecg.modules.iost.ims.Exception.ConnectConstant.KingDeeConstant;
 import org.jeecg.modules.iost.ims.Exception.KingdeeConnectException;
@@ -244,7 +245,10 @@ public class WebApi {
         }
         return Result.OK("参数正确,金蝶云连接成功");
     }
-
+    @Autowired
+    IQuartzJobService iQuartzJobService;
+    @Autowired
+    BaseCommonService baseCommonService;
     /*页面获取保存参数功能*/
     @GetMapping("/GetSaveParm")
     @AutoLog(value = "第三方通用接口-页面获取保存参数功能")
@@ -263,6 +267,8 @@ public class WebApi {
         imsConParm.setUrl(imsInitConnectParm.getUrl());
         connectParmVo.setKingdeeConnectParm(kingdeeConnectParm);
         connectParmVo.setImsConParm(imsConParm);
+        QuartzJob quartzJob = iQuartzJobService.getBaseMapper().selectById("999");
+        connectParmVo.setIsSynchronize(quartzJob.getStatus().equals(-1)?false:true);
         return Result.OK(connectParmVo);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/entity/Vo/ConnectParmVo.java

 package org.jeecg.modules.iost.ims.entity.Vo;
 
 import lombok.Data;
+import org.apache.xpath.operations.Bool;
+
 /*金蝶云和ims连接参数Vo*/
 @Data
 public class ConnectParmVo {
     private kingdeeConnectParm kingdeeConnectParm;
     private imsConnectParm imsConParm;
+    private Boolean IsSynchronize;
 }