vertoryao/iot-gateway
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(system): 修复菜单保存和通知查询问题

Browse Source 
- 在 MenuServiceImplTest 中添加了 role 菜单的保存操作
- 优化了 UserNoticeMapper.xml 中的通知查询 SQL 语句，调整了 GROUP BY 的位置
This commit is contained in:
zhuangtianxiang 2025-01-16 17:11:14 +08:00
parent 05a76348f1
commit 6e9e674a91
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/mappers/notice/UserNoticeMapper.xml
View File

@ -90,8 +90,6 @@
sys_user su ON sun.user_id = su.id sys_user su ON sun.user_id = su.id
LEFT JOIN LEFT JOIN
sys_notice sn ON sn.id = sun.notice_id sys_notice sn ON sn.id = sun.notice_id
GROUP BY
sn.id
<where> <where>
<if test="query.userId != null"> <if test="query.userId != null">
AND sun.user_id = #{query.userId} AND sun.user_id = #{query.userId}
@ -103,6 +101,8 @@
AND sn.create_time BETWEEN #{query.createAtBegin} AND #{query.createAtEnd} AND sn.create_time BETWEEN #{query.createAtBegin} AND #{query.createAtEnd}
</if> </if>
</where> </where>
GROUP BY
sn.id
</select> </select>
</mapper> </mapper>

2
src/test/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImplTest.java
View File

@ -44,7 +44,7 @@ class MenuServiceImplTest {
Menu device = new Menu(iot.getId(), Menu.Type.PAGE, "Device", "device", "设备管理", null, true, false, 1, "iot:device", ""); Menu device = new Menu(iot.getId(), Menu.Type.PAGE, "Device", "device", "设备管理", null, true, false, 1, "iot:device", "");
Menu product = new Menu(iot.getId(), Menu.Type.PAGE, "Product", "product", "产品管理", null, true, false, 2, "iot:product", ""); Menu product = new Menu(iot.getId(), Menu.Type.PAGE, "Product", "product", "产品管理", null, true, false, 2, "iot:product", "");
Menu tsl = new Menu(product.getId(), Menu.Type.PAGE, "Tsl", "tsl", "物模型管理", null, true, true, 3, "iot:tsl", ""); Menu tsl = new Menu(product.getId(), Menu.Type.PAGE, "Tsl", "tsl", "物模型管理", null, true, true, 3, "iot:tsl", "");
menuService.saveBatch(List.of(workplace, dept, users, authority, menu, notice, bulletin, device, product, tsl)); menuService.saveBatch(List.of(workplace, dept, users, authority, menu, notice, bulletin, device, product, tsl, role));
Menu roleCreate = new Menu(role.getId(), Menu.Type.OPERATION, "roleCreate", null, "角色新增", null, true, false, 1, "system:role:create", ""); Menu roleCreate = new Menu(role.getId(), Menu.Type.OPERATION, "roleCreate", null, "角色新增", null, true, false, 1, "system:role:create", "");
Menu roleDelete = new Menu(role.getId(), Menu.Type.OPERATION, "roleDelete", null, "角色删除", null, true, false, 1, "system:role:delete", ""); Menu roleDelete = new Menu(role.getId(), Menu.Type.OPERATION, "roleDelete", null, "角色删除", null, true, false, 1, "system:role:delete", "");
Menu roleUpdate = new Menu(role.getId(), Menu.Type.OPERATION, "roleUpdate", null, "角色修改", null, true, false, 1, "system:role:update", ""); Menu roleUpdate = new Menu(role.getId(), Menu.Type.OPERATION, "roleUpdate", null, "角色修改", null, true, false, 1, "system:role:update", "");