[chg] 修改启动SpringApplicaiton.run(.class,args)

lift-batch-service/src/main/java/cn/com/ty/lift/batch/BatchApplication.java

@@ -17,8 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 public class BatchApplication {
 
     public static void main(String[] args) {
-        log.debug("DemoApplication startup main");
-        SpringApplication application = new SpringApplication(BatchApplication.class);
-        application.run(args);
+        log.debug("BatchApplication startup main");
+        SpringApplication.run(BatchApplication.class,args);
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/BusinessApplication.java

@@ -20,7 +20,6 @@ public class BusinessApplication {
 
     public static void main(String[] args) {
         log.debug("BusinessApplication startup main");
-        SpringApplication application = new SpringApplication(BusinessApplication.class);
-        application.run(args);
+        SpringApplication.run(BusinessApplication.class,args);
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.library.service;
 
+import cn.com.ty.lift.business.common.Judge;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
@@ -278,10 +279,7 @@ public class LiftService extends ServiceImpl<LiftMapper,Lift> {
      */
     @Transactional
     public RestResponse assemble(List<LiftImportModel> liftImportModels,Long mtCompanyId, Long projectId){
-        if(null == liftImportModels || liftImportModels.size() == 0){
-            return RestResponse.fail("没有数据");
-        }
-
+        Judge.notNull(liftImportModels,"没有数据");
         //存放新建的lift
         List<Lift> lifts = new ArrayList<>();
         //存放新建的project-lift关联信息

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.project.service;
 
+import cn.com.ty.lift.business.common.Judge;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.*;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectImportModel;
@@ -212,9 +213,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
     @Transactional
     public RestResponse assemble(List<ProjectImportModel> projectImportModels,Long mtCompanyId){
         //检查列表有效性
-        if(ObjectUtil.isEmpty(projectImportModels)){
-            return RestResponse.fail("没有数据");
-        }
+        Judge.notNull(projectImportModels,"没有数据");
         //存放新建的project
         List<Project> projects = new ArrayList<>();
         //存放新建的region
@@ -252,6 +251,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
             //查找省
             String provName = item.getProvince();
             AreaCode province = provinceList.stream().filter(areaCode -> (StrUtil.equals(areaCode.getName(), provName))).distinct().limit(1).findFirst().get();
+
             if(null == province){
                 log.error("表格数据有误，行数：{}, {}没有匹配省",rowNum,provName);
                 return RestResponse.fail(StrUtil.format("表格数据有误，行数：{}, {}没有匹配省",rowNum,provName));

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/EnterpriseApplication.java

@@ -20,7 +20,6 @@ public class EnterpriseApplication {
 
     public static void main(String[] args) {
         log.debug("EnterpriseApplication startup main");
-        SpringApplication application = new SpringApplication(EnterpriseApplication.class);
-        application.run(args);
+        SpringApplication.run(EnterpriseApplication.class,args);
     }
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/QuanApplication.java

@@ -17,8 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 public class QuanApplication {
 
     public static void main(String[] args) {
-        log.debug("DemoApplication startup main");
-        SpringApplication application = new SpringApplication(QuanApplication.class);
-        application.run(args);
+        log.debug("QuanApplication startup main");
+        SpringApplication.run(QuanApplication.class,args);
     }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/SystemApplication.java

@@ -19,8 +19,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 public class SystemApplication {
 
     public static void main(String[] args) {
-        log.debug("DemoApplication startup main");
-        SpringApplication application = new SpringApplication(SystemApplication.class);
-        application.run(args);
+        log.debug("SystemApplication startup main");
+        SpringApplication.run(SystemApplication.class,args);
     }
 }