微调

device/src/main/java/com/njcn/gather/device/device/util/DeviceUtil.java

@@ -1,5 +1,6 @@
 package com.njcn.gather.device.device.util;
 
+import com.njcn.common.utils.sm.Sm4Utils;
 import com.njcn.common.utils.sm.ThreeDesUtil;
 import org.apache.commons.codec.binary.Base64;
 
@@ -28,9 +29,9 @@ public class DeviceUtil {
             seriesTmp = ThreeDesUtil.decryptThreeDes(content);
         } else if (cd == 2) {
             //SM4加密密码
-//            String secretkey = Sm4Utils.globalSecretKey;
+            String secretkey = Sm4Utils.globalSecretKey;
-//            Sm4Utils sm4 = new Sm4Utils(secretkey);
+            Sm4Utils sm4 = new Sm4Utils(secretkey);
-//            seriesTmp = sm4.decryptData_ECB(content);
+            seriesTmp = sm4.decryptData_ECB(content);
         }
         return seriesTmp;
     }

entrance/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>device</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn.gather</groupId>
+            <artifactId>user</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java

@@ -58,14 +58,12 @@ public class DictTreeController extends BaseController {
         }
     }
 
-
-
     /**
      * 修改
      * @param dicParam 修改参数
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
-    @PutMapping("/update")
+    @PostMapping("/update")
     @ApiOperation("修改")
     @ApiImplicitParam(name = "dicParam", value = "数据", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated DictTreeParam.DictTreeUpdateParam dicParam) {
@@ -84,7 +82,7 @@ public class DictTreeController extends BaseController {
      * @param id id
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
-    @DeleteMapping("/delete")
+    @PostMapping("/delete")
     @ApiOperation("删除")
     @ApiImplicitParam(name = "id", value = "id", required = true)
     public HttpResult<Boolean> delete(@RequestParam @Validated String id) {
@@ -131,14 +129,13 @@ public class DictTreeController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/queryByid")
+    @PostMapping("/queryLastLevelById")
     @ApiOperation("根据id查询字典树最底层")
     public HttpResult<List<DictTreeVO>> queryLastLevelById(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("queryLastLevelById");
         LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, id);
         List<DictTreeVO> result = dictTreeService.queryLastLevelById(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-
     }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)

system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java

@@ -54,6 +54,8 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
                 //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
                 queryWrapper.orderBy(true, true, "sys_dict_data.sort").orderByDesc("sys_dict_data.update_time");
             }
+        } else {
+            queryWrapper.orderBy(true, true, "sys_dict_data.sort").orderByDesc("sys_dict_data.update_time");
         }
         queryWrapper.ne("sys_dict_data.state", DataStateEnum.DELETED.getCode())
                 .eq("sys_dict_data.type_id", queryParam.getTypeId());

system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java

@@ -44,6 +44,8 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
                 //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
                 queryWrapper.orderBy(true, true, "sys_dict_pq.sort").orderByDesc("sys_dict_pq.update_time");
             }
+        } else {
+            queryWrapper.orderBy(true, true, "sys_dict_pq.sort").orderByDesc("sys_dict_pq.update_time");
         }
         queryWrapper.ne("sys_dict_pq.state", DataStateEnum.DELETED.getCode());
         return this.baseMapper.selectPage(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);

system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java

@@ -44,6 +44,8 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
                 //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
                 queryWrapper.orderBy(true, true, "sys_dict_type.sort").orderByDesc("sys_dict_type.update_time");
             }
+        } else {
+            queryWrapper.orderBy(true, true, "sys_dict_type.sort").orderByDesc("sys_dict_type.update_time");
         }
         queryWrapper.ne("sys_dict_type.state", DataStateEnum.DELETED.getCode());
         return this.baseMapper.selectPage(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);

user/Readme.md

@@ -1,6 +1,7 @@
 #### 简介
     用户模块主要包含以下功能：
 * 用户管理
+* 角色管理
 * 部门管理
 * 职位管理（非必须）
 * 菜单资源管理