From 712ebfaf242641fa1c1e9711a23c43a876ada26e Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 11 Nov 2024 14:41:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/gather/device/device/util/DeviceUtil.java | 7 ++++--- entrance/pom.xml | 5 +++++ .../system/dictionary/controller/DictTreeController.java | 9 +++------ .../dictionary/service/impl/DictDataServiceImpl.java | 2 ++ .../dictionary/service/impl/DictPqServiceImpl.java | 2 ++ .../dictionary/service/impl/DictTypeServiceImpl.java | 2 ++ user/Readme.md | 1 + 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/device/src/main/java/com/njcn/gather/device/device/util/DeviceUtil.java b/device/src/main/java/com/njcn/gather/device/device/util/DeviceUtil.java index bd438fe0..9a6fba40 100644 --- a/device/src/main/java/com/njcn/gather/device/device/util/DeviceUtil.java +++ b/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; -// Sm4Utils sm4 = new Sm4Utils(secretkey); -// seriesTmp = sm4.decryptData_ECB(content); + String secretkey = Sm4Utils.globalSecretKey; + Sm4Utils sm4 = new Sm4Utils(secretkey); + seriesTmp = sm4.decryptData_ECB(content); } return seriesTmp; } diff --git a/entrance/pom.xml b/entrance/pom.xml index d03bcaf3..5b1e7b58 100644 --- a/entrance/pom.xml +++ b/entrance/pom.xml @@ -21,6 +21,11 @@ device 1.0.0 + + com.njcn.gather + user + 1.0.0 + diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java index d21d9127..b2595e7b 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java +++ b/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 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 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> queryLastLevelById(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("queryLastLevelById"); LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, id); List result = dictTreeService.queryLastLevelById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } @OperateInfo(info = LogEnum.SYSTEM_COMMON) diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java index 443099df..52466a6f 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java @@ -54,6 +54,8 @@ public class DictDataServiceImpl extends ServiceImpl 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()); diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java index eb06cf6a..acbcc9ba 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java @@ -44,6 +44,8 @@ public class DictPqServiceImpl extends ServiceImpl 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); diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java index 28abfb86..2a1a1510 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java @@ -44,6 +44,8 @@ public class DictTypeServiceImpl extends ServiceImpl 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); diff --git a/user/Readme.md b/user/Readme.md index d50ebea3..e719638b 100644 --- a/user/Readme.md +++ b/user/Readme.md @@ -1,6 +1,7 @@ #### 简介 用户模块主要包含以下功能： * 用户管理 +* 角色管理 * 部门管理 * 职位管理（非必须） * 菜单资源管理