添加区域树

setup-project-manager/src/main/java/com/mortals/xhx/common/code/ProductDisEnum.java

@@ -13,7 +13,7 @@ public enum ProductDisEnum {
     网关服务("smart-gateway", "smart-gateway"),
     基础服务("base-manager", "base-manager"),
     基础服务前端("base-manager-ui", "base-manager-ui"),
-    门户服务("portal-manager", "portal-platform"),
+    门户服务("portal-manager", "portal-manager"),
     门户服务前端("portal-manager-ui", "portal-manager-ui"),
     设备管理服务("device-manager", "device-platform"),
     设备管理服务前端("device-manager-ui", "device-manager-ui"),

setup-project-manager/src/main/java/com/mortals/xhx/common/utils/CharsetKit.java

@@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets;
  * @date: 2021/9/28 15:54
  */
 public class CharsetKit {
+
     /**
      * ISO-8859-1
      */
@@ -87,4 +88,15 @@ public class CharsetKit {
     public static String systemCharset() {
         return Charset.defaultCharset().name();
     }
+
+
+    public static void main(String[] args) {
+        double xxx=2.3;
+        float bbb=2.4f;
+        int intx=1;
+        long long1=1L;
+        Long aLong = new Long(long1);
+        Double aDouble = new Double(xxx);
+
+    }
 }

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/mode/BaseReq.java

@@ -26,7 +26,6 @@ public abstract class BaseReq implements Serializable {
      */
     private String dbPort;
 
-
     /**
      * db名称
      */

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/model/SetupProjectEntity.java

@@ -6,7 +6,9 @@ import cn.hutool.core.date.DateUtil;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.framework.util.ThreadPool;
 import com.mortals.xhx.module.setup.model.vo.SetupProjectVo;
 import lombok.Data;
 /**
@@ -74,11 +76,11 @@ public class SetupProjectEntity extends SetupProjectVo {
     /**
      * 备注
      */
-    private String remark;
+    private String remark="xxx";
     /**
      * 排序字段
      */
-    private Long orderNum;
+    private Long orderNum=1L;
     /**
      * 站点Id
      */
@@ -137,4 +139,44 @@ public class SetupProjectEntity extends SetupProjectVo {
         this.areaCode = "";
         this.areaName = "";
     }
+
+
+    public static void main(String[] args) {
+        /*
+        dddd
+         */
+        //ddddd
+        String str = "aaa,,,";
+        String[] ary = str.split(",");
+        System.out.println(ary.length);
+
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                //todo
+            }
+        };
+
+        ThreadPool.getInstance().execute(runnable);
+
+        if(1==1) {
+            throw new AppException("cuo");
+        }
+        int i=1;
+        if(isBusy(i)){
+            //todo
+            return;
+        }
+        if(i==1){
+            //todo
+            return;
+        }
+
+        //i<1 todo
+
+    }
+
+    public static boolean isBusy(int i){
+        return i>1&&i<2||1>2;
+    }
 }
\ No newline at end of file

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/SetupDbService.java

@@ -16,7 +16,7 @@ public interface SetupDbService {
      * 初始化db
      *
      * @param dbSetupEntity
-     * @return
+     * @return  rest对象,包含数据库实际链接等
      */
     Rest<String> initDb(DbSetupEntity dbSetupEntity);
 

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupDbServiceImpl.java

@@ -86,6 +86,7 @@ public class SetupDbServiceImpl implements SetupDbService {
             }
         } catch (Exception e) {
             log.error("链接数据库异常", e);
+            //return null;
             return Rest.fail(e.getMessage());
         }
     }

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java

@@ -101,7 +101,7 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
                 String sourcePath = this.publishPath + "/temp/project/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getDesc() + "/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getValue() + ".tar.gz";
 
                 File file = new File(sourcePath);
-                log.info("文件存在：{}", file.exists());
+                log.info("文件路径:{},存在：{}",sourcePath, file.exists());
 
                 File destDir = new File(setupProjectEntity.getProjectPath());
 
@@ -181,7 +181,7 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
             String sourceUiZipPath = path + ".zip";
             File uiZipFile = new File(sourceUiZipPath);
             File destDir = new File(setupProjectEntity.getProjectPath());
-            log.info("tar文件存在：{},zip文件存在：{}", uiFile.exists(), uiZipFile.exists());
+            log.info("tar文件存在：{},文件路径:{},zip文件存在：{},文件路径:{}", uiFile.exists(),sourceUiPath, uiZipFile.exists(),sourceUiZipPath);
             if (uiFile.exists()) {
                 //解压tar.gz
                 final TarGZipUnArchiver ua = new TarGZipUnArchiver();