lizijie
2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790
Merge remote-tracking branch 'origin/dev' into dev
3 files modified
38 ■■■■■ changed files
screen-common/src/main/java/com/moral/util/TokenUtils.java 3 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java 32 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 3 ●●●● patch | view | raw | blame | history
screen-common/src/main/java/com/moral/util/TokenUtils.java
@@ -146,8 +146,9 @@
        destoryToken(getUidByToken(token), token);
    }
    /**
     * @Description: 销毁当前连接的token
     * @Description: 销毁当前连接的token0
     * @Param: []
     * @return: void
     * @Author: 陈凯裕
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
@@ -53,14 +53,14 @@
        Integer id = form.getId();
        //判断是否存在
        QueryWrapper existWrapper = new QueryWrapper();
        existWrapper.eq("is_delete",Constants.NOT_DELETE);
        existWrapper.eq("id",id);
        existWrapper.eq("is_delete", Constants.NOT_DELETE);
        existWrapper.eq("id", id);
        SysDictData existData = sysDictDataMapper.selectOne(existWrapper);
        //执行删除
        UpdateWrapper deleteWrapper = new UpdateWrapper();
        deleteWrapper.set("is_delete",Constants.DELETE);
        deleteWrapper.eq("id",id);
        sysDictDataMapper.update(null,deleteWrapper);
        deleteWrapper.set("is_delete", Constants.DELETE);
        deleteWrapper.eq("id", id);
        sysDictDataMapper.update(null, deleteWrapper);
        //删除缓存
        CacheUtils.clearDictionariesCache();
        //封装返回对象
@@ -75,11 +75,23 @@
        SysDictDataDTO dto = new SysDictDataDTO();
        //取参
        SysDictData sysDictData = form.formConvertEntity();
        //查询数据是否存在
        //查询旧数据用于更新
        QueryWrapper<SysDictData> existWrapper = new QueryWrapper<>();
        existWrapper.eq("is_delete", Constants.NOT_DELETE);
        existWrapper.eq("id", sysDictData.getId());
        SysDictData existData = sysDictDataMapper.selectOne(existWrapper);
        //判断key是否重复
        String key = sysDictData.getDataKey();
        QueryWrapper<SysDictData> wrapper = new QueryWrapper<>();
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        wrapper.eq("dataKey", key);
        wrapper.eq("dict_type_id", existData.getDictTypeId());
        SysDictData existKeyData = sysDictDataMapper.selectOne(wrapper);
        if (!ObjectUtils.isEmpty(existKeyData)) {
            dto.setCode(ResponseCodeEnum.DICTDATA_KEY_EXIST.getCode());
            dto.setMsg(ResponseCodeEnum.DICTDATA_KEY_EXIST.getMsg());
            return dto;
        }
        //执行更新
        sysDictDataMapper.updateById(sysDictData);
        //清除缓存
@@ -137,7 +149,7 @@
    /**
     * @Description: 根据类型名字查询对应字典的数据
     * @Param: [typeName]
     * @return: java.util.Map<java.lang.String       ,       java.lang.Object>
     * @return: java.util.Map<java.lang.String               ,               java.lang.Object>
     * @Author: 陈凯裕
     * @Date: 2021/4/16
     */
@@ -171,9 +183,9 @@
    public Map<String, SysDictData> getDictDatasByType(String type) {
        Map<String, List<SysDictData>> allDictData = getAllDictData();
        List<SysDictData> sysDictDatas = allDictData.get(type);
        Map<String,SysDictData> result = new HashMap<>();
        Map<String, SysDictData> result = new HashMap<>();
        for (SysDictData sysDictData : sysDictDatas) {
            result.put(sysDictData.getDataKey(),sysDictData);
            result.put(sysDictData.getDataKey(), sysDictData);
        }
        return result;
    }
@@ -182,7 +194,7 @@
    /**
     * @Description: 从数据库中根据字典类型读取字典数据,返回Map  Key:类型名称 value:数据集合
     * @Param: []
     * @return: java.util.Map<java.lang.String               ,               java.util.List               <               com.moral.api.entity.sysDictData>>
     * @return: java.util.Map<java.lang.String                               ,                               java.util.List                               <                               com.moral.api.entity.sysDictData>>
     * @Author: 陈凯裕
     * @Date: 2021/4/14
     */
screen-manage/src/main/resources/application-dev.yml
@@ -55,8 +55,7 @@
    filters: stat
    type: com.alibaba.druid.pool.DruidDataSource
    max-wait: 60000
    #url: jdbc:mysql://vp9l57dtd2vng7oxft1t.rwlb.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://vp9l57dtd2vng7oxft1t-rw4rm.rwlb.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: moral_123456
    test-on-borrow: false