From df72492f90aab44666add5c91b33bb2fcd297ed3 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Sat, 4 Jan 2025 15:53:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor(test):=20=E9=87=8D=E6=9E=84=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=8C=85=E7=BB=93=E6=9E=84=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重构测试包结构，按模块重新组织测试类 - 优化设备查询功能，增加模糊查询接口 - 更新数据库脚本，添加部门数据初始化 - 调整部分类名以更好地反映其功能和所在包 --- .../device/controller/DeviceController.java | 10 +++- .../iot/device/entity/DeviceSelect.java | 25 ++++++++ .../iot/device/service/DeviceService.java | 3 + .../service/impl/DeviceServiceImpl.java | 9 +++ .../service/impl/BulletinServiceImpl.java | 2 +- src/main/resources/db/gateway.sql | 13 ++++ .../resources/db/gateway/public/sys_dept.sql | 59 +++++++++++++++++++ .../com/zsc/edu/gateway/BaseServiceTest.java | 6 +- .../zsc/edu/gateway/MockMvcConfigBase.java | 6 +- .../domain/{ => iot}/BaseParamBuilder.java | 2 +- .../domain/{ => iot}/ParamBuilder.java | 2 +- .../domain/{ => notice}/BulletinBuilder.java | 5 +- .../domain/{ => system}/AuthorityBuilder.java | 2 +- .../{ => system}/BaseEntityBuilder.java | 2 +- .../domain/{ => system}/DeptBuilder.java | 3 +- .../domain/{ => system}/RoleBuilder.java | 2 +- .../domain/{ => system}/UserBuilder.java | 2 +- .../{ => notice}/BulletinControllerTest.java | 4 +- .../{ => system}/AuthorityControllerTest.java | 4 +- .../rest/{ => system}/DeptControllerTest.java | 6 +- .../rest/{ => system}/RoleControllerTest.java | 4 +- .../service/{ => iot}/ParamServiceTest.java | 5 +- .../{ => notice}/BulletinServiceTest.java | 4 +- .../{ => system}/AuthorityServiceTest.java | 6 +- .../service/{ => system}/DeptServiceTest.java | 4 +- .../service/{ => system}/RoleServiceTest.java | 6 +- .../service/{ => system}/UserServiceTest.java | 2 +- 27 files changed, 152 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/DeviceSelect.java create mode 100644 src/main/resources/db/gateway/public/sys_dept.sql rename src/test/java/com/zsc/edu/gateway/domain/{ => iot}/BaseParamBuilder.java (90%) rename src/test/java/com/zsc/edu/gateway/domain/{ => iot}/ParamBuilder.java (96%) rename src/test/java/com/zsc/edu/gateway/domain/{ => notice}/BulletinBuilder.java (82%) rename src/test/java/com/zsc/edu/gateway/domain/{ => system}/AuthorityBuilder.java (95%) rename src/test/java/com/zsc/edu/gateway/domain/{ => system}/BaseEntityBuilder.java (91%) rename src/test/java/com/zsc/edu/gateway/domain/{ => system}/DeptBuilder.java (93%) rename src/test/java/com/zsc/edu/gateway/domain/{ => system}/RoleBuilder.java (96%) rename src/test/java/com/zsc/edu/gateway/domain/{ => system}/UserBuilder.java (97%) rename src/test/java/com/zsc/edu/gateway/rest/{ => notice}/BulletinControllerTest.java (97%) rename src/test/java/com/zsc/edu/gateway/rest/{ => system}/AuthorityControllerTest.java (97%) rename src/test/java/com/zsc/edu/gateway/rest/{ => system}/DeptControllerTest.java (95%) rename src/test/java/com/zsc/edu/gateway/rest/{ => system}/RoleControllerTest.java (98%) rename src/test/java/com/zsc/edu/gateway/service/{ => iot}/ParamServiceTest.java (95%) rename src/test/java/com/zsc/edu/gateway/service/{ => notice}/BulletinServiceTest.java (97%) rename src/test/java/com/zsc/edu/gateway/service/{ => system}/AuthorityServiceTest.java (92%) rename src/test/java/com/zsc/edu/gateway/service/{ => system}/DeptServiceTest.java (97%) rename src/test/java/com/zsc/edu/gateway/service/{ => system}/RoleServiceTest.java (92%) rename src/test/java/com/zsc/edu/gateway/service/{ => system}/UserServiceTest.java (96%) diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java index b74c7c5..622e9a2 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java @@ -6,6 +6,7 @@ import com.zsc.edu.gateway.modules.iot.device.dto.BatchDeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceServeDto; import com.zsc.edu.gateway.modules.iot.device.entity.Device; +import com.zsc.edu.gateway.modules.iot.device.entity.DeviceSelect; import com.zsc.edu.gateway.modules.iot.device.query.DeviceQuery; import com.zsc.edu.gateway.modules.iot.device.service.DeviceService; import com.zsc.edu.gateway.modules.iot.device.vo.DeviceVo; @@ -58,7 +59,7 @@ public class DeviceController { /** - * 查询设备 + * 分页查询设备 */ @GetMapping public Page query(Page page, DeviceQuery query) { @@ -103,4 +104,11 @@ public class DeviceController { return recordService.recordPhoto(clientId); } + /** + * 根据名称模糊查询 + */ + @GetMapping("/query") + public List query(String name) { + return service.queryByName(name); + } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/DeviceSelect.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/DeviceSelect.java new file mode 100644 index 0000000..be27aef --- /dev/null +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/DeviceSelect.java @@ -0,0 +1,25 @@ +package com.zsc.edu.gateway.modules.iot.device.entity; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * @author zhuang + */ +@Setter +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class DeviceSelect { + /** + * 设备ID + */ + private Long id; + /** + * 设备名称 + */ + private String name; + +} diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java index 830895c..79c536a 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java @@ -7,6 +7,7 @@ import com.zsc.edu.gateway.modules.iot.device.dto.BatchDeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceServeDto; import com.zsc.edu.gateway.modules.iot.device.entity.Device; +import com.zsc.edu.gateway.modules.iot.device.entity.DeviceSelect; import com.zsc.edu.gateway.modules.iot.device.query.DeviceQuery; import com.zsc.edu.gateway.modules.iot.device.vo.DeviceVo; @@ -25,4 +26,6 @@ public interface DeviceService extends IService { DeviceVo detail(Long id); Boolean serve(DeviceServeDto dto); + + List queryByName(String name); } 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 3d34f5e..eedda2c 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 @@ -11,6 +11,7 @@ import com.zsc.edu.gateway.modules.iot.device.dto.BatchDeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceDto; import com.zsc.edu.gateway.modules.iot.device.dto.DeviceServeDto; import com.zsc.edu.gateway.modules.iot.device.entity.Device; +import com.zsc.edu.gateway.modules.iot.device.entity.DeviceSelect; import com.zsc.edu.gateway.modules.iot.device.mapper.DeviceMapper; import com.zsc.edu.gateway.modules.iot.device.query.DeviceQuery; import com.zsc.edu.gateway.modules.iot.device.repo.DeviceRepository; @@ -21,6 +22,7 @@ import com.zsc.edu.gateway.modules.iot.product.repo.ProductRepository; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.*; import java.util.stream.Collectors; @@ -144,6 +146,13 @@ public class DeviceServiceImpl extends ServiceImpl imp } else { throw new OutlineException("设备[" + dto.clientId + "]不在线！"); } + } + @Override + public List queryByName(String name) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.like(StringUtils.hasText(name), Device::getName, name); + List devices = baseMapper.selectList(query); + return devices.stream().map(device -> new DeviceSelect(device.getId(), device.getName())).collect(Collectors.toList()); } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java index 73576f1..bdaf469 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java @@ -192,7 +192,7 @@ public class BulletinServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BulletinAttachment::getAttachmentId, id); + queryWrapper.eq(BulletinAttachment::getBulletinId, id); List bulletinAttachments = bulletinAttachmentRepository.selectList(queryWrapper); if (!bulletinAttachments.isEmpty()) { bulletinAttachmentRepository.delete(queryWrapper); diff --git a/src/main/resources/db/gateway.sql b/src/main/resources/db/gateway.sql index 3bc5d88..240071b 100644 --- a/src/main/resources/db/gateway.sql +++ b/src/main/resources/db/gateway.sql @@ -606,3 +606,16 @@ alter table sys_role comment on column sys_role.dept_id is '部门权限id'; +INSERT INTO sys_dept (pid, sub_count, name, dept_sort, enabled, create_by, update_by, create_time, update_time, remark) +VALUES (2, 1, '研发部', 1, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责产品研发'), + (3, 2, '前端组', 2, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责前端开发'), + (4, 2, '后端组', 3, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责后端开发'), + (5, 1, '市场部', 4, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责市场推广'), + (6, 1, '销售组', 5, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责销售'), + (7, 1, '市场调研组', 6, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责市场调研'), + (8, 1, '人力资源部', 7, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责人力资源管理'), + (9, 1, '招聘组', 8, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责招聘'), + (10, 1, '培训组', 9, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责员工培训'), + (11, 1, '财务部', 10, TRUE, 'admin', 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, '负责财务管理'); + + diff --git a/src/main/resources/db/gateway/public/sys_dept.sql b/src/main/resources/db/gateway/public/sys_dept.sql new file mode 100644 index 0000000..320ea17 --- /dev/null +++ b/src/main/resources/db/gateway/public/sys_dept.sql @@ -0,0 +1,59 @@ +create table sys_dept +( + id bigint generated by default as identity + constraint _copy_7 + primary key, + pid bigint, + sub_count integer, + name varchar(50) not null, + dept_sort integer, + enabled boolean, + create_by varchar(50), + update_by varchar(50), + create_time timestamp(6), + update_time timestamp(6), + remark varchar(255) +); + +comment +on table sys_dept is '部门'; + +comment +on column sys_dept.id is 'ID'; + +comment +on column sys_dept.pid is '上级部门'; + +comment +on column sys_dept.sub_count is '子部门数目'; + +comment +on column sys_dept.name is '名称'; + +comment +on column sys_dept.dept_sort is '排序'; + +comment +on column sys_dept.enabled is '状态'; + +comment +on column sys_dept.create_by is '创建者'; + +comment +on column sys_dept.update_by is '更新者'; + +comment +on column sys_dept.create_time is '创建日期'; + +comment +on column sys_dept.update_time is '更新时间'; + +alter table sys_dept + owner to gitea; + +create index inx_pid + on sys_dept (pid); + +create index inx_enabled + on sys_dept (enabled); + diff --git a/src/test/java/com/zsc/edu/gateway/BaseServiceTest.java b/src/test/java/com/zsc/edu/gateway/BaseServiceTest.java index 369e921..39647ca 100644 --- a/src/test/java/com/zsc/edu/gateway/BaseServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/BaseServiceTest.java @@ -1,9 +1,9 @@ package com.zsc.edu.gateway; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zsc.edu.gateway.domain.DeptBuilder; -import com.zsc.edu.gateway.domain.RoleBuilder; -import com.zsc.edu.gateway.domain.UserBuilder; +import com.zsc.edu.gateway.domain.system.DeptBuilder; +import com.zsc.edu.gateway.domain.system.RoleBuilder; +import com.zsc.edu.gateway.domain.system.UserBuilder; import com.zsc.edu.gateway.framework.security.UserDetailsImpl; import com.zsc.edu.gateway.modules.system.entity.Dept; import com.zsc.edu.gateway.modules.system.entity.Role; diff --git a/src/test/java/com/zsc/edu/gateway/MockMvcConfigBase.java b/src/test/java/com/zsc/edu/gateway/MockMvcConfigBase.java index 7f54b1c..2f9cbcb 100644 --- a/src/test/java/com/zsc/edu/gateway/MockMvcConfigBase.java +++ b/src/test/java/com/zsc/edu/gateway/MockMvcConfigBase.java @@ -1,9 +1,9 @@ package com.zsc.edu.gateway; import com.fasterxml.jackson.databind.ObjectMapper; -import com.zsc.edu.gateway.domain.DeptBuilder; -import com.zsc.edu.gateway.domain.RoleBuilder; -import com.zsc.edu.gateway.domain.UserBuilder; +import com.zsc.edu.gateway.domain.system.DeptBuilder; +import com.zsc.edu.gateway.domain.system.RoleBuilder; +import com.zsc.edu.gateway.domain.system.UserBuilder; import com.zsc.edu.gateway.framework.security.CustomAccessDeniedHandler; import com.zsc.edu.gateway.framework.security.CustomAuthenticationFailureHandler; import com.zsc.edu.gateway.framework.security.UserDetailsImpl; diff --git a/src/test/java/com/zsc/edu/gateway/domain/BaseParamBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/iot/BaseParamBuilder.java similarity index 90% rename from src/test/java/com/zsc/edu/gateway/domain/BaseParamBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/iot/BaseParamBuilder.java index 2d87312..4908f52 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/BaseParamBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/iot/BaseParamBuilder.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.iot; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; diff --git a/src/test/java/com/zsc/edu/gateway/domain/ParamBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/iot/ParamBuilder.java similarity index 96% rename from src/test/java/com/zsc/edu/gateway/domain/ParamBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/iot/ParamBuilder.java index b87846f..7f3ac94 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/ParamBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/iot/ParamBuilder.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.iot; import com.zsc.edu.gateway.modules.iot.tsl.entity.DataType; import com.zsc.edu.gateway.modules.iot.tsl.entity.Param; diff --git a/src/test/java/com/zsc/edu/gateway/domain/BulletinBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/notice/BulletinBuilder.java similarity index 82% rename from src/test/java/com/zsc/edu/gateway/domain/BulletinBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/notice/BulletinBuilder.java index 9a48d6d..841360a 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/BulletinBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/notice/BulletinBuilder.java @@ -1,8 +1,9 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.notice; +import com.zsc.edu.gateway.domain.system.BaseEntityBuilder; import com.zsc.edu.gateway.modules.notice.entity.Bulletin; -public class BulletinBuilder extends BaseEntityBuilder{ +public class BulletinBuilder extends BaseEntityBuilder { private String title; private String content; private Boolean top; diff --git a/src/test/java/com/zsc/edu/gateway/domain/AuthorityBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/system/AuthorityBuilder.java similarity index 95% rename from src/test/java/com/zsc/edu/gateway/domain/AuthorityBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/system/AuthorityBuilder.java index e4b0d41..825c237 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/AuthorityBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/system/AuthorityBuilder.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.system; import com.zsc.edu.gateway.modules.system.entity.Authority; diff --git a/src/test/java/com/zsc/edu/gateway/domain/BaseEntityBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/system/BaseEntityBuilder.java similarity index 91% rename from src/test/java/com/zsc/edu/gateway/domain/BaseEntityBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/system/BaseEntityBuilder.java index b4a5bd3..2a7cb5c 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/BaseEntityBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/system/BaseEntityBuilder.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.system; import java.time.LocalDateTime; diff --git a/src/test/java/com/zsc/edu/gateway/domain/DeptBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/system/DeptBuilder.java similarity index 93% rename from src/test/java/com/zsc/edu/gateway/domain/DeptBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/system/DeptBuilder.java index 4dd8242..9199706 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/DeptBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/system/DeptBuilder.java @@ -1,8 +1,7 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.system; import com.zsc.edu.gateway.modules.system.entity.Dept; -import java.util.HashSet; import java.util.List; public class DeptBuilder extends BaseEntityBuilder { diff --git a/src/test/java/com/zsc/edu/gateway/domain/RoleBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/system/RoleBuilder.java similarity index 96% rename from src/test/java/com/zsc/edu/gateway/domain/RoleBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/system/RoleBuilder.java index ddcd859..daf655c 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/RoleBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/system/RoleBuilder.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.system; import com.zsc.edu.gateway.modules.system.entity.Authority; import com.zsc.edu.gateway.modules.system.entity.Role; diff --git a/src/test/java/com/zsc/edu/gateway/domain/UserBuilder.java b/src/test/java/com/zsc/edu/gateway/domain/system/UserBuilder.java similarity index 97% rename from src/test/java/com/zsc/edu/gateway/domain/UserBuilder.java rename to src/test/java/com/zsc/edu/gateway/domain/system/UserBuilder.java index 56efa60..d07b18e 100644 --- a/src/test/java/com/zsc/edu/gateway/domain/UserBuilder.java +++ b/src/test/java/com/zsc/edu/gateway/domain/system/UserBuilder.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.domain; +package com.zsc.edu.gateway.domain.system; import com.zsc.edu.gateway.modules.system.entity.Dept; import com.zsc.edu.gateway.modules.system.entity.Role; diff --git a/src/test/java/com/zsc/edu/gateway/rest/BulletinControllerTest.java b/src/test/java/com/zsc/edu/gateway/rest/notice/BulletinControllerTest.java similarity index 97% rename from src/test/java/com/zsc/edu/gateway/rest/BulletinControllerTest.java rename to src/test/java/com/zsc/edu/gateway/rest/notice/BulletinControllerTest.java index 35f013f..92da100 100644 --- a/src/test/java/com/zsc/edu/gateway/rest/BulletinControllerTest.java +++ b/src/test/java/com/zsc/edu/gateway/rest/notice/BulletinControllerTest.java @@ -1,7 +1,7 @@ -package com.zsc.edu.gateway.rest; +package com.zsc.edu.gateway.rest.notice; import com.zsc.edu.gateway.MockMvcConfigBase; -import com.zsc.edu.gateway.domain.BulletinBuilder; +import com.zsc.edu.gateway.domain.notice.BulletinBuilder; import com.zsc.edu.gateway.framework.security.UserDetailsImpl; import com.zsc.edu.gateway.modules.notice.dto.BulletinDto; import com.zsc.edu.gateway.modules.notice.entity.Bulletin; diff --git a/src/test/java/com/zsc/edu/gateway/rest/AuthorityControllerTest.java b/src/test/java/com/zsc/edu/gateway/rest/system/AuthorityControllerTest.java similarity index 97% rename from src/test/java/com/zsc/edu/gateway/rest/AuthorityControllerTest.java rename to src/test/java/com/zsc/edu/gateway/rest/system/AuthorityControllerTest.java index ff64221..b3278d7 100644 --- a/src/test/java/com/zsc/edu/gateway/rest/AuthorityControllerTest.java +++ b/src/test/java/com/zsc/edu/gateway/rest/system/AuthorityControllerTest.java @@ -1,7 +1,7 @@ -package com.zsc.edu.gateway.rest; +package com.zsc.edu.gateway.rest.system; import com.zsc.edu.gateway.MockMvcConfigBase; -import com.zsc.edu.gateway.domain.AuthorityBuilder; +import com.zsc.edu.gateway.domain.system.AuthorityBuilder; import com.zsc.edu.gateway.modules.system.controller.AuthorityController; import com.zsc.edu.gateway.modules.system.dto.AuthorityDto; import com.zsc.edu.gateway.modules.system.entity.Authority; diff --git a/src/test/java/com/zsc/edu/gateway/rest/DeptControllerTest.java b/src/test/java/com/zsc/edu/gateway/rest/system/DeptControllerTest.java similarity index 95% rename from src/test/java/com/zsc/edu/gateway/rest/DeptControllerTest.java rename to src/test/java/com/zsc/edu/gateway/rest/system/DeptControllerTest.java index c71ccff..9406180 100644 --- a/src/test/java/com/zsc/edu/gateway/rest/DeptControllerTest.java +++ b/src/test/java/com/zsc/edu/gateway/rest/system/DeptControllerTest.java @@ -1,14 +1,12 @@ -package com.zsc.edu.gateway.rest; +package com.zsc.edu.gateway.rest.system; //import com.zsc.edu.gateway.MockMvcConfigBase; import com.zsc.edu.gateway.MockMvcConfigBase; -import com.zsc.edu.gateway.domain.DeptBuilder; +import com.zsc.edu.gateway.domain.system.DeptBuilder; import com.zsc.edu.gateway.modules.system.controller.DeptController; import com.zsc.edu.gateway.modules.system.dto.DeptDto; import com.zsc.edu.gateway.modules.system.entity.Dept; -import com.zsc.edu.gateway.modules.system.mapper.DeptMapper; import com.zsc.edu.gateway.modules.system.service.DeptService; -import com.zsc.edu.gateway.modules.system.service.UserService; import org.assertj.core.util.Lists; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/zsc/edu/gateway/rest/RoleControllerTest.java b/src/test/java/com/zsc/edu/gateway/rest/system/RoleControllerTest.java similarity index 98% rename from src/test/java/com/zsc/edu/gateway/rest/RoleControllerTest.java rename to src/test/java/com/zsc/edu/gateway/rest/system/RoleControllerTest.java index c71fe62..95a42fd 100644 --- a/src/test/java/com/zsc/edu/gateway/rest/RoleControllerTest.java +++ b/src/test/java/com/zsc/edu/gateway/rest/system/RoleControllerTest.java @@ -1,7 +1,7 @@ -package com.zsc.edu.gateway.rest; +package com.zsc.edu.gateway.rest.system; import com.zsc.edu.gateway.MockMvcConfigBase; -import com.zsc.edu.gateway.domain.RoleBuilder; +import com.zsc.edu.gateway.domain.system.RoleBuilder; import com.zsc.edu.gateway.modules.system.controller.RoleController; import com.zsc.edu.gateway.modules.system.dto.RoleDto; import com.zsc.edu.gateway.modules.system.entity.Role; diff --git a/src/test/java/com/zsc/edu/gateway/service/ParamServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/iot/ParamServiceTest.java similarity index 95% rename from src/test/java/com/zsc/edu/gateway/service/ParamServiceTest.java rename to src/test/java/com/zsc/edu/gateway/service/iot/ParamServiceTest.java index ad57157..0912d53 100644 --- a/src/test/java/com/zsc/edu/gateway/service/ParamServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/iot/ParamServiceTest.java @@ -1,8 +1,7 @@ -package com.zsc.edu.gateway.service; +package com.zsc.edu.gateway.service.iot; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.zsc.edu.gateway.domain.ParamBuilder; -import com.zsc.edu.gateway.exception.ConstraintException; +import com.zsc.edu.gateway.domain.iot.ParamBuilder; import com.zsc.edu.gateway.modules.iot.tsl.dto.ParamDto; import com.zsc.edu.gateway.modules.iot.tsl.entity.DataType; import com.zsc.edu.gateway.modules.iot.tsl.entity.Param; diff --git a/src/test/java/com/zsc/edu/gateway/service/BulletinServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/notice/BulletinServiceTest.java similarity index 97% rename from src/test/java/com/zsc/edu/gateway/service/BulletinServiceTest.java rename to src/test/java/com/zsc/edu/gateway/service/notice/BulletinServiceTest.java index 98640c6..4b21308 100644 --- a/src/test/java/com/zsc/edu/gateway/service/BulletinServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/notice/BulletinServiceTest.java @@ -1,8 +1,8 @@ -package com.zsc.edu.gateway.service; +package com.zsc.edu.gateway.service.notice; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zsc.edu.gateway.domain.BulletinBuilder; +import com.zsc.edu.gateway.domain.notice.BulletinBuilder; import com.zsc.edu.gateway.exception.ConstraintException; import com.zsc.edu.gateway.framework.security.UserDetailsImpl; import com.zsc.edu.gateway.modules.notice.dto.BulletinDto; diff --git a/src/test/java/com/zsc/edu/gateway/service/AuthorityServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/system/AuthorityServiceTest.java similarity index 92% rename from src/test/java/com/zsc/edu/gateway/service/AuthorityServiceTest.java rename to src/test/java/com/zsc/edu/gateway/service/system/AuthorityServiceTest.java index e35df77..8f490cf 100644 --- a/src/test/java/com/zsc/edu/gateway/service/AuthorityServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/system/AuthorityServiceTest.java @@ -1,16 +1,12 @@ -package com.zsc.edu.gateway.service; +package com.zsc.edu.gateway.service.system; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zsc.edu.gateway.domain.AuthorityBuilder; import com.zsc.edu.gateway.exception.ConstraintException; import com.zsc.edu.gateway.modules.system.dto.AuthorityDto; import com.zsc.edu.gateway.modules.system.entity.Authority; import com.zsc.edu.gateway.modules.system.repo.AuthorityRepository; import com.zsc.edu.gateway.modules.system.service.AuthorityService; import jakarta.annotation.Resource; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/src/test/java/com/zsc/edu/gateway/service/DeptServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/system/DeptServiceTest.java similarity index 97% rename from src/test/java/com/zsc/edu/gateway/service/DeptServiceTest.java rename to src/test/java/com/zsc/edu/gateway/service/system/DeptServiceTest.java index 3a4c5e1..c2a8640 100644 --- a/src/test/java/com/zsc/edu/gateway/service/DeptServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/system/DeptServiceTest.java @@ -1,8 +1,8 @@ -package com.zsc.edu.gateway.service; +package com.zsc.edu.gateway.service.system; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zsc.edu.gateway.domain.DeptBuilder; +import com.zsc.edu.gateway.domain.system.DeptBuilder; import com.zsc.edu.gateway.exception.ConstraintException; import com.zsc.edu.gateway.modules.system.dto.DeptDto; import com.zsc.edu.gateway.modules.system.entity.Dept; diff --git a/src/test/java/com/zsc/edu/gateway/service/RoleServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/system/RoleServiceTest.java similarity index 92% rename from src/test/java/com/zsc/edu/gateway/service/RoleServiceTest.java rename to src/test/java/com/zsc/edu/gateway/service/system/RoleServiceTest.java index 1d753fb..14a6ae3 100644 --- a/src/test/java/com/zsc/edu/gateway/service/RoleServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/system/RoleServiceTest.java @@ -1,15 +1,11 @@ -package com.zsc.edu.gateway.service; +package com.zsc.edu.gateway.service.system; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zsc.edu.gateway.domain.RoleBuilder; import com.zsc.edu.gateway.modules.system.dto.RoleDto; import com.zsc.edu.gateway.modules.system.entity.Role; import com.zsc.edu.gateway.modules.system.repo.AuthorityRepository; import com.zsc.edu.gateway.modules.system.repo.RoleRepository; import com.zsc.edu.gateway.modules.system.service.RoleService; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/src/test/java/com/zsc/edu/gateway/service/UserServiceTest.java b/src/test/java/com/zsc/edu/gateway/service/system/UserServiceTest.java similarity index 96% rename from src/test/java/com/zsc/edu/gateway/service/UserServiceTest.java rename to src/test/java/com/zsc/edu/gateway/service/system/UserServiceTest.java index 6017f44..f18ea3e 100644 --- a/src/test/java/com/zsc/edu/gateway/service/UserServiceTest.java +++ b/src/test/java/com/zsc/edu/gateway/service/system/UserServiceTest.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.service; +package com.zsc.edu.gateway.service.system; import com.zsc.edu.gateway.modules.system.entity.Authority; import com.zsc.edu.gateway.modules.system.entity.User;