diff --git a/pom.xml b/pom.xml index 7793f2c..a74a42a 100644 --- a/pom.xml +++ b/pom.xml @@ -131,12 +131,6 @@ commons-codec 1.17.1 - - com.alibaba - fastjson - 2.0.21 - - org.apache.tika tika-core diff --git a/src/main/java/com/zsc/edu/gateway/FirstTimeInitializer.java b/src/main/java/com/zsc/edu/gateway/FirstTimeInitializer.java index f3cd196..032c1db 100644 --- a/src/main/java/com/zsc/edu/gateway/FirstTimeInitializer.java +++ b/src/main/java/com/zsc/edu/gateway/FirstTimeInitializer.java @@ -39,31 +39,31 @@ public class FirstTimeInitializer implements CommandLineRunner { @Override public void run(String... args) { - if (authorityService.count() == 0L) { - Authority userPerm = new Authority(null, "用户模块", "用户管理", "SYSTEM:USER", true, null); - Authority rolePerm = new Authority(null, "角色模块", "角色管理", "SYSTEM:ROLE", true, null); - Authority deptPerm = new Authority(null, "部门模块", "部门管理", "SYSTEM:DEPT", true, null); - Authority AuthorityPerm = new Authority(null, "权限模块", "权限管理", "SYSTEM:AUTHORITY", true, null); - authorityService.saveBatch(List.of(userPerm, rolePerm, deptPerm, AuthorityPerm)); - List authorities = new ArrayList<>(); - authorities.add(new Authority(userPerm.getId(), "用户管理", "用户列表", "SYSTEM:USER:QUERY", true, null)); - authorities.add(new Authority(userPerm.getId(), "用户管理", "用户新增", "SYSTEM:USER:CREATE",true, null)); - authorities.add(new Authority(userPerm.getId(), "用户管理", "用户修改", "SYSTEM:USER:UPDATE",true, null)); - authorities.add(new Authority(userPerm.getId(), "用户管理", "用户删除", "SYSTEM:USER:DELETE",true, null)); - authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色列表", "SYSTEM:ROLE:QUERY", true, null)); - authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色新增", "SYSTEM:ROLE:CREATE",true, null)); - authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色修改", "SYSTEM:ROLE:UPDATE",true, null)); - authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色删除", "SYSTEM:ROLE:DELETE",true, null)); - authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门列表", "SYSTEM:DEPT:QUERY", true, null)); - authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门新增", "SYSTEM:DEPT:CREATE",true, null)); - authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门修改", "SYSTEM:DEPT:UPDATE",true, null)); - authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门删除", "SYSTEM:DEPT:DELETE",true, null)); - authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限列表", "SYSTEM:AUTHORITY:QUERY", true, null)); - authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限新增", "SYSTEM:AUTHORITY:CREATE",true, null)); - authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限修改", "SYSTEM:AUTHORITY:UPDATE",true, null)); - authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限删除", "SYSTEM:AUTHORITY:DELETE",true, null)); - authorityService.saveBatch(authorities); - } +// if (authorityService.count() == 0L) { +// Authority userPerm = new Authority(null, "用户模块", "用户管理", "SYSTEM:USER", true, null); +// Authority rolePerm = new Authority(null, "角色模块", "角色管理", "SYSTEM:ROLE", true, null); +// Authority deptPerm = new Authority(null, "部门模块", "部门管理", "SYSTEM:DEPT", true, null); +// Authority AuthorityPerm = new Authority(null, "权限模块", "权限管理", "SYSTEM:AUTHORITY", true, null); +// authorityService.saveBatch(List.of(userPerm, rolePerm, deptPerm, AuthorityPerm)); +// List authorities = new ArrayList<>(); +// authorities.add(new Authority(userPerm.getId(), "用户管理", "用户列表", "SYSTEM:USER:QUERY", true, null)); +// authorities.add(new Authority(userPerm.getId(), "用户管理", "用户新增", "SYSTEM:USER:CREATE",true, null)); +// authorities.add(new Authority(userPerm.getId(), "用户管理", "用户修改", "SYSTEM:USER:UPDATE",true, null)); +// authorities.add(new Authority(userPerm.getId(), "用户管理", "用户删除", "SYSTEM:USER:DELETE",true, null)); +// authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色列表", "SYSTEM:ROLE:QUERY", true, null)); +// authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色新增", "SYSTEM:ROLE:CREATE",true, null)); +// authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色修改", "SYSTEM:ROLE:UPDATE",true, null)); +// authorities.add(new Authority(rolePerm.getId(), "角色管理", "角色删除", "SYSTEM:ROLE:DELETE",true, null)); +// authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门列表", "SYSTEM:DEPT:QUERY", true, null)); +// authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门新增", "SYSTEM:DEPT:CREATE",true, null)); +// authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门修改", "SYSTEM:DEPT:UPDATE",true, null)); +// authorities.add(new Authority(deptPerm.getId(), "部门管理", "部门删除", "SYSTEM:DEPT:DELETE",true, null)); +// authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限列表", "SYSTEM:AUTHORITY:QUERY", true, null)); +// authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限新增", "SYSTEM:AUTHORITY:CREATE",true, null)); +// authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限修改", "SYSTEM:AUTHORITY:UPDATE",true, null)); +// authorities.add(new Authority(AuthorityPerm.getId(), "权限管理", "权限删除", "SYSTEM:AUTHORITY:DELETE",true, null)); +// authorityService.saveBatch(authorities); +// } if (roleService.count() == 0L) { Role admin = new Role(); admin.setName("管理员"); diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java index e886389..3d34f5e 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java @@ -1,7 +1,5 @@ package com.zsc.edu.gateway.modules.iot.device.service.impl; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -104,10 +102,6 @@ public class DeviceServiceImpl extends ServiceImpl imp throw new ConstraintException("deviceName", dto.getName(), "设备名称已存在"); } mapper.convert(dto, device); - String clientId = device.getClientId(); - if (redisUtils.hasKey("record:device:properties:" + clientId)) { - redisUtils.set("record:device:properties:" + clientId, String.valueOf(JSONObject.parseObject(device.getProperties()))); - } updateById(device); return device; } @@ -144,8 +138,6 @@ public class DeviceServiceImpl extends ServiceImpl imp public Boolean serve(DeviceServeDto dto) { Device device = baseMapper.findByClientIdAndStateAndOnline(dto.clientId, Device.Status.ACTIVATED, true); if (device != null) { - JSONObject json = (JSONObject) JSON.toJSON(dto); - json.put("type", "serve"); // amqpTemplate.convertAndSend(exchange, "send", json); redisUtils.set("serve:sendTime:" + dto.serveName + ":" + dto.clientId, String.valueOf(new Date())); return true; diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/controller/DeptController.java b/src/main/java/com/zsc/edu/gateway/modules/system/controller/DeptController.java index bd11daa..f2851dd 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/controller/DeptController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/controller/DeptController.java @@ -13,6 +13,8 @@ import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 部门Controller * @@ -46,7 +48,7 @@ public class DeptController { */ @GetMapping("/tree") @PreAuthorize("hasAuthority('SYSTEM:DEPT:QUERY')") - public Dept tree(@RequestParam Long id) { + public List tree(@RequestParam Long id) { return service.listTree(id); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/repo/MenuRepository.java b/src/main/java/com/zsc/edu/gateway/modules/system/repo/MenuRepository.java index 6ceac1e..3c5c671 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/repo/MenuRepository.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/repo/MenuRepository.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.zsc.edu.gateway.modules.system.entity.Menu; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -12,8 +13,10 @@ import java.util.List; * @author yao */ public interface MenuRepository extends BaseMapper { + List selectByRoleId(Long roleId); + List selectByUserId(Long userId, Menu.Type type); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/service/DeptService.java b/src/main/java/com/zsc/edu/gateway/modules/system/service/DeptService.java index e85ec90..31fb2b8 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/service/DeptService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/service/DeptService.java @@ -4,6 +4,8 @@ import com.zsc.edu.gateway.modules.system.dto.DeptDto; import com.zsc.edu.gateway.modules.system.entity.Dept; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 部门 服务类 @@ -34,5 +36,5 @@ public interface DeptService extends IService { * @param id * @return */ - Dept listTree(Long id); + List listTree(Long id); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java index 3989103..57fdeab 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java @@ -10,6 +10,7 @@ import com.zsc.edu.gateway.modules.system.repo.DeptRepository; import com.zsc.edu.gateway.modules.system.service.DeptService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -24,7 +25,7 @@ import java.util.Objects; * @author Yao * @since 2023-04-06 */ -@AllArgsConstructor +@RequiredArgsConstructor @Service public class DeptServiceImpl extends ServiceImpl implements DeptService { @@ -59,7 +60,7 @@ public class DeptServiceImpl extends ServiceImpl implement @Override public List listTree(Long deptId) { - List deptTrees = repo.selectDeptTree(); + List deptTrees = baseMapper.selectDeptTree(); List deptTree = TreeUtil.makeTree( deptTrees, department -> department.getPid() == null || department.getPid() == -1L, diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/utils/DeptTreeUtil.java b/src/main/java/com/zsc/edu/gateway/modules/system/utils/DeptTreeUtil.java deleted file mode 100644 index eddfe84..0000000 --- a/src/main/java/com/zsc/edu/gateway/modules/system/utils/DeptTreeUtil.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.zsc.edu.gateway.modules.system.utils; - - -import com.zsc.edu.gateway.exception.NotExistException; -import com.zsc.edu.gateway.modules.system.entity.Dept; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author Yao - */ -public class DeptTreeUtil { - - public static Dept initTree(HashSet list){ - Dept rootDept = list.stream() - // .filter(dept -> dept.id.equals(deptId)) - .filter(dept -> dept.getPid() == null) - .findFirst() - .orElseThrow(NotExistException::new); - rootDept.setChildren(DeptTreeUtil.getTree(list, rootDept.getId())); - return rootDept; - } - - public static Set initTrees(List list){ - Map deptMap = list.stream().collect(Collectors.toMap(Dept::getId, dept -> dept)); - HashSet result = new HashSet<>(); - list.forEach(dept -> { - Dept parent = deptMap.get(dept.getPid()); - if (Objects.nonNull(parent)) { - parent.getChildren().add(dept); - } else { - result.add(dept); - } - }); - return result; - } - - public static HashSet getTree(HashSet list, long parentId){ - //获取所有子节点 - HashSet childTreeList = getChildTree(list, parentId); - for (Dept dept:childTreeList) { - dept.setChildren(getTree(list, dept.getId())); - } - return childTreeList; - } - - public static HashSet getChildTree(HashSet list, long id){ - HashSet childTree = new HashSet<>(); - for (Dept dept: list) { - if(dept.getPid() != null && dept.getPid() == id){ - childTree.add(dept); - } - } - return childTree; - } - - /** - * 从部门树中获取子树 - * @param list - * @return - */ - public static Dept getChildNode(Set list, long id) { - for (Dept child: list) { - if (child.getId() == id) { - return child; - } else if (child.getChildren() != null && !child.getChildren().isEmpty()) { - return getChildNode(child.getChildren(), id); - } - } - return null; - } - - /** - * 从部门获取本身及子部门的所有id - * @param dept - * @return - */ - public static HashSet getDeptPath(Dept dept) { - HashSet result = new HashSet<>(); - result.add(dept.getId()); - Stack deptStack = new Stack<>(); - Set children = dept.getChildren(); - if (!children.isEmpty()) { - deptStack.addAll(children); - while (!deptStack.isEmpty()) { - Dept child = deptStack.pop(); - result.add(child.getId()); - if (!child.getChildren().isEmpty()) { - deptStack.addAll(child.getChildren()); - } - } - } - return result; - } -} diff --git a/src/main/resources/mappers/RoleMapper.xml b/src/main/resources/mappers/RoleMapper.xml deleted file mode 100644 index 699d8b6..0000000 --- a/src/main/resources/mappers/RoleMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mappers/iotMappers/DeviceMapper.xml b/src/main/resources/mappers/iot/DeviceMapper.xml similarity index 100% rename from src/main/resources/mappers/iotMappers/DeviceMapper.xml rename to src/main/resources/mappers/iot/DeviceMapper.xml diff --git a/src/main/resources/mappers/iotMappers/EventMapper.xml b/src/main/resources/mappers/iot/EventMapper.xml similarity index 100% rename from src/main/resources/mappers/iotMappers/EventMapper.xml rename to src/main/resources/mappers/iot/EventMapper.xml diff --git a/src/main/resources/mappers/iotMappers/ProductMapper.xml b/src/main/resources/mappers/iot/ProductMapper.xml similarity index 100% rename from src/main/resources/mappers/iotMappers/ProductMapper.xml rename to src/main/resources/mappers/iot/ProductMapper.xml diff --git a/src/main/resources/mappers/iotMappers/ServeMapper.xml b/src/main/resources/mappers/iot/ServeMapper.xml similarity index 100% rename from src/main/resources/mappers/iotMappers/ServeMapper.xml rename to src/main/resources/mappers/iot/ServeMapper.xml diff --git a/src/main/resources/mappers/noticeMappers/BulletinMapper.xml b/src/main/resources/mappers/notice/BulletinMapper.xml similarity index 100% rename from src/main/resources/mappers/noticeMappers/BulletinMapper.xml rename to src/main/resources/mappers/notice/BulletinMapper.xml diff --git a/src/main/resources/mappers/noticeMappers/MessageMapper.xml b/src/main/resources/mappers/notice/MessageMapper.xml similarity index 100% rename from src/main/resources/mappers/noticeMappers/MessageMapper.xml rename to src/main/resources/mappers/notice/MessageMapper.xml diff --git a/src/main/resources/mappers/noticeMappers/UserMessageMapper.xml b/src/main/resources/mappers/notice/UserMessageMapper.xml similarity index 100% rename from src/main/resources/mappers/noticeMappers/UserMessageMapper.xml rename to src/main/resources/mappers/notice/UserMessageMapper.xml diff --git a/src/main/resources/mappers/systemMappers/AuthorityMapper.xml b/src/main/resources/mappers/system/AuthorityMapper.xml similarity index 100% rename from src/main/resources/mappers/systemMappers/AuthorityMapper.xml rename to src/main/resources/mappers/system/AuthorityMapper.xml diff --git a/src/main/resources/mappers/systemMappers/DeptMapper.xml b/src/main/resources/mappers/system/DeptMapper.xml similarity index 100% rename from src/main/resources/mappers/systemMappers/DeptMapper.xml rename to src/main/resources/mappers/system/DeptMapper.xml diff --git a/src/main/resources/mappers/MenuMapper.xml b/src/main/resources/mappers/system/MenuMapper.xml similarity index 100% rename from src/main/resources/mappers/MenuMapper.xml rename to src/main/resources/mappers/system/MenuMapper.xml diff --git a/src/main/resources/mappers/systemMappers/RoleAuthoritiesReposity.xml b/src/main/resources/mappers/system/RoleAuthoritiesReposity.xml similarity index 100% rename from src/main/resources/mappers/systemMappers/RoleAuthoritiesReposity.xml rename to src/main/resources/mappers/system/RoleAuthoritiesReposity.xml diff --git a/src/main/resources/mappers/systemMappers/RoleMapper.xml b/src/main/resources/mappers/system/RoleMapper.xml similarity index 100% rename from src/main/resources/mappers/systemMappers/RoleMapper.xml rename to src/main/resources/mappers/system/RoleMapper.xml diff --git a/src/main/resources/mappers/systemMappers/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml similarity index 100% rename from src/main/resources/mappers/systemMappers/UserMapper.xml rename to src/main/resources/mappers/system/UserMapper.xml