From 39bf80baadc01d518c2a94b83d5dcdfc580aa9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 25 Jan 2025 15:15:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=B6=88=E6=81=AF=E5=8A=9F=E8=83=BD=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=EF=BC=9B=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=86=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=AE=9E=E4=BD=93=E5=92=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AE=BF=E9=97=AE=E5=B1=82=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cfs/controller/MessageController.java | 8 +-- .../entity/AdminUserPermission.java | 60 ------------------- .../repository/entity/Message.java | 53 ---------------- .../mapper/AdminUserPermissionMapper.java | 16 ----- .../repository/mapper/MessageMapper.java | 23 ------- .../service/IAdminUserPermissionService.java | 16 ----- .../repository/service/IMessageService.java | 23 ------- .../impl/AdminUserPermissionServiceImpl.java | 20 ------- .../service/impl/MessageServiceImpl.java | 33 ---------- .../mapper/AdminUserPermissionMapper.xml | 5 -- .../resources/mapper/AppMessageMapper.xml | 6 +- .../main/resources/mapper/MessageMapper.xml | 25 -------- 12 files changed, 7 insertions(+), 281 deletions(-) delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUserPermission.java delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Message.java delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserPermissionMapper.java delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/MessageMapper.java delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminUserPermissionService.java delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IMessageService.java delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserPermissionServiceImpl.java delete mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/MessageServiceImpl.java delete mode 100644 nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserPermissionMapper.xml delete mode 100644 nflg-mobilebroken-repository/src/main/resources/mapper/MessageMapper.xml diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java index 0ef22534..9e507a44 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/MessageController.java @@ -9,7 +9,7 @@ import com.nflg.mobilebroken.common.pojo.request.MessageConfigRequest; import com.nflg.mobilebroken.common.pojo.request.MessageSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.MessageConfigVO; import com.nflg.mobilebroken.common.pojo.vo.MessageVO; -import com.nflg.mobilebroken.repository.service.IMessageService; +import com.nflg.mobilebroken.repository.service.IAppMessageService; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; @@ -33,7 +33,7 @@ public class MessageController { private StringRedisTemplate stringRedisTemplate; @Resource - private IMessageService messageService; + private IAppMessageService appMessageService; /** * 搜索消息 @@ -45,7 +45,7 @@ public class MessageController { IPage page=new Page<>(); page.setCurrent(request.getPageNum()); page.setSize(request.getPageSize()); - messageService.search(Constant.USER_ID,request.getTitle(),page); + appMessageService.search(Constant.USER_ID, request.getTitle(), page); PageData pageData=new PageData<>(); pageData.setPage(page.getCurrent()); pageData.setPageSize(page.getSize()); @@ -61,7 +61,7 @@ public class MessageController { */ @GetMapping("getNotReadMessages") public ApiResult> getNotReadMessages(@RequestParam(defaultValue = "10") Integer num){ - return ApiResult.success(messageService.getNotReadMessage(Constant.USER_ID,num)); + return ApiResult.success(appMessageService.getNotReadMessage(Constant.USER_ID, num)); } /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUserPermission.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUserPermission.java deleted file mode 100644 index badc4405..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUserPermission.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.nflg.mobilebroken.repository.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * 后台-用户权限 - *

- * - * @author 曹鹏飞 - * @since 2025-01-17 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("admin_user_permission") -public class AdminUserPermission implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - /** - * 用户id - */ - private Integer userId; - - /** - * 菜单id - */ - private Integer menuId; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 最后更新人 - */ - private String updateBy; - - /** - * 最后更新时间 - */ - private LocalDateTime updateTime; -} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Message.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Message.java deleted file mode 100644 index f9ef05af..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Message.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.nflg.mobilebroken.repository.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * 消息 - *

- * - * @author 曹鹏飞 - * @since 2025-01-20 - */ -@Getter -@Setter -@Accessors(chain = true) -public class Message implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - /** - * 工单id - */ - private Integer ticketId; - - /** - * 用户id - */ - private Integer userId; - - /** - * 提醒事项 - */ - private String content; - - /** - * 是否已读 - */ - private Boolean isRead; - - /** - * 创建时间 - */ - private LocalDateTime createTime; -} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserPermissionMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserPermissionMapper.java deleted file mode 100644 index 05e2ffd5..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserPermissionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nflg.mobilebroken.repository.mapper; - -import com.nflg.mobilebroken.repository.entity.AdminUserPermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 后台-用户权限 Mapper 接口 - *

- * - * @author 曹鹏飞 - * @since 2025-01-03 - */ -public interface AdminUserPermissionMapper extends BaseMapper { - -} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/MessageMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/MessageMapper.java deleted file mode 100644 index 62f2ccd8..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/MessageMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.nflg.mobilebroken.repository.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nflg.mobilebroken.common.pojo.vo.MessageVO; -import com.nflg.mobilebroken.repository.entity.Message; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author 曹鹏飞 - * @since 2025-01-14 - */ -public interface MessageMapper extends BaseMapper { - - List getNotReadMessage(Integer userId, Integer num); - - void search(Integer userId, String title, IPage page); -} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminUserPermissionService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminUserPermissionService.java deleted file mode 100644 index 9aa9111d..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminUserPermissionService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nflg.mobilebroken.repository.service; - -import com.nflg.mobilebroken.repository.entity.AdminUserPermission; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 后台-用户权限 服务类 - *

- * - * @author 曹鹏飞 - * @since 2025-01-03 - */ -public interface IAdminUserPermissionService extends IService { - -} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IMessageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IMessageService.java deleted file mode 100644 index 098368dd..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IMessageService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.nflg.mobilebroken.repository.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nflg.mobilebroken.common.pojo.vo.MessageVO; -import com.nflg.mobilebroken.repository.entity.Message; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author 曹鹏飞 - * @since 2025-01-14 - */ -public interface IMessageService extends IService { - - List getNotReadMessage(Integer userId, Integer num); - - void search(Integer userId, String title, IPage page); -} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserPermissionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserPermissionServiceImpl.java deleted file mode 100644 index 62ace2d4..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserPermissionServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nflg.mobilebroken.repository.service.impl; - -import com.nflg.mobilebroken.repository.entity.AdminUserPermission; -import com.nflg.mobilebroken.repository.mapper.AdminUserPermissionMapper; -import com.nflg.mobilebroken.repository.service.IAdminUserPermissionService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 后台-用户权限 服务实现类 - *

- * - * @author 曹鹏飞 - * @since 2025-01-03 - */ -@Service -public class AdminUserPermissionServiceImpl extends ServiceImpl implements IAdminUserPermissionService { - -} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/MessageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/MessageServiceImpl.java deleted file mode 100644 index f8c290ec..00000000 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/MessageServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.nflg.mobilebroken.repository.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nflg.mobilebroken.common.pojo.vo.MessageVO; -import com.nflg.mobilebroken.repository.entity.Message; -import com.nflg.mobilebroken.repository.mapper.MessageMapper; -import com.nflg.mobilebroken.repository.service.IMessageService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 服务实现类 - *

- * - * @author 曹鹏飞 - * @since 2025-01-14 - */ -@Service -public class MessageServiceImpl extends ServiceImpl implements IMessageService { - - @Override - public List getNotReadMessage(Integer userId, Integer num) { - return baseMapper.getNotReadMessage(userId,num); - } - - @Override - public void search(Integer userId, String title, IPage page) { - baseMapper.search(userId,title,page); - } -} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserPermissionMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserPermissionMapper.xml deleted file mode 100644 index e2e06cc1..00000000 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserPermissionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml index a2bd2058..3995fdaf 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml @@ -4,16 +4,16 @@ - SELECT t.id AS 'ticketId',t.`no` AS 'ticketNo',t.title AS 'ticketTitle',m.content,m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead' - FROM message m + FROM app_message m INNER JOIN ticket t ON m.ticket_id=t.id INNER JOIN app_user u ON t.user_id=u.id WHERE m.user_id=#{userId} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/MessageMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/MessageMapper.xml deleted file mode 100644 index c36f7f27..00000000 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/MessageMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -