更新日志

gis_admin/src/main/java/com/gis/admin/service/SysResourceService.java

@@ -27,4 +27,6 @@ public interface SysResourceService extends IBaseService<SysResourceEntity, Long
     Result testCatch();
 
     List<SysResourceEntity> getPermissionByUserIdAndType(Long userId, String type);
+
+     List<SysResourceEntity> findCacheAll();
 }

gis_admin/src/main/java/com/gis/admin/service/impl/SysResourceServiceImpl.java

@@ -170,7 +170,8 @@ public class SysResourceServiceImpl extends IBaseServiceImpl<SysResourceEntity,
      * 2021-07-16 list放到redis后， id会为null
      */
 
-    private List<SysResourceEntity> findCacheAll(){
+    @Override
+    public List<SysResourceEntity> findCacheAll(){
         List all = redisUtil.getJsonList(REDIS_RESOURCE_KEY, SysResourceEntity.class);
         if (all == null) {
             log.info("从数据库获取");

gis_admin/src/main/java/com/gis/admin/service/impl/SysRoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gis.admin.service.impl;
 
+import com.gis.admin.entity.po.SysResourceEntity;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.common.base.service.impl.IBaseServiceImpl;
@@ -19,11 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Condition;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 
 /**
@@ -120,7 +119,9 @@ public class SysRoleServiceImpl extends IBaseServiceImpl<SysRoleEntity, Long> im
         // 添加权限
         if (flag){
             if (param.getResources() != null){
-                for (long i : param.getResources()) {
+                Set<Long> menuAndSonId = getMenuAndSonId(param.getResources());
+                log.info("更新的权限id: {}", menuAndSonId);
+                for (long i : menuAndSonId) {
                     this.saveRoleResource(roleEntity.getId(), i);
                 }
                 return Result.success();
@@ -131,6 +132,36 @@ public class SysRoleServiceImpl extends IBaseServiceImpl<SysRoleEntity, Long> im
     }
 
     /**
+     * 合并父子id
+     * @param resources 子id
+     * @return
+     */
+    public Set<Long> getMenuAndSonId(Set<Long> resources){
+        // 查询所有资源
+        List<SysResourceEntity> all = sysResourceService.findCacheAll();
+        Set<Long> menuIds = new HashSet<>();
+        for (SysResourceEntity entity : all) {
+            if ("button".equals(entity.getResourceType())){
+                if (resources.contains(entity.getId())){
+                    menuIds.add(entity.getParentId());
+                }
+            }
+        }
+
+        // 处理二级菜单
+        for (SysResourceEntity entity : all) {
+            if (menuIds.contains(entity.getId()) && "menu".equals(entity.getResourceType())){
+                if (entity.getParentId()!=null){
+                    menuIds.add(entity.getParentId());
+                }
+            }
+        }
+
+        resources.addAll(menuIds);
+        return resources;
+    }
+
+    /**
      * 判断用户名是否重复
      * @param roleName
      * @return

gis_application/src/main/resources/sh/startup.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
-RESOURCE_NAME=army_chongqing_college.jar
+RESOURCE_NAME=army_beijing_hospital.jar
 APP_DEBUG=5005
 rm -f tpid
-nohup java -jar -Xmx3072M -Xms512M ./$RESOURCE_NAME --spring.profiles.active=sit --server.port=8005 & echo $! > tpid
+nohup java -jar -Xmx3072M -Xms512M ./$RESOURCE_NAME --spring.profiles.active=sit --server.port=8014 & echo $! > tpid
 echo Start Success!
 
 

gis_cms/src/main/java/com/gis/cms/entity/dto/ExpertWebDto.java

@@ -1,5 +1,6 @@
 package com.gis.cms.entity.dto;
 
+import com.gis.common.base.entity.dto.PageDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,15 +13,14 @@ import java.io.Serializable;
  * 专家
  */
 @Data
-public class ExpertWebDto implements Serializable {
+public class ExpertWebDto extends PageDto implements Serializable {
 
     private static final long serialVersionUID = 2684221237124140925L;
 
-    @NotBlank(message = "类型不能为空")
+//    @NotBlank(message = "类型不能为空")
     @ApiModelProperty(value = "专家类型：1：一级，2：二级，3：三级，4：院士, 5:其他，loyal_1: 百世老人， loyal_2：英模专家", required = true)
     private String type;
 
-    @ApiModelProperty(value = "搜索条件", name = "searchKey")
-    private String searchKey;
+
 
 }

gis_cms/src/main/java/com/gis/cms/service/impl/ExpertServiceImpl.java

@@ -48,7 +48,7 @@ public class ExpertServiceImpl extends IBaseServiceImpl<ExpertEntity, Long> impl
         typeMap.put("2", "2");
         typeMap.put("3", "3");
         typeMap.put("4", "4");
-        typeMap.put("5", "4");
+        typeMap.put("5", "5");
         typeMap.put("loyal_1", "1");
         typeMap.put("loyal_2", "2");
     }
@@ -85,70 +85,28 @@ public class ExpertServiceImpl extends IBaseServiceImpl<ExpertEntity, Long> impl
         entityMapper.addVisit(id);
     }
 
-//    @Override
-//    public Result<ExpertEntity> webList(String type) {
-//        List<ExpertEntity> all = this.findAll();
-//
-//        List<ExpertEntity> levle_1 = new ArrayList<>();
-//        List<ExpertEntity> levle_2 = new ArrayList<>();
-//        List<ExpertEntity> levle_3 = new ArrayList<>();
-//        List<ExpertEntity> levle_4 = new ArrayList<>();
-//        List<ExpertEntity> levle_5 = new ArrayList<>();
-//        // 忠诚力量
-//        List<ExpertEntity> loyal_1 = new ArrayList<>();
-//        List<ExpertEntity> loyal_2 = new ArrayList<>();
-//        for (ExpertEntity entity : all) {
-//            Integer level = entity.getLevel();
-//            String type = entity.getType();
-//            if (level == 1) {
-//                levle_1.add(entity);
-//            } else if (level == 2) {
-//                levle_2.add(entity);
-//            } else if (level == 3) {
-//                levle_3.add(entity);
-//            }else if (level == 4) {
-//                levle_4.add(entity);
-//            }else if (level == 5) {
-//                levle_5.add(entity);
-//            }
-//
-//            // 添加 忠诚力量
-//            if (StringUtils.isNotBlank(type)) {
-//                if ("1".equals(type)){
-//                    loyal_1.add(entity);
-//                } else {
-//                    loyal_2.add(entity);
-//                }
-//            }
-//        }
-//        HashMap<Object, Object> result = new HashMap<>();
-//        result.put("level_1", levle_1);
-//        result.put("level_2", levle_2);
-//        result.put("level_3", levle_3);
-//        result.put("level_4", levle_4);
-//        result.put("level_5", levle_5);
-//        result.put("loyal_1", loyal_1);
-//        result.put("loyal_2", loyal_2);
-//
-//        return Result.success(result);
-//    }
+
 
     @Override
     public Result<ExpertEntity> webList(ExpertWebDto param) {
+        startPage(param);
         StringBuffer sql = new StringBuffer();
         sql.append("select * from tb_expert where is_delete = '0' and display=1 ");
-        @NotBlank(message = "类型不能为空") String type = param.getType();
-        String [] typeCheck = {"1","2","3","4","5","loyal_1","loyal_2"};
-        if (!Arrays.asList(typeCheck).contains(type)) {
-            return Result.failure("非法类型");
-        }
-        String key = typeMap.get(type);
-        if (type.startsWith("loyal_")){
-            sql.append(" and type='").append(key).append("'");
-        } else {
-            sql.append(" and level=").append(key);
+        String type = param.getType();
+        if (StringUtils.isNotBlank(type)){
+            String [] typeCheck = {"1","2","3","4","5","loyal_1","loyal_2"};
+            if (!Arrays.asList(typeCheck).contains(type)) {
+                return Result.failure("非法类型");
+            }
+            String key = typeMap.get(type);
+            if (type.startsWith("loyal_")){
+                sql.append(" and type='").append(key).append("'");
+            } else {
+                sql.append(" and level=").append(key);
+            }
         }
 
+
         String searchKey = param.getSearchKey();
         if (StringUtils.isNotBlank(searchKey)){
             searchKey = RegexUtil.sqlReplaceSpecialStr(searchKey);
@@ -158,8 +116,9 @@ public class ExpertServiceImpl extends IBaseServiceImpl<ExpertEntity, Long> impl
         sql.append(" order by sort, create_time desc");
         log.info("sql: {}", sql.toString());
 
+        List<ExpertEntity> expertEntities = entityMapper.expertSql(sql.toString());
 
-        return Result.success(entityMapper.expertSql(sql.toString()));
+        return Result.success(new PageInfo<>(expertEntities));
     }