diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java index 2e8e7a59..f17f6012 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/dto/LogDTO.java @@ -16,10 +16,13 @@ public class LogDTO implements Serializable { /**内容*/ private String logContent; - /**日志类型(0:操作日志;1:登录日志;2:定时任务) */ + /** 日志类型（1登录日志，2操作日志） */ private Integer logType; - /**操作类型(1:添加;2:修改;3:删除;) */ + + /** + * 操作类型（1查询，2添加，3修改，4删除,5导入，6导出） + */ private Integer operateType; /**登录用户 */ diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/YouBianCodeUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/YouBianCodeUtil.java index dbc6d80e..f5c738fd 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/YouBianCodeUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/YouBianCodeUtil.java @@ -84,7 +84,8 @@ public class YouBianCodeUtil { return getNextYouBianCode(localCode); }else{ - parentCode = parentCode + "A"+ getNextStrNum(0); + int num = Integer.parseInt(localCode.substring(localCode.length()-2,localCode.length())); + parentCode = parentCode + "A"+ getNextStrNum(num); } return parentCode; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 8bdcbb4a..7a8e4550 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -16,6 +16,7 @@ import com.jero.common.util.YouBianCodeUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysDepartMapper; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserDepartService; @@ -62,6 +63,9 @@ public class SysDepartController { private ISysUserService sysUserService; @Autowired private ISysUserDepartService sysUserDepartService; + + @Autowired + private SysDepartMapper sysDepartMapper; /** * 查询数据 查出我的部门,并以树结构数据格式响应给前端 * @@ -171,6 +175,10 @@ public class SysDepartController { public Results add(@RequestBody SysDepart sysDepart, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); try { + long count = sysDepartMapper.selectCountByPId(sysDepart); + if(count > 0){ + return Results.error("同级目录下，名称不能重复"); + } sysDepart.setCreateBy(username); sysDepartService.saveDepartData(sysDepart, username); return Results.OK("操作成功!"); @@ -191,6 +199,10 @@ public class SysDepartController { @PostMapping("/edit") @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Results edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) { + long count = sysDepartMapper.selectCountByPId(sysDepart); + if(count > 0){ + return Results.error("同级目录下，名称不能重复"); + } String username = JwtUtil.getUserNameByToken(request); sysDepart.setUpdateBy(username); SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 53af3341..d89b3ddf 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -167,6 +167,8 @@ public class SysUserController { @PostMapping("/add") public Results add(@RequestBody JSONObject jsonObject) { try { + //开始时间 + long startTime = System.currentTimeMillis(); String selectedRoles = jsonObject.getString(SELECTED_ROLES); String selectedDeparts = jsonObject.getString("selecteddeparts"); String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY); @@ -176,7 +178,13 @@ public class SysUserController { this.setUserInfo(rsaPrivateKey, user); // 保存用户走一个service 保证事务 + String id = UUID.randomUUID().toString().replace("-", ""); + user.setId(id); sysUserService.saveUser(user, selectedRoles, selectedDeparts); + long endTime = System.currentTimeMillis(); + long costTime = endTime - startTime; + baseCommonService.addLog("新增用户，id： " +id ,CommonConstant.LOG_TYPE_2, 2,null, + costTime); return Results.OK(OPTION_SUCCESS); } catch (Exception e) { SysUserController.log.error(e.getMessage(), e); @@ -235,7 +243,7 @@ public class SysUserController { //结束时间 long endTime = System.currentTimeMillis(); long costTime = endTime - startTime; - baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2,null, + baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 3,null, costTime); return Results.OK(OPTION_SUCCESS); } @@ -281,7 +289,7 @@ public class SysUserController { this.sysUserService.deleteUser(id); long endTime = System.currentTimeMillis(); long costTime = endTime - startTime; - baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3,null,costTime); + baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 4,null,costTime); return Results.OK("删除用户成功"); } @@ -297,7 +305,7 @@ public class SysUserController { long endTime = System.currentTimeMillis(); long costTime = endTime - startTime; - baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3,null,costTime); + baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 4,null,costTime); return Results.OK("批量删除用户成功"); } @@ -1281,7 +1289,8 @@ public class SysUserController { } long endTime = System.currentTimeMillis(); long costTime = endTime - startTime; - baseCommonService.addLog("移动端编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2,null,costTime); + baseCommonService.addLog("移动端编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 3,null, + costTime); } catch (Exception e) { SysUserController.log.error(e.getMessage(), e); return Results.error("操作失败!"); @@ -1475,7 +1484,7 @@ public class SysUserController { sysUserService.addRoleToUser(user, roles); endTime = System.currentTimeMillis(); costTime = endTime - startTime; - baseCommonService.addLog("编辑用户角色，id： " + id, CommonConstant.LOG_TYPE_2, 2,null,costTime); + baseCommonService.addLog("编辑用户角色，id： " + id, CommonConstant.LOG_TYPE_2, 3,null,costTime); } } } catch (Exception e) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java index 6e838f86..3394496b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java @@ -71,4 +71,7 @@ public interface SysDepartMapper extends BaseMapper { */ @Select("SELECT * FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}") List queryDeptByPid(@Param("parentId")String parentId); + + + long selectCountByPId(@org.apache.ibatis.annotations.Param("pageVO") SysDepart sysDepart); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml index 969c0c0f..8cad9901 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml @@ -52,4 +52,24 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java index 8bef2e06..6065d213 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java @@ -1,33 +1,37 @@ package com.jero.modules.system.service.impl; -import java.util.*; - import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.system.vo.SysDepartTreeModel; -import com.jero.common.util.oConvertUtils; -import org.apache.commons.lang.StringUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; +import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.FillRuleUtil; import com.jero.common.util.YouBianCodeUtil; -import com.jero.modules.system.entity.*; -import com.jero.modules.system.mapper.*; +import com.jero.common.util.oConvertUtils; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysDepartPermission; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.entity.SysUserDepart; +import com.jero.modules.system.mapper.SysDepartMapper; +import com.jero.modules.system.mapper.SysDepartPermissionMapper; +import com.jero.modules.system.mapper.SysUserDepartMapper; +import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.util.FindsDepartsChildrenUtil; +import io.netty.util.internal.StringUtil; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import io.netty.util.internal.StringUtil; +import java.util.*; /** *