2.0.0项目初始化

datax-common/datax-common-core/src/main/java/cn/datax/common/core/DataConstant.java

@@ -151,6 +151,31 @@ public class DataConstant {
     }
 
     /**
+     * 菜单类型
+     */
+    public enum MenuType{
+        MODULE(0,"模块"),
+        MENU(1,"菜单"),
+        BUTTON(2,"按钮");
+
+        MenuType(Integer key, String val){
+            this.key = key;
+            this.val = val;
+        }
+
+        private final Integer key;
+        private final String val;
+
+        public Integer getKey() {
+            return key;
+        }
+
+        public String getVal() {
+            return val;
+        }
+    }
+
+    /**
      * 数据范围
      */
     public enum DataScope{

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/entity/DictEntity.java

 package cn.datax.service.system.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * <p>
  * 字典编码信息表
@@ -38,4 +41,7 @@ public class DictEntity extends BaseEntity {
      * 字典描述
      */
     private String remark;
+
+    @TableField(exist = false)
+    private List<DictItemEntity> items;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/DeptVo.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class DeptVo implements Serializable {
@@ -18,4 +19,5 @@ public class DeptVo implements Serializable {
     private String parentId;
     private String deptName;
     private String deptNo;
+    private List<DictItemVo> items;
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/DictController.java

@@ -118,4 +118,15 @@ public class DictController extends BaseController {
         dictService.deleteDictById(id);
         return R.ok();
     }
+
+    /**
+     * 刷新字典
+     *
+     * @return
+     */
+    @GetMapping("/refresh")
+    public R refreshDict() {
+        dictService.refreshDict();
+        return R.ok();
+    }
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/InnerController.java

@@ -6,10 +6,7 @@ import cn.datax.common.security.annotation.DataInner;
 import cn.datax.service.system.api.dto.LogDto;
 import cn.datax.service.system.async.AsyncTask;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/inner")

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/dao/DictDao.java

@@ -3,6 +3,9 @@ package cn.datax.service.system.dao;
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.system.api.entity.DictEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DictDao extends BaseDao<DictEntity> {
 
+    /**
+     * 查询有效字典集合
+     *
+     * @return
+     * @param status
+     */
+    List<DictEntity> queryDictList(@Param("status") Integer status);
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/DictService.java

@@ -19,4 +19,6 @@ public interface DictService extends BaseService<DictEntity> {
     void updateDict(DictDto dict);
 
     void deleteDictById(String id);
+
+    void refreshDict();
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/impl/DictServiceImpl.java

 package cn.datax.service.system.service.impl;
 
+import cn.datax.common.core.DataConstant;
+import cn.datax.common.redis.service.RedisService;
 import cn.datax.service.system.api.entity.DictEntity;
 import cn.datax.service.system.api.dto.DictDto;
 import cn.datax.service.system.service.DictService;
@@ -11,6 +13,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * <p>
  * 字典编码信息表 服务实现类
@@ -29,6 +33,9 @@ public class DictServiceImpl extends BaseServiceImpl<DictDao, DictEntity> implem
     @Autowired
     private DictMapper dictMapper;
 
+    @Autowired
+    private RedisService redisService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveDict(DictDto dictDto) {
@@ -48,4 +55,15 @@ public class DictServiceImpl extends BaseServiceImpl<DictDao, DictEntity> implem
     public void deleteDictById(String id) {
         dictDao.deleteById(id);
     }
+
+    @Override
+    public void refreshDict() {
+        List<DictEntity> dictEntityList = dictDao.queryDictList(DataConstant.EnableState.ENABLE.getKey());
+        String key = "data:system:dicts";
+        Boolean hasKey = redisService.hasKey(key);
+        if (hasKey) {
+            redisService.del(key);
+        }
+        redisService.lSet(key, dictEntityList);
+    }
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/impl/UserServiceImpl.java

 package cn.datax.service.system.service.impl;
 
 import cn.datax.common.base.DataScope;
+import cn.datax.common.core.DataConstant;
 import cn.datax.common.exception.DataException;
 import cn.datax.service.system.api.dto.UserDto;
 import cn.datax.service.system.api.dto.UserPasswordDto;
@@ -172,7 +173,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                     .map(MenuEntity::getMenuPerms)
                     .collect(Collectors.toSet());
             perms = new ArrayList<>(permSet);
-            List<MenuEntity> menus = menuEntitys.stream().filter(menuEntity -> 0 == menuEntity.getMenuType() || 1 == menuEntity.getMenuType())
+            List<MenuEntity> menus = menuEntitys.stream().filter(menuEntity -> DataConstant.MenuType.MODULE.getKey() == menuEntity.getMenuType()
+                    || DataConstant.MenuType.MENU.getKey() == menuEntity.getMenuType())
                     .collect(Collectors.toList());
             routes = getRouteTree(menus, "0");
         }

datax-modules/system-service-parent/system-service/src/main/resources/mapper/DictMapper.xml

@@ -26,4 +26,20 @@
         dict_name, dict_code, remark
     </sql>
     
+    <resultMap id="QueryDictResultMap" type="cn.datax.service.system.api.entity.DictEntity" extends="BaseResultMap">
+        <collection property="items" javaType="java.util.ArrayList" ofType="cn.datax.service.system.api.entity.DictItemEntity">
+            <id column="item_id" property="id"/>
+            <result column="dict_id" property="dictId"/>
+            <result column="item_text" property="itemText"/>
+            <result column="item_value" property="itemValue"/>
+        </collection>
+    </resultMap>
+
+    <select id="queryDictList" resultMap="QueryDictResultMap">
+        SELECT d.id, d.dict_name, d.dict_code,
+        i.id as item_id, i.dict_id, i.item_text, i.item_value
+        FROM sys_dict d
+        LEFT JOIN sys_dict_item i ON d.id = i.dict_id AND i.status = #{status}
+        WHERE d.status = #{status}
+    </select>
 </mapper>