Browse Source

合并数据迁移的内容

lijie 3 years ago
parent
commit
62b2dcec1d

+ 25 - 0
adm-business/adm-middleware/src/main/java/com/persagy/proxy/adm/handler/InitRunner.java

@@ -0,0 +1,25 @@
+package com.persagy.proxy.adm.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.openxml4j.util.ZipSecureFile;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+/**
+ * adm-middleware应用初始化
+ * @author : lijie
+ * Update By 2022/1/17 17:05
+ */
+@Component
+@Order(1)
+@Slf4j
+public class InitRunner implements CommandLineRunner {
+
+	@Override
+	public void run(String... args) throws Exception {
+		log.info("初始化...ZipSecureFile...MinInflateRatio");
+		// 初始化
+		ZipSecureFile.setMinInflateRatio(-1.0D);
+	}
+
+}

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

@@ -181,7 +181,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
                 }else{
                     major.setChildren(systemCodes);
                 }
-                
+
                 //系统下的设备类
                 if(CollUtil.isNotEmpty(systemEquipMap) && CollUtil.isNotEmpty(systemCodes)){
                     for (AdmObjectType systemType : systemCodes) {
@@ -444,7 +444,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
      * @param request
      */
     private void revertSortField(AdmDictQueryCriteria request){
-     request.setOrders("showOrder asc, name desc");
+        request.setOrders("showOrder asc, name desc");
     }
 
     /**