新增注释

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/DynamicTableImpl.java

@@ -6,25 +6,19 @@ import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
 import com.storeroom.modules.dictionary.service.DynamicTableService;
 import com.storeroom.modules.dictionary.service.FieldService;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
-import com.storeroom.utils.DateUtils;
 import com.storeroom.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.stereotype.Service;
 
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+
 import javax.sql.DataSource;
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -49,14 +43,21 @@ public class DynamicTableImpl implements DynamicTableService {
             String fileTableName = "file_"+tableName;
             integerList.add(1);
             integerList.add(2);
-
+            //先查询类型1和2的数据字段
             List<FieldVO> fieldList = queryList(integerList);
+            //插入数据
             DynamicInsert(fieldList, archiveTypeId);
+            //生成表和表名创建表名
             DynamicCreateFileTable(fieldList, tableName);
+            //清楚数组
             integerList.clear();
+            //查询类型为3的字段
             integerList.add(3);
+            //生成数组
             List<FieldVO> fileList = queryList(integerList);
+            //插入数据
             DynamicInsert(fileList, archiveTypeId);
+            //创建表和生成文件表名
             DynamicCreateFileTable(fileList, fileTableName);
 
         } else {

system/src/main/java/com/storeroom/modules/system/domain/Menu.java

@@ -71,7 +71,7 @@ public class Menu extends BaseEntity implements Serializable {
     private Integer subCount = 0;
 
     @ApiModelProperty(value = "外链菜单")
-    private Boolean iFrame;
+    private Boolean iFrame = false;
 
     @Override
     public boolean equals(Object o) {

system/src/main/java/com/storeroom/modules/system/service/impl/MenuServiceImpl.java

@@ -74,6 +74,7 @@ public class MenuServiceImpl implements MenuService {
 
     /**
      * 用户角色改变时需清理缓存
+     *
      * @param currentUserId /
      * @return /
      */
@@ -100,12 +101,12 @@ public class MenuServiceImpl implements MenuService {
         if (resources.getPid().equals(0L)) {
             resources.setPid(null);
         }
-//        if(resources.getIFrame()){
-//            String http = "http://", https = "https://";
-//            if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) {
-//                throw new BaseException("外链必须以http://或者https://开头");
-//            }
-//        }
+        if (resources.getIFrame()) {
+            String http = "http://", https = "https://";
+            if (!(resources.getPath().toLowerCase().startsWith(http) || resources.getPath().toLowerCase().startsWith(https))) {
+                throw new BaseException("外链必须以http://或者https://开头");
+            }
+        }
         menuRepository.save(resources);
         // 计算子节点数目
         resources.setSubCount(0);
@@ -121,7 +122,9 @@ public class MenuServiceImpl implements MenuService {
         }
         Menu menu = menuRepository.findById(resources.getId()).orElseGet(Menu::new);
         ValidationUtil.isNull(menu.getId(), "Permission", "id", resources.getId());
-
+        if (resources.getIFrame() == null) {
+            resources.setIFrame(false);
+        }
         if (resources.getIFrame()) {
             String http = "http://", https = "https://";
             if (!(resources.getPath().toLowerCase().startsWith(http) || resources.getPath().toLowerCase().startsWith(https))) {
@@ -323,6 +326,7 @@ public class MenuServiceImpl implements MenuService {
 
     /**
      * 清理缓存
+     *
      * @param id 菜单ID
      */
     public void delCaches(Long id) {