系统模块代码生成

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/service/KxsUserDetailsServiceImpl.java

@@ -9,7 +9,7 @@ import com.kxs.common.core.constant.enums.ErrorTypeEnum;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
 import com.kxs.common.security.model.KxsSecurityUser;
-import com.kxs.system.api.dto.UserInfo;
+import com.kxs.system.api.dto.admin.UserInfo;
 import com.kxs.system.api.feign.RemoteUserService;
 import com.kxs.system.api.model.SysUser;
 import lombok.RequiredArgsConstructor;

kxs-gateway/src/main/java/com/kxs/gateway/api/config/RouterFunctionConfiguration.java

@@ -27,7 +27,7 @@ public class RouterFunctionConfiguration {
 	@Bean
 	public RouterFunction<ServerResponse> routerFunction() {
 		return RouterFunctions.route(
-				RequestPredicates.path("/v2/kxs/code").and(RequestPredicates.accept(MediaType.TEXT_PLAIN)),
+				RequestPredicates.path("/v1/kxs/code").and(RequestPredicates.accept(MediaType.TEXT_PLAIN)),
 				imageCodeHandler);
 	}
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/SysLogDTO.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/admin/SysLogDTO.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.dto;
+package com.kxs.system.api.dto.admin;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/UserDTO.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/admin/UserDTO.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.dto;
+package com.kxs.system.api.dto.admin;
 
 import com.kxs.system.api.model.SysUser;
 import io.swagger.v3.oas.annotations.media.Schema;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/UserInfo.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/admin/UserInfo.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.dto;
+package com.kxs.system.api.dto.admin;
 
 import com.kxs.system.api.model.SysUser;
 import io.swagger.v3.oas.annotations.media.Schema;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/kxsapp/FeedBackDto.java

@@ -0,0 +1,28 @@
+package com.kxs.system.api.dto.kxsapp;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 意见反馈DTO
+ *
+ * @author Lxq
+ * @date 2023-12-15
+ */
+@Data
+@Schema(description = "意见反馈DTO")
+public class FeedBackDto {
+
+    /**
+     * 反馈内容
+     */
+    @NotBlank(message = "反馈内容不能为空")
+    private String content;
+
+    /**
+     * 反馈类型
+     */
+    @NotBlank(message = "反馈类型不能为空")
+    private String backType;
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteUserService.java

@@ -3,10 +3,7 @@ package com.kxs.system.api.feign;
 
 import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.util.R;
-import com.kxs.system.api.dto.UserDTO;
-import com.kxs.system.api.dto.UserInfo;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.kxs.system.api.dto.admin.UserInfo;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.service.annotation.GetExchange;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsActivityMarket.java

@@ -1,6 +1,14 @@
 package com.kxs.system.api.model;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -9,92 +17,99 @@ import lombok.EqualsAndHashCode;
 /**
  * 市场活动信息表(KxsActivityMarket)表实体类
  *
- * @author 快秃顶的码农
- * @since 2023-12-13 10:54:54
+ * @author 系统
+ * @since 2023-12-15 12:16:31
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class KxsActivityMarket extends Model<KxsActivityMarket> {
+public class KxsActivityMarket extends Model<KxsActivityMarket> implements Serializable {
 
-    private static final long serialVersionUID = 813278337708401758L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     
     
     /**
      * 主键ID
-     */     
+     */
     @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
     private Integer id;
-    
-    
-    /**
-     * 状态 0下架 1上架
-     */     
-    @Schema(description = "状态 0下架 1上架")
-    private Integer status;
-    
-    
+
+
     /**
-     * 分类ID
-     */     
-    @Schema(description = "分类ID")
-    private Integer menuId;
-    
-    
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
     /**
-     * 封面
-     */     
-    @Schema(description = "封面")
-    private String picPath;
-    
-    
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
     /**
-     * 外链
-     */     
-    @Schema(description = "外链")
-    private String url;
-    
-    
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
     /**
-     * 详情描述
-     */     
-    @Schema(description = "详情描述")
-    private String contents;
-    
-    
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
     /**
      * 标题
-     */     
+     */
     @Schema(description = "标题")
     private String title;
-    
-    
+
+
     /**
-     * 版本
-     */     
-    @Schema(description = "版本")
-    private Integer version;
-    
-    
+     * 详情描述
+     */
+    @Schema(description = "详情描述")
+    private String contents;
+
+
     /**
-     * 删除标记，0未删除，1已删除
-     */     
-    @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
-    
-    
+     * 外链
+     */
+    @Schema(description = "外链")
+    private String url;
+
+
     /**
-     * 更新时间
-     */     
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-    
-    
+     * 封面
+     */
+    @Schema(description = "封面")
+    private String picPath;
+
+
     /**
-     * 新增时间
-     */     
-    @Schema(description = "新增时间")
-    private LocalDateTime createTime;
+     * 分类ID
+     */
+    @Schema(description = "分类ID")
+    private Integer menuId;
+
+
+    /**
+     * 状态 0下架 1上架
+     */
+    @Schema(description = "状态 0下架 1上架")
+    private Integer status;
+
+
+
 
 }
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsActivityMenu.java

@@ -0,0 +1,94 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 市场活动分类(KxsActivityMenu)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsActivityMenu extends Model<KxsActivityMenu> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+    /**
+     * 分类名
+     */
+    @Schema(description = "分类名")
+    private String title;
+
+
+    /**
+     * 父级ID
+     */
+    @Schema(description = "父级ID")
+    private Integer pid;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsAppModal.java

@@ -0,0 +1,164 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * APP弹窗管理表(KxsAppModal)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsAppModal extends Model<KxsAppModal> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 背景图片
+     */
+    @Schema(description = "背景图片")
+    private String bgPic;
+
+
+    /**
+     * 内容
+     */
+    @Schema(description = "内容")
+    private String content;
+
+
+    /**
+     * 是否周末 0否 1是
+     */
+    @Schema(description = "是否周末 0否 1是")
+    private Integer isWeekend;
+
+
+    /**
+     * 每日推送次数
+     */
+    @Schema(description = "每日推送次数")
+    private Integer timeByDay;
+
+
+    /**
+     * 开始时间
+     */
+    @Schema(description = "开始时间")
+    private LocalDateTime startTime;
+
+
+    /**
+     * 结束时间
+     */
+    @Schema(description = "结束时间")
+    private LocalDateTime endTime;
+
+
+    /**
+     * 按钮文字
+     */
+    @Schema(description = "按钮文字")
+    private String btnText;
+
+
+    /**
+     * 跳转url
+     */
+    @Schema(description = "跳转url")
+    private String url;
+
+
+    /**
+     * 是否指定 0否 1是
+     */
+    @Schema(description = "是否指定 0否 1是")
+    private Integer isAssign;
+
+
+    /**
+     * 指定用户编号
+     */
+    @Schema(description = "指定用户编号")
+    private String userCodes;
+
+
+    /**
+     * 消息分类 0文本 1图片 2动图
+     */
+    @Schema(description = "消息分类 0文本 1图片 2动图")
+    private Integer msgType;
+
+
+    /**
+     * 状态 0关闭 1开启
+     */
+    @Schema(description = "状态 0关闭 1开启")
+    private Integer status;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsBanner.java

@@ -0,0 +1,115 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 首页广告管理表(KxsBanner)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsBanner extends Model<KxsBanner> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 封面图地址
+     */
+    @Schema(description = "封面图地址")
+    private String picUrl;
+
+
+    /**
+     * 跳转链接
+     */
+    @Schema(description = "跳转链接")
+    private String url;
+
+
+    /**
+     * 分类名称
+     */
+    @Schema(description = "分类名称")
+    private String banType;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 状态 0下架 1上架
+     */
+    @Schema(description = "状态 0下架 1上架")
+    private Integer status;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsFeedback.java

@@ -0,0 +1,94 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户反馈信息(KxsFeedback)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsFeedback extends Model<KxsFeedback> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 内容
+     */
+    @Schema(description = "内容")
+    private String content;
+
+
+    /**
+     * 反馈类型
+     */
+    @Schema(description = "反馈类型")
+    private String backType;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsMorning.java

@@ -0,0 +1,129 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商学院晨会表(KxsMorning)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMorning extends Model<KxsMorning> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 晨会头像
+     */
+    @Schema(description = "晨会头像")
+    private String photo;
+
+
+    /**
+     * 主讲人
+     */
+    @Schema(description = "主讲人")
+    private String lecturer;
+
+
+    /**
+     * 学习人数
+     */
+    @Schema(description = "学习人数")
+    private Integer studyPerson;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 是否已学习 0否 1是
+     */
+    @Schema(description = "是否已学习 0否 1是")
+    private Integer isStudy;
+
+
+    /**
+     * 开始时间
+     */
+    @Schema(description = "开始时间")
+    private LocalDateTime startDate;
+
+
+    /**
+     * 结束时间
+     */
+    @Schema(description = "结束时间")
+    private LocalDateTime endDate;
+
+
+    /**
+     * 外链
+     */
+    @Schema(description = "外链")
+    private String url;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsRuleMaking.java

@@ -0,0 +1,91 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽协议规则表(KxsRuleMaking)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("kxs_rulemaking")
+public class KxsRuleMaking extends Model<KxsRuleMaking> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 内容
+     */
+    @Schema(description = "内容")
+    private String contents;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 类型 0注册协议 1服务协议 2创客守则 3提现规则
+     */
+    @Schema(description = "类型 0注册协议 1服务协议 2创客守则 3提现规则")
+    private Integer ruleType;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSchoolMenu.java

@@ -0,0 +1,122 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商学院创客学堂分类(KxsSchoolMenu)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsSchoolMenu extends Model<KxsSchoolMenu> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 分类名称
+     */
+    @Schema(description = "分类名称")
+    private String colName;
+
+
+    /**
+     * 分类封面图
+     */
+    @Schema(description = "分类封面图")
+    private String colPicPath;
+
+
+    /**
+     * 分类描述
+     */
+    @Schema(description = "分类描述")
+    private String colDetail;
+
+
+    /**
+     * 父级ID
+     */
+    @Schema(description = "父级ID")
+    private Integer pid;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+    /**
+     * 是否开发 0否 1开放
+     */
+    @Schema(description = "是否开发 0否 1开放")
+    private Integer isOpen;
+
+
+    /**
+     * 起始交易额查看权限
+     */
+    @Schema(description = "起始交易额查看权限")
+    private BigDecimal startAmount;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSchoolStudy.java

@@ -0,0 +1,122 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商学院创客学堂(KxsSchoolStudy)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsSchoolStudy extends Model<KxsSchoolStudy> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 详情描述
+     */
+    @Schema(description = "详情描述")
+    private String detail;
+
+
+    /**
+     * 学习人数
+     */
+    @Schema(description = "学习人数")
+    private Integer studyPerson;
+
+
+    /**
+     * 作者
+     */
+    @Schema(description = "作者")
+    private String lecturer;
+
+
+    /**
+     * 外链
+     */
+    @Schema(description = "外链")
+    private String url;
+
+
+    /**
+     * 封面
+     */
+    @Schema(description = "封面")
+    private String listPic;
+
+
+    /**
+     * 分类ID
+     */
+    @Schema(description = "分类ID")
+    private Integer menuId;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSysMsg.java

@@ -0,0 +1,143 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 系统消息推送表(KxsSysMsg)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsSysMsg extends Model<KxsSysMsg> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 简介
+     */
+    @Schema(description = "简介")
+    private String summary;
+
+
+    /**
+     * 消息类型 0html页面 1URL 2简单文字
+     */
+    @Schema(description = "消息类型 0html页面 1URL 2简单文字")
+    private Integer msgType;
+
+
+    /**
+     * 开始时间
+     */
+    @Schema(description = "开始时间")
+    private LocalDateTime startTime;
+
+
+    /**
+     * 结束时间
+     */
+    @Schema(description = "结束时间")
+    private LocalDateTime endTime;
+
+
+    /**
+     * 背景图片
+     */
+    @Schema(description = "背景图片")
+    private String bgPic;
+
+
+    /**
+     * 推送类型 0不推送 1立即推送 2定时推送
+     */
+    @Schema(description = "推送类型 0不推送 1立即推送 2定时推送")
+    private Integer pushType;
+
+
+    /**
+     * 推送时间
+     */
+    @Schema(description = "推送时间")
+    private LocalDateTime pushTime;
+
+
+    /**
+     * 跳转地址
+     */
+    @Schema(description = "跳转地址")
+    private String url;
+
+
+    /**
+     * 推送内容
+     */
+    @Schema(description = "推送内容")
+    private String content;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsUserMsg.java

@@ -0,0 +1,155 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 系统用户消息推送表(KxsUserMsg)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserMsg extends Model<KxsUserMsg> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 简介
+     */
+    @Schema(description = "简介")
+    private String summary;
+
+
+    /**
+     * 消息类型 0html页面 1URL 2简单文字
+     */
+    @Schema(description = "消息类型 0html页面 1URL 2简单文字")
+    private Integer msgType;
+
+
+    /**
+     * 开始时间
+     */
+    @Schema(description = "开始时间")
+    private LocalDateTime startTime;
+
+
+    /**
+     * 结束时间
+     */
+    @Schema(description = "结束时间")
+    private LocalDateTime endTime;
+
+
+    /**
+     * 背景图片
+     */
+    @Schema(description = "背景图片")
+    private String bgPic;
+
+
+    /**
+     * 推送类型 0不推送 1立即推送 2定时推送
+     */
+    @Schema(description = "推送类型 0不推送 1立即推送 2定时推送")
+    private Integer pushType;
+
+
+    /**
+     * 推送时间
+     */
+    @Schema(description = "推送时间")
+    private LocalDateTime pushTime;
+
+
+    /**
+     * 跳转地址
+     */
+    @Schema(description = "跳转地址")
+    private String url;
+
+    /**
+     * 推送内容
+     */
+    @Schema(description = "推送内容")
+    private String content;
+
+
+    /**
+     * 0未读 1已读
+     */
+    @Schema(description = "0未读 1已读")
+    private Integer readFlag;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/util/MsgTemplateUtil.java

@@ -0,0 +1,20 @@
+package com.kxs.system.api.util;
+
+/**
+ *  个人消息模板
+ *
+ * @author Lxq
+ * @date 2023-12-14
+ */
+public class MsgTemplateUtil {
+
+    /**
+     * 来新人啦
+     *
+     * @return {@link String}
+     */
+    public static String newUserPush(){
+
+        return "您的创业邦系统有新人加入了，请进入客小爽-我的创客中查看!";
+    }
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/PreLogVO.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/PreLogVO.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.vo;
+package com.kxs.system.api.vo.admin;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/RoleExcelVO.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/RoleExcelVO.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.vo;
+package com.kxs.system.api.vo.admin;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/RoleVO.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/RoleVO.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.vo;
+package com.kxs.system.api.vo.admin;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/TokenVo.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/TokenVo.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.vo;
+package com.kxs.system.api.vo.admin;
 
 import lombok.Data;
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/UserExcelVO.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/UserExcelVO.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.vo;
+package com.kxs.system.api.vo.admin;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/UserVO.java → kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/UserVO.java

@@ -1,4 +1,4 @@
-package com.kxs.system.api.vo;
+package com.kxs.system.api.vo.admin;
 
 import com.kxs.system.api.model.SysPost;
 import com.kxs.system.api.model.SysRole;

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/NotReadCountVo.java

@@ -0,0 +1,26 @@
+package com.kxs.system.api.vo.kxsapp;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 消息未读数vo
+ *
+ * @author Lxq
+ * @date 2023-12-15
+ */
+@Data
+@Schema(description = "消息未读数")
+public class NotReadCountVo {
+
+    /**
+     * 个人消息未读数
+     */
+    private Long personalCount;
+
+    /**
+     * 系统消息未读数
+     */
+    private Long placardCount;
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/activityMarket/ActivityMarketListVO.java

@@ -0,0 +1,71 @@
+package com.kxs.system.api.vo.kxsapp.activityMarket;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 市场活动-市场活动列表vo
+ *
+ * @author 系统
+ * @date 2023-12-15 12:16:32
+ */
+@Data
+@Schema(description = "市场活动-市场活动列表返回实体")
+public class ActivityMarketListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 详情描述
+     */
+    @Schema(description = "详情描述")
+    private String contents;
+
+
+    /**
+     * 外链
+     */
+    @Schema(description = "外链")
+    private String url;
+
+
+    /**
+     * 封面
+     */
+    @Schema(description = "封面")
+    private String picPath;
+
+
+    /**
+     * 状态 0下架 1上架
+     */
+    @Schema(description = "状态 0下架 1上架")
+    private Integer status;
+
+
+
+
+
+	
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/activityMarket/ActivityMarketVO.java

@@ -0,0 +1,43 @@
+package com.kxs.system.api.vo.kxsapp.activityMarket;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 市场活动-市场活动详情vo
+ *
+ * @author 系统
+ * @date 2023-12-15 12:16:32
+ */
+@Data
+@Schema(description = "市场活动-市场活动详情返回实体")
+public class ActivityMarketVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 详情描述
+     */
+    @Schema(description = "详情描述")
+    private String contents;
+
+
+
+
+
+	
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/banner/BannerListVO.java

@@ -0,0 +1,55 @@
+package com.kxs.system.api.vo.kxsapp.banner;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 广告-广告管理vo
+ *
+ * @author 系统
+ * @date 2023-12-15 12:16:32
+ */
+@Data
+@Schema(description = "广告-广告管理返回实体")
+public class BannerListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private Integer id;
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 封面图地址
+     */
+    @Schema(description = "封面图地址")
+    private String picUrl;
+
+
+    /**
+     * 跳转链接
+     */
+    @Schema(description = "跳转链接")
+    private String url;
+
+
+
+
+
+	
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/sysMsg/SysMsgPageVO.java

@@ -0,0 +1,66 @@
+package com.kxs.system.api.vo.kxsapp.sysMsg;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 系统消息-消息列表vo
+ *
+ * @author 系统
+ * @date 2023-12-15 12:16:33
+ */
+@Data
+@Schema(description = "系统消息-消息列表返回实体")
+public class SysMsgPageVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 简介
+     */
+    @Schema(description = "简介")
+    private String summary;
+
+
+    /**
+     * 消息类型 0html页面 1URL 2简单文字
+     */
+    @Schema(description = "消息类型 0html页面 1URL 2简单文字")
+    private Integer msgType;
+
+
+    /**
+     * 推送时间
+     */
+    @Schema(description = "推送时间")
+    private LocalDateTime pushTime;
+
+
+    /**
+     * 跳转地址
+     */
+    @Schema(description = "跳转地址")
+    private String url;
+
+
+
+
+
+	
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/sysMsg/SysMsgVO.java

@@ -0,0 +1,45 @@
+package com.kxs.system.api.vo.kxsapp.sysMsg;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 系统消息-消息列表vo
+ *
+ * @author 系统
+ * @date 2023-12-15 12:16:33
+ */
+@Data
+@Schema(description = "系统消息-消息列表返回实体")
+public class SysMsgVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 简介
+     */
+    @Schema(description = "简介")
+    private String summary;
+
+
+    /**
+     * 内容
+     */
+    @Schema(description = "内容")
+    private String content;
+
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/userMsg/UserMsgPageVO.java

@@ -0,0 +1,72 @@
+package com.kxs.system.api.vo.kxsapp.userMsg;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 个人消息-消息列表vo
+ *
+ * @author 系统
+ * @date 2023-12-15 12:16:33
+ */
+@Data
+@Schema(description = "个人消息-消息列表返回实体")
+public class UserMsgPageVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 简介
+     */
+    @Schema(description = "简介")
+    private String summary;
+
+
+    /**
+     * 消息类型 0html页面 1URL 2简单文字
+     */
+    @Schema(description = "消息类型 0html页面 1URL 2简单文字")
+    private Integer msgType;
+
+
+    /**
+     * 推送时间
+     */
+    @Schema(description = "推送时间")
+    private LocalDateTime pushTime;
+
+
+    /**
+     * 跳转地址
+     */
+    @Schema(description = "跳转地址")
+    private String url;
+
+
+
+
+
+	
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/userMsg/UserMsgVO.java

@@ -0,0 +1,45 @@
+package com.kxs.system.api.vo.kxsapp.userMsg;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 系统消息-消息列表vo
+ *
+ * @author 系统
+ * @date 2023-12-15 12:16:33
+ */
+@Data
+@Schema(description = "系统消息-消息列表返回实体")
+public class UserMsgVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 简介
+     */
+    @Schema(description = "简介")
+    private String summary;
+
+
+    /**
+     * 内容
+     */
+    @Schema(description = "内容")
+    private String content;
+
+
+}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/KxsAdminApplication.java → kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/KxsSysApplication.java

@@ -16,10 +16,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableLoginResourceServer
 @EnableAuthResourceServer
 @EnableKxsDoc(value = "admin")
-public class KxsAdminApplication {
+public class KxsSysApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(KxsAdminApplication.class, args);
+		SpringApplication.run(KxsSysApplication.class, args);
 	}
 
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/constant/SysConstants.java

@@ -0,0 +1,24 @@
+
+package com.kxs.system.biz.constant;
+
+/**
+ * 系统公共常量
+ *
+ * @author 没秃顶的码农
+ * @date 2023/10/29
+ */
+public interface SysConstants {
+
+	String KXS_SYS_MSG_PREFIX = "sysMsgId::";
+
+	/**
+	 * 已读标志
+	 */
+	Integer READ_FLAG_TRUE = 1;
+	/**
+	 * 未读标记
+	 */
+	Integer READ_FLAG_FALSE = 0;
+
+
+}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysLogController.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
-import com.kxs.system.api.dto.SysLogDTO;
+import com.kxs.system.api.dto.admin.SysLogDTO;
 import com.kxs.system.api.model.SysLog;
 import com.kxs.system.biz.service.SysLogService;
 import com.kxs.common.core.util.R;

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysRoleController.java

@@ -1,6 +1,7 @@
 package com.kxs.system.biz.controller.admin;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,7 +9,7 @@ import com.kxs.common.core.constant.CacheConstants;
 import com.kxs.common.core.util.R;
 import com.kxs.common.log.annotation.SysLog;
 import com.kxs.system.api.model.SysRole;
-import com.kxs.system.api.vo.RoleVO;
+import com.kxs.system.api.vo.admin.RoleVO;
 import com.kxs.system.biz.service.SysRoleService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -114,7 +115,7 @@ public class SysRoleController {
 	@GetMapping("/page")
 	public R getRolePage(Page page, SysRole role) {
 		return R.ok(sysRoleService.page(page, Wrappers.<SysRole>lambdaQuery()
-			.like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())));
+			.like(CharSequenceUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())));
 	}
 
 	/**

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysUserController.java

@@ -8,7 +8,7 @@ import com.kxs.common.core.util.R;
 import com.kxs.common.log.annotation.SysLog;
 import com.kxs.common.security.annotation.Inner;
 import com.kxs.common.security.util.SecurityUtils;
-import com.kxs.system.api.dto.UserDTO;
+import com.kxs.system.api.dto.admin.UserDTO;
 import com.kxs.system.api.model.SysUser;
 import com.kxs.system.biz.constant.enums.SysErrorTypeEnum;
 import com.kxs.system.biz.service.SysUserService;

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/TokenController.java

@@ -16,7 +16,7 @@ import com.kxs.common.log.annotation.SysLog;
 import com.kxs.common.security.util.OAuth2EndpointUtils;
 import com.kxs.common.security.util.OAuthClientException;
 import com.kxs.system.api.model.SysOauthClientDetails;
-import com.kxs.system.api.vo.TokenVo;
+import com.kxs.system.api.vo.admin.TokenVo;
 import com.kxs.system.biz.service.SysOauthClientDetailsService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/ActivityMarketController.java

@@ -0,0 +1,65 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.model.KxsActivityMarket;
+import com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketVO;
+import com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketListVO;
+import com.kxs.system.biz.service.KxsActivityMarketService;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 首页(ActivityMarket)控制层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("activityMarket")
+public class ActivityMarketController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsActivityMarketService kxsActivityMarketService;
+
+
+
+    /**
+     * 市场活动-市场活动列表
+     *
+     * @param page 分页对象
+     * @param menuId 类目ID
+     * @return 市场活动-市场活动列表
+     */
+    @GetMapping("/list")
+    public R list(@ParameterObject Page<ActivityMarketListVO> page, @RequestParam("menuId") Integer menuId) {
+
+        return R.ok(kxsActivityMarketService.getByPage(page, menuId));
+    }
+
+
+    /**
+     * 市场活动-市场活动详情
+     *
+     * @param id 主键ID
+     * @return 市场活动-市场活动详情
+     */
+    @GetMapping("/getById")
+    public R getById(@RequestParam("id") Integer id) {
+
+        KxsActivityMarket byId = kxsActivityMarketService.getById(id);
+        ActivityMarketVO activityMarketGetByIdVO = new ActivityMarketVO();
+        BeanUtils.copyProperties(byId, activityMarketGetByIdVO);
+        return R.ok(activityMarketGetByIdVO);
+    }
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/BannerController.java

@@ -0,0 +1,41 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.vo.kxsapp.banner.BannerListVO;
+import com.kxs.system.biz.service.KxsBannerService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 首页(Banner)控制层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("banner")
+public class BannerController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsBannerService kxsBannerService;
+
+    /**
+     * 广告-广告管理
+     *
+     * @return 广告-广告管理
+     */
+    @GetMapping("/list")
+    public R<List<BannerListVO>> list() {
+
+        return R.ok(kxsBannerService.getBylist());
+    }
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/FeedbackController.java

@@ -0,0 +1,40 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+
+import com.kxs.common.core.util.R;
+import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.system.api.dto.kxsapp.FeedBackDto;
+import com.kxs.system.api.model.KxsFeedback;
+import com.kxs.system.biz.service.KxsFeedbackService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 意见反馈
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("feedback")
+public class FeedbackController {
+
+    private final KxsFeedbackService kxsFeedbackService;
+
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody FeedBackDto feedBackDto){
+
+        KxsFeedback kxsFeedback = new KxsFeedback();
+        BeanUtils.copyProperties(feedBackDto, kxsFeedback);
+
+        Long userId = SecurityUtils.getUser().getId();
+        kxsFeedback.setUserId(userId.intValue());
+        return R.ok(kxsFeedbackService.save(kxsFeedback));
+    }
+}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/KxsActivityMarketController.java

@@ -1,56 +0,0 @@
-package com.kxs.system.biz.controller.kxsapp;
-
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.kxs.common.core.util.R;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.system.api.model.KxsActivityMarket;
-import com.kxs.system.biz.service.KxsActivityMarketService;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.Serializable;
-import java.util.List;
-import lombok.RequiredArgsConstructor;
-
-/**
- * 市场活动信息表(KxsActivityMarket)表控制层
- *
- * @author 快秃顶的码农
- * @since 2023-12-13 10:53:45
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("activityMarket")
-public class KxsActivityMarketController {
-    /**
-     * 服务对象
-     */
-    private final KxsActivityMarketService kxsActivityMarketService;
-
-    /**
-     * 分页查询所有数据
-     *
-     * @param page 分页对象
-     * @param kxsActivityMarket 查询实体
-     * @return 所有数据
-     */
-    @GetMapping("/list")
-    public R list(Page<KxsActivityMarket> page, KxsActivityMarket kxsActivityMarket) {
-        return R.ok(this.kxsActivityMarketService.page(page, new QueryWrapper<>(kxsActivityMarket)));
-    }
-
-    /**
-     * 通过主键查询单条数据
-     *
-     * @param id 主键
-     * @return 单条数据
-     */
-    @GetMapping("/{id}")
-    public R getById(@PathVariable Serializable id) {
-        return R.ok(this.kxsActivityMarketService.getById(id));
-    }
-
-
-}
-

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/MorningController.java

@@ -0,0 +1,45 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.model.KxsMorning;
+import com.kxs.system.biz.service.KxsMorningService;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 首页(Morning)控制层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("morning")
+public class MorningController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsMorningService kxsMorningService;
+
+    /**
+     * 商学院-晨会列表
+     *
+     * @param page 分页对象
+     * @return 商学院-晨会列表
+     */
+    @GetMapping("/page")
+    public R page(@ParameterObject Page<KxsMorning> page) {
+
+        return R.ok(kxsMorningService.page(page,
+                Wrappers.<KxsMorning>lambdaQuery().orderByDesc(KxsMorning::getCreateTime)));
+    }
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/RuleMakingController.java

@@ -0,0 +1,39 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.kxs.common.core.util.R;
+import com.kxs.system.biz.service.KxsRuleMakingService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 公共板块(RuleMaking)控制层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("rulemaking")
+public class RuleMakingController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsRuleMakingService kxsRulemakingService;
+
+    /**
+     * 获取协议内容
+     *
+     * @param id 主键ID
+     * @return 获取协议内容
+     */
+    @GetMapping("/getById")
+    public R getById(@RequestParam("id") Integer id) {
+        return R.ok(kxsRulemakingService.getById(id));
+    }
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/SchoolController.java

@@ -0,0 +1,80 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.model.KxsSchoolMenu;
+import com.kxs.system.api.model.KxsSchoolStudy;
+import com.kxs.system.biz.service.KxsSchoolMenuService;
+import com.kxs.system.biz.service.KxsSchoolStudyService;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 首页(School)控制层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("school")
+public class SchoolController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsSchoolMenuService kxsSchoolMenuService;
+    private final KxsSchoolStudyService kxsSchoolStudyService;
+
+
+
+    /**
+     * 商学院-创客学堂一级分类
+     *
+     * @return 商学院-创客学堂一级分类
+     */
+    @GetMapping("/firstMenu")
+    public R firstMenu() {
+
+        return R.ok(kxsSchoolMenuService.list(Wrappers.emptyWrapper()));
+    }
+
+
+    /**
+     * 商学院-创客学堂列表
+     *
+     * @param page 分页对象
+     * @return 商学院-创客学堂列表
+     */
+    @GetMapping("/page")
+    public R page(@ParameterObject Page<KxsSchoolStudy> page, @RequestParam("menuId") Integer menuId) {
+
+        return R.ok(kxsSchoolStudyService
+                .page(page, Wrappers.<KxsSchoolStudy>lambdaQuery().eq(KxsSchoolStudy::getMenuId, menuId)));
+    }
+
+
+    /**
+     * 商学院-创客学堂二级分类
+     *
+     * @param colId 上级ID
+     * @return 商学院-创客学堂二级分类
+     */
+    @GetMapping("/secondMenu")
+    public R secondMenu(@RequestParam("colId") Integer colId) {
+
+        return R.ok(kxsSchoolMenuService
+                .list(Wrappers.<KxsSchoolMenu>lambdaQuery().eq(KxsSchoolMenu::getPid, colId)));
+    }
+
+
+
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/SysMsgController.java

@@ -0,0 +1,69 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgPageVO;
+import com.kxs.system.biz.service.KxsSysMsgService;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 消息(SysMsg)控制层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysMsg")
+public class SysMsgController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsSysMsgService kxsSysMsgService;
+
+
+
+    /**
+     * 系统消息-全部已读
+     *
+     * @return 系统消息-全部已读
+     */
+    @PostMapping("/readAll")
+    public R readAll() {
+        kxsSysMsgService.readAll();
+        return R.ok();
+    }
+
+    /**
+     * 系统消息-消息详情
+     *
+     * @param id 主键ID
+     * @return 系统消息-消息详情
+     */
+    @GetMapping("/getById")
+    public R getById(@RequestParam("id") Integer id) {
+
+        return R.ok(kxsSysMsgService.getByData(id));
+    }
+
+
+    /**
+     * 系统消息-消息列表
+     *
+     * @param page 分页对象
+     * @return 系统消息-消息列表
+     */
+    @GetMapping("/page")
+    public R page(@ParameterObject Page<SysMsgPageVO> page) {
+        return R.ok(kxsSysMsgService.getByPage(page));
+    }
+
+
+
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/UserMsgController.java

@@ -0,0 +1,79 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.vo.kxsapp.NotReadCountVo;
+import com.kxs.system.api.vo.kxsapp.userMsg.UserMsgPageVO;
+import com.kxs.system.biz.service.KxsUserMsgService;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 消息(UserMsg)控制层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:33
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("userMsg")
+public class UserMsgController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsUserMsgService kxsUserMsgService;
+
+
+
+    /**
+     * 个人消息-消息列表
+     *
+     * @param page 分页对象
+     * @return 个人消息-消息列表
+     */
+    @GetMapping("/page")
+    public R page(@ParameterObject Page<UserMsgPageVO> page) {
+        return R.ok(kxsUserMsgService.getByPage(page));
+    }
+
+
+    /**
+     * 个人消息-消息详情
+     *
+     * @param id 主键ID
+     * @return 个人消息-消息详情
+     */
+    @GetMapping("/getById")
+    public R getById(@RequestParam("id") Integer id) {
+        return R.ok(kxsUserMsgService.getByData(id));
+    }
+
+    /**
+     * 消息未读数
+     *
+     * @return 消息未读数
+     */
+    @GetMapping("/notread")
+    public R<NotReadCountVo> notread() {
+        return R.ok(kxsUserMsgService.notreads());
+    }
+
+    /**
+     * 个人消息-全部已读
+     *
+     * @return 个人消息-全部已读
+     */
+    @PostMapping("/readAll")
+    public R readAll() {
+        kxsUserMsgService.readAll();
+        return R.ok();
+    }
+
+
+
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsActivityMarketMapper.java

@@ -1,15 +1,29 @@
 package com.kxs.system.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.system.api.model.KxsActivityMarket;
+import com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketListVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 市场活动信息表(KxsActivityMarket)表数据库访问层
  *
- * @author 快秃顶的码农
- * @since 2023-12-13 10:53:47
+ * @author 系统
+ * @since 2023-12-15 12:16:31
  */
+@Mapper
 public interface KxsActivityMarketMapper extends BaseMapper<KxsActivityMarket> {
 
+    /**
+     * 按页获取
+     *
+     * @param page   页面
+     * @param menuId 菜单id
+     * @return {@link IPage}<{@link ActivityMarketListVO}>
+     */
+    IPage<ActivityMarketListVO> getByPage(Page<ActivityMarketListVO> page, @Param("menuId") Integer menuId);
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsActivityMenuMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsActivityMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 市场活动分类(KxsActivityMenu)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+public interface KxsActivityMenuMapper extends BaseMapper<KxsActivityMenu> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsAppModalMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsAppModal;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * APP弹窗管理表(KxsAppModal)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+public interface KxsAppModalMapper extends BaseMapper<KxsAppModal> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsBannerMapper.java

@@ -0,0 +1,27 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsBanner;
+import com.kxs.system.api.vo.kxsapp.banner.BannerListVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 首页广告管理表(KxsBanner)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@Mapper
+public interface KxsBannerMapper extends BaseMapper<KxsBanner> {
+
+    /**
+     * 查询banner列表
+     *
+     * @return {@link List}<{@link BannerListVO}>
+     */
+    List<BannerListVO> getByList();
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsFeedbackMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsFeedback;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户反馈信息(KxsFeedback)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+public interface KxsFeedbackMapper extends BaseMapper<KxsFeedback> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsMorningMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsMorning;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商学院晨会表(KxsMorning)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+public interface KxsMorningMapper extends BaseMapper<KxsMorning> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsRuleMakingMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsRuleMaking;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽协议规则表(KxsRuleMaking)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+public interface KxsRuleMakingMapper extends BaseMapper<KxsRuleMaking> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsSchoolMenuMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsSchoolMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商学院创客学堂分类(KxsSchoolMenu)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+public interface KxsSchoolMenuMapper extends BaseMapper<KxsSchoolMenu> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsSchoolStudyMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsSchoolStudy;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商学院创客学堂(KxsSchoolStudy)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+public interface KxsSchoolStudyMapper extends BaseMapper<KxsSchoolStudy> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsSysMsgMapper.java

@@ -0,0 +1,27 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.system.api.model.KxsSysMsg;
+import com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgPageVO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统消息推送表(KxsSysMsg)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@Mapper
+public interface KxsSysMsgMapper extends BaseMapper<KxsSysMsg> {
+
+    /**
+     * app端分页获取
+     *
+     * @param page 页
+     * @return {@link IPage}<{@link SysMsgPageVO}>
+     */
+    IPage<SysMsgPageVO> getByPage(Page<SysMsgPageVO> page);
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsUserMsgMapper.java

@@ -0,0 +1,21 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.system.api.model.KxsUserMsg;
+import com.kxs.system.api.vo.kxsapp.userMsg.UserMsgPageVO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统用户消息推送表(KxsUserMsg)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@Mapper
+public interface KxsUserMsgMapper extends BaseMapper<KxsUserMsg> {
+
+    IPage<UserMsgPageVO> getByPage(Page<UserMsgPageVO> page);
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/SysUserMapper.java

@@ -3,9 +3,9 @@ package com.kxs.system.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.system.api.dto.UserDTO;
+import com.kxs.system.api.dto.admin.UserDTO;
 import com.kxs.system.api.model.SysUser;
-import com.kxs.system.api.vo.UserVO;
+import com.kxs.system.api.vo.admin.UserVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsActivityMarketService.java

@@ -1,15 +1,19 @@
 package com.kxs.system.biz.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.system.api.model.KxsActivityMarket;
+import com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketListVO;
 
 /**
  * 市场活动信息表(KxsActivityMarket)表服务接口
  *
- * @author 快秃顶的码农
- * @since 2023-12-13 10:53:49
+ * @author 系统
+ * @since 2023-12-15 12:16:31
  */
 public interface KxsActivityMarketService extends IService<KxsActivityMarket> {
 
+    IPage<ActivityMarketListVO> getByPage(Page<ActivityMarketListVO> page, Integer menuId);
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsActivityMenuService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsActivityMenu;
+
+/**
+ * 市场活动分类(KxsActivityMenu)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+public interface KxsActivityMenuService extends IService<KxsActivityMenu> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsAppModalService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsAppModal;
+
+/**
+ * APP弹窗管理表(KxsAppModal)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+public interface KxsAppModalService extends IService<KxsAppModal> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsBannerService.java

@@ -0,0 +1,24 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsBanner;
+import com.kxs.system.api.vo.kxsapp.banner.BannerListVO;
+
+import java.util.List;
+
+/**
+ * 首页广告管理表(KxsBanner)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+public interface KxsBannerService extends IService<KxsBanner> {
+
+    /**
+     * 查询banner列表
+     *
+     * @return {@link List}<{@link BannerListVO}>
+     */
+    List<BannerListVO> getBylist();
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsFeedbackService.java

@@ -0,0 +1,16 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.dto.kxsapp.FeedBackDto;
+import com.kxs.system.api.model.KxsFeedback;
+
+/**
+ * 用户反馈信息(KxsFeedback)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+public interface KxsFeedbackService extends IService<KxsFeedback> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsMorningService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsMorning;
+
+/**
+ * 商学院晨会表(KxsMorning)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+public interface KxsMorningService extends IService<KxsMorning> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsRuleMakingService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsRuleMaking;
+
+/**
+ * 客小爽协议规则表(KxsRuleMaking)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+public interface KxsRuleMakingService extends IService<KxsRuleMaking> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsSchoolMenuService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsSchoolMenu;
+
+/**
+ * 商学院创客学堂分类(KxsSchoolMenu)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+public interface KxsSchoolMenuService extends IService<KxsSchoolMenu> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsSchoolStudyService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsSchoolStudy;
+
+/**
+ * 商学院创客学堂(KxsSchoolStudy)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+public interface KxsSchoolStudyService extends IService<KxsSchoolStudy> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsSysMsgService.java

@@ -0,0 +1,41 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsSysMsg;
+import com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgPageVO;
+import com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgVO;
+
+/**
+ * 系统消息推送表(KxsSysMsg)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+public interface KxsSysMsgService extends IService<KxsSysMsg> {
+
+    /**
+     * app端分页获取
+     *
+     * @param page 页面
+     * @return {@link IPage}<{@link SysMsgPageVO}>
+     */
+    IPage<SysMsgPageVO> getByPage(Page<SysMsgPageVO> page);
+
+    /**
+     * 阅读所有
+     * 系统消息此处消息存储在redis里面，只需要清楚当前用户已读消息ID 即可
+     */
+    void readAll();
+
+    /**
+     * 消息详情 已读消息
+     *
+     * @param id id
+     * @return {@link SysMsgVO}
+     */
+    SysMsgVO getByData(Integer id);
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsUserMsgService.java

@@ -0,0 +1,48 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsUserMsg;
+import com.kxs.system.api.vo.kxsapp.NotReadCountVo;
+import com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgPageVO;
+import com.kxs.system.api.vo.kxsapp.userMsg.UserMsgPageVO;
+import com.kxs.system.api.vo.kxsapp.userMsg.UserMsgVO;
+
+/**
+ * 系统用户消息推送表(KxsUserMsg)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+public interface KxsUserMsgService extends IService<KxsUserMsg> {
+
+    /**
+     * app端分页获取
+     *
+     * @param page 页面
+     * @return {@link IPage}<{@link SysMsgPageVO}>
+     */
+    IPage<UserMsgPageVO> getByPage(Page<UserMsgPageVO> page);
+
+    /**
+     * app单条数据获取
+     *
+     * @param id id
+     * @return {@link UserMsgVO}
+     */
+    UserMsgVO getByData(Integer id);
+
+    /**
+     * 阅读所有
+     */
+    void readAll();
+
+    /**
+     * app消息未读数
+     *
+     * @return {@link NotReadCountVo}
+     */
+    NotReadCountVo notreads();
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/SysLogService.java

@@ -2,7 +2,7 @@ package com.kxs.system.biz.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.kxs.system.api.dto.SysLogDTO;
+import com.kxs.system.api.dto.admin.SysLogDTO;
 import com.kxs.system.api.model.SysLog;
 
 /**

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/SysRoleService.java

@@ -1,11 +1,9 @@
 package com.kxs.system.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.kxs.system.api.vo.RoleExcelVO;
-import com.kxs.system.api.vo.RoleVO;
-import com.kxs.common.core.util.R;
+import com.kxs.system.api.vo.admin.RoleExcelVO;
+import com.kxs.system.api.vo.admin.RoleVO;
 import com.kxs.system.api.model.SysRole;
-import org.springframework.validation.BindingResult;
 
 import java.util.List;
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/SysUserService.java

@@ -3,15 +3,12 @@ package com.kxs.system.biz.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.kxs.system.api.dto.UserDTO;
-import com.kxs.system.api.dto.UserInfo;
-import com.kxs.system.api.vo.UserExcelVO;
-import com.kxs.system.api.vo.UserVO;
+import com.kxs.system.api.dto.admin.UserDTO;
+import com.kxs.system.api.dto.admin.UserInfo;
+import com.kxs.system.api.vo.admin.UserVO;
 import com.kxs.common.core.util.R;
 import com.kxs.system.api.model.SysUser;
-import org.springframework.validation.BindingResult;
 
-import java.util.List;
 
 /**
  * @author 秃顶的码农

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsActivityMarketServiceImpl.java

@@ -1,6 +1,9 @@
 package com.kxs.system.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketListVO;
 import com.kxs.system.biz.mapper.KxsActivityMarketMapper;
 import com.kxs.system.api.model.KxsActivityMarket;
 import com.kxs.system.biz.service.KxsActivityMarketService;
@@ -9,11 +12,16 @@ import org.springframework.stereotype.Service;
 /**
  * 市场活动信息表(KxsActivityMarket)表服务实现类
  *
- * @author 快秃顶的码农
- * @since 2023-12-13 10:53:50
+ * @author 系统
+ * @since 2023-12-15 12:16:31
  */
 @Service("kxsActivityMarketService")
 public class KxsActivityMarketServiceImpl extends ServiceImpl<KxsActivityMarketMapper, KxsActivityMarket> implements KxsActivityMarketService {
 
+    @Override
+    public IPage<ActivityMarketListVO> getByPage(Page<ActivityMarketListVO> page, Integer menuId) {
+
+        return baseMapper.getByPage(page, menuId);
+    }
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsActivityMenuServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsActivityMenuMapper;
+import com.kxs.system.api.model.KxsActivityMenu;
+import com.kxs.system.biz.service.KxsActivityMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 市场活动分类(KxsActivityMenu)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Service("kxsActivityMenuService")
+public class KxsActivityMenuServiceImpl extends ServiceImpl<KxsActivityMenuMapper, KxsActivityMenu> implements KxsActivityMenuService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsAppModalServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsAppModalMapper;
+import com.kxs.system.api.model.KxsAppModal;
+import com.kxs.system.biz.service.KxsAppModalService;
+import org.springframework.stereotype.Service;
+
+/**
+ * APP弹窗管理表(KxsAppModal)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@Service("kxsAppModalService")
+public class KxsAppModalServiceImpl extends ServiceImpl<KxsAppModalMapper, KxsAppModal> implements KxsAppModalService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsBannerServiceImpl.java

@@ -0,0 +1,27 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.api.vo.kxsapp.banner.BannerListVO;
+import com.kxs.system.biz.mapper.KxsBannerMapper;
+import com.kxs.system.api.model.KxsBanner;
+import com.kxs.system.biz.service.KxsBannerService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 首页广告管理表(KxsBanner)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@Service("kxsBannerService")
+public class KxsBannerServiceImpl extends ServiceImpl<KxsBannerMapper, KxsBanner> implements KxsBannerService {
+
+    @Override
+    public List<BannerListVO> getBylist() {
+
+        return baseMapper.getByList();
+    }
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsFeedbackServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsFeedbackMapper;
+import com.kxs.system.api.model.KxsFeedback;
+import com.kxs.system.biz.service.KxsFeedbackService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户反馈信息(KxsFeedback)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Service("kxsFeedbackService")
+public class KxsFeedbackServiceImpl extends ServiceImpl<KxsFeedbackMapper, KxsFeedback> implements KxsFeedbackService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsMorningServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsMorningMapper;
+import com.kxs.system.api.model.KxsMorning;
+import com.kxs.system.biz.service.KxsMorningService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 商学院晨会表(KxsMorning)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Service("kxsMorningService")
+public class KxsMorningServiceImpl extends ServiceImpl<KxsMorningMapper, KxsMorning> implements KxsMorningService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsRuleMakingServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsRuleMakingMapper;
+import com.kxs.system.api.model.KxsRuleMaking;
+import com.kxs.system.biz.service.KxsRuleMakingService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽协议规则表(KxsRuleMaking)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Service("kxsRuleMakingService")
+public class KxsRuleMakingServiceImpl extends ServiceImpl<KxsRuleMakingMapper, KxsRuleMaking> implements KxsRuleMakingService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsSchoolMenuServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsSchoolMenuMapper;
+import com.kxs.system.api.model.KxsSchoolMenu;
+import com.kxs.system.biz.service.KxsSchoolMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 商学院创客学堂分类(KxsSchoolMenu)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Service("kxsSchoolMenuService")
+public class KxsSchoolMenuServiceImpl extends ServiceImpl<KxsSchoolMenuMapper, KxsSchoolMenu> implements KxsSchoolMenuService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsSchoolStudyServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsSchoolStudyMapper;
+import com.kxs.system.api.model.KxsSchoolStudy;
+import com.kxs.system.biz.service.KxsSchoolStudyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 商学院创客学堂(KxsSchoolStudy)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Service("kxsSchoolStudyService")
+public class KxsSchoolStudyServiceImpl extends ServiceImpl<KxsSchoolStudyMapper, KxsSchoolStudy> implements KxsSchoolStudyService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsSysMsgServiceImpl.java

@@ -0,0 +1,65 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgPageVO;
+import com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgVO;
+import com.kxs.system.biz.constant.SysConstants;
+import com.kxs.system.biz.mapper.KxsSysMsgMapper;
+import com.kxs.system.api.model.KxsSysMsg;
+import com.kxs.system.biz.service.KxsSysMsgService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+/**
+ * 系统消息推送表(KxsSysMsg)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@Service("kxsSysMsgService")
+@RequiredArgsConstructor
+public class KxsSysMsgServiceImpl extends ServiceImpl<KxsSysMsgMapper, KxsSysMsg> implements KxsSysMsgService {
+
+    private final RedisTemplate<String, Object> redisTemplate;
+
+    @Override
+    public IPage<SysMsgPageVO> getByPage(Page<SysMsgPageVO> page) {
+
+        return baseMapper.getByPage(page);
+    }
+
+    @Override
+    public void readAll() {
+
+        Long userId = SecurityUtils.getUser().getId();
+        //系统消息存储的key
+        String key = SysConstants.KXS_SYS_MSG_PREFIX + userId;
+
+        redisTemplate.delete(key);
+    }
+
+    @Override
+    public SysMsgVO getByData(Integer id) {
+
+        Long userId = SecurityUtils.getUser().getId();
+        //系统消息存储的key
+        String key = SysConstants.KXS_SYS_MSG_PREFIX + userId;
+
+        KxsSysMsg kxsSysMsg = baseMapper.selectById(id);
+        SysMsgVO sysMsgVO = new SysMsgVO();
+        BeanUtils.copyProperties(kxsSysMsg, sysMsgVO);
+
+        //已读消息
+        redisTemplate.opsForList().remove(key,1, id);
+
+        return sysMsgVO;
+    }
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsUserMsgServiceImpl.java

@@ -0,0 +1,88 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.system.api.model.KxsUserMsg;
+import com.kxs.system.api.vo.kxsapp.NotReadCountVo;
+import com.kxs.system.api.vo.kxsapp.userMsg.UserMsgPageVO;
+import com.kxs.system.api.vo.kxsapp.userMsg.UserMsgVO;
+import com.kxs.system.biz.constant.SysConstants;
+import com.kxs.system.biz.mapper.KxsUserMsgMapper;
+import com.kxs.system.biz.service.KxsUserMsgService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+/**
+ * 系统用户消息推送表(KxsUserMsg)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:32
+ */
+@Service("kxsUserMsgService")
+@RequiredArgsConstructor
+public class KxsUserMsgServiceImpl extends ServiceImpl<KxsUserMsgMapper, KxsUserMsg> implements KxsUserMsgService {
+
+
+    private final RedisTemplate<String, Object> redisTemplate;
+
+    @Override
+    public IPage<UserMsgPageVO> getByPage(Page<UserMsgPageVO> page) {
+
+        return baseMapper.getByPage(page);
+    }
+
+    @Override
+    public UserMsgVO getByData(Integer id) {
+
+        KxsUserMsg kxsUserMsg = baseMapper.selectById(id);
+        //修改未读
+        kxsUserMsg.setReadFlag(SysConstants.READ_FLAG_TRUE);
+        baseMapper.updateById(kxsUserMsg);
+
+        UserMsgVO userMsgVO = new UserMsgVO();
+        BeanUtils.copyProperties(kxsUserMsg, userMsgVO);
+
+        return userMsgVO;
+    }
+
+    @Override
+    public void readAll() {
+
+        Long userId = SecurityUtils.getUser().getId();
+
+        LambdaUpdateWrapper<KxsUserMsg> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(KxsUserMsg::getUserId, userId).set(KxsUserMsg::getReadFlag, SysConstants.READ_FLAG_TRUE);
+
+        baseMapper.update(null, updateWrapper);
+
+    }
+
+    @Override
+    public NotReadCountVo notreads() {
+
+        NotReadCountVo notReadCountVo = new NotReadCountVo();
+
+        Long userId = SecurityUtils.getUser().getId();
+        //系统消息存储的key
+        String key = SysConstants.KXS_SYS_MSG_PREFIX + userId;
+        Long sysCount = redisTemplate.opsForList().size(key);
+        notReadCountVo.setPlacardCount(sysCount);
+
+        //个人消息未读数
+        Long userMsgCount = baseMapper.selectCount(Wrappers.<KxsUserMsg>lambdaQuery()
+                .eq(KxsUserMsg::getUserId, userId)
+                .eq(KxsUserMsg::getReadFlag, SysConstants.READ_FLAG_FALSE));
+        notReadCountVo.setPersonalCount(userMsgCount);
+
+        return notReadCountVo;
+    }
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/SysLogServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kxs.system.api.dto.SysLogDTO;
+import com.kxs.system.api.dto.admin.SysLogDTO;
 import com.kxs.system.biz.mapper.SysLogMapper;
 import com.kxs.system.biz.service.SysLogService;
 import com.kxs.system.api.model.SysLog;

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/SysRoleServiceImpl.java

@@ -4,25 +4,20 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kxs.system.api.vo.RoleExcelVO;
-import com.kxs.system.api.vo.RoleVO;
+import com.kxs.system.api.vo.admin.RoleExcelVO;
+import com.kxs.system.api.vo.admin.RoleVO;
 import com.kxs.system.biz.mapper.SysRoleMapper;
 import com.kxs.system.biz.service.SysRoleMenuService;
 import com.kxs.system.biz.service.SysRoleService;
 import com.kxs.common.core.constant.CacheConstants;
-import com.kxs.common.core.util.R;
 import com.kxs.system.api.model.SysRole;
 import com.kxs.system.api.model.SysRoleMenu;
-import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import lombok.AllArgsConstructor;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.BindingResult;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/SysUserServiceImpl.java

@@ -13,11 +13,13 @@ import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.constant.enums.ErrorTypeEnum;
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
-import com.kxs.system.api.dto.UserDTO;
-import com.kxs.system.api.dto.UserInfo;
-import com.kxs.system.api.model.*;
-import com.kxs.system.api.vo.UserExcelVO;
-import com.kxs.system.api.vo.UserVO;
+import com.kxs.system.api.dto.admin.UserDTO;
+import com.kxs.system.api.dto.admin.UserInfo;
+import com.kxs.system.api.model.SysMenu;
+import com.kxs.system.api.model.SysRole;
+import com.kxs.system.api.model.SysUser;
+import com.kxs.system.api.model.SysUserRole;
+import com.kxs.system.api.vo.admin.UserVO;
 import com.kxs.system.biz.mapper.SysUserMapper;
 import com.kxs.system.biz.mapper.SysUserRoleMapper;
 import com.kxs.system.biz.service.SysMenuService;

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsActivityMarketMapper.xml

@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace=".mapper.KxsActivityMarketMapper">
+<mapper namespace="com.kxs.system.biz.mapper.KxsActivityMarketMapper">
 
-    <resultMap type=".model.KxsActivityMarket" id="KxsActivityMarketMap">
+    <resultMap type="com.kxs.system.api.model.KxsActivityMarket" id="KxsActivityMarketMap">
         <result column="id" property="id" />
-        <result column="status" property="status" />
-        <result column="menu_id" property="menuId" />
-        <result column="pic_path" property="picPath" />
-        <result column="url" property="url" />
-        <result column="contents" property="contents" />
-        <result column="title" property="title" />
-        <result column="version" property="version" />
-        <result column="del_flag" property="delFlag" />
-        <result column="update_time" property="updateTime" />
         <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="title" property="title" />
+        <result column="contents" property="contents" />
+        <result column="url" property="url" />
+        <result column="pic_path" property="picPath" />
+        <result column="menu_id" property="menuId" />
+        <result column="status" property="status" />
+
     </resultMap>
+    <select id="getByPage" resultType="com.kxs.system.api.vo.kxsapp.activityMarket.ActivityMarketListVO">
+        select * from kxs_activity_market a
+        <where>
+            a.del_flag = '0'
+            <if test="menuId != null and menuId != ''">
+                AND u.menu_id = #{menuId}
+            </if>
+        </where>
+    </select>
 
 </mapper>
-

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsActivityMenuMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsActivityMenuMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsActivityMenu" id="KxsActivityMenuMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="sort" property="sort" />
+        <result column="title" property="title" />
+        <result column="pid" property="pid" />
+
+    </resultMap>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsAppModalMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsAppModalMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsAppModal" id="KxsAppModalMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="title" property="title" />
+        <result column="bg_pic" property="bgPic" />
+        <result column="content" property="content" />
+        <result column="is_weekend" property="isWeekend" />
+        <result column="time_by_day" property="timeByDay" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="btn_text" property="btnText" />
+        <result column="url" property="url" />
+        <result column="is_assign" property="isAssign" />
+        <result column="user_codes" property="userCodes" />
+        <result column="msg_type" property="msgType" />
+        <result column="status" property="status" />
+
+    </resultMap>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsBannerMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsBannerMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsBanner" id="KxsBannerMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="title" property="title" />
+        <result column="pic_url" property="picUrl" />
+        <result column="url" property="url" />
+        <result column="ban_type" property="banType" />
+        <result column="remark" property="remark" />
+        <result column="status" property="status" />
+
+    </resultMap>
+    <select id="getByList" resultType="com.kxs.system.api.vo.kxsapp.banner.BannerListVO">
+        select id, title, pic_url, url from kxs_banner a
+        <where>
+            a.del_flag = '0'
+            and status = '1'
+        </where>
+    </select>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsFeedbackMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsFeedbackMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsFeedback" id="KxsFeedbackMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="user_id" property="userId" />
+        <result column="content" property="content" />
+        <result column="back_type" property="backType" />
+
+    </resultMap>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsMorningMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsMorningMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsMorning" id="KxsMorningMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="photo" property="photo" />
+        <result column="lecturer" property="lecturer" />
+        <result column="study_person" property="studyPerson" />
+        <result column="title" property="title" />
+        <result column="is_study" property="isStudy" />
+        <result column="start_date" property="startDate" />
+        <result column="end_date" property="endDate" />
+        <result column="url" property="url" />
+
+    </resultMap>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsRuleMakingMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsRuleMakingMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsRuleMaking" id="KxsRuleMakingMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="contents" property="contents" />
+        <result column="title" property="title" />
+        <result column="rule_type" property="ruleType" />
+
+    </resultMap>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsSchoolMenuMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsSchoolMenuMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsSchoolMenu" id="KxsSchoolMenuMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="col_name" property="colName" />
+        <result column="col_pic_path" property="colPicPath" />
+        <result column="col_detail" property="colDetail" />
+        <result column="pid" property="pid" />
+        <result column="sort" property="sort" />
+        <result column="is_open" property="isOpen" />
+        <result column="start_amount" property="startAmount" />
+
+    </resultMap>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsSchoolStudyMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsSchoolStudyMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsSchoolStudy" id="KxsSchoolStudyMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="title" property="title" />
+        <result column="detail" property="detail" />
+        <result column="study_person" property="studyPerson" />
+        <result column="lecturer" property="lecturer" />
+        <result column="url" property="url" />
+        <result column="list_pic" property="listPic" />
+        <result column="menu_id" property="menuId" />
+
+    </resultMap>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsSysMsgMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsSysMsgMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsSysMsg" id="KxsSysMsgMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="title" property="title" />
+        <result column="summary" property="summary" />
+        <result column="msg_type" property="msgType" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="bg_pic" property="bgPic" />
+        <result column="push_type" property="pushType" />
+        <result column="push_time" property="pushTime" />
+        <result column="url" property="url" />
+        <result column="content" property="content" />
+
+    </resultMap>
+
+    <select id="getByPage" resultType="com.kxs.system.api.vo.kxsapp.sysMsg.SysMsgPageVO">
+        select id, title, summary, msg_type, push_time, url from kxs_sys_msg a
+        <where>
+            a.del_flag = '0'
+        </where>
+        order by a.create_time desc
+    </select>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsUserMsgMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.system.biz.mapper.KxsUserMsgMapper">
+
+    <resultMap type="com.kxs.system.api.model.KxsUserMsg" id="KxsUserMsgMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="title" property="title" />
+        <result column="summary" property="summary" />
+        <result column="msg_type" property="msgType" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="bg_pic" property="bgPic" />
+        <result column="push_type" property="pushType" />
+        <result column="push_time" property="pushTime" />
+        <result column="url" property="url" />
+        <result column="codes" property="codes" />
+        <result column="is_all" property="isAll" />
+        <result column="content" property="content" />
+        <result column="read_flag" property="readFlag" />
+
+    </resultMap>
+    <select id="getByPage" resultType="com.kxs.system.api.vo.kxsapp.userMsg.UserMsgPageVO">
+        select id, title, summary, msg_type, push_time, url from kxs_user_msg a
+        <where>
+            a.del_flag = '0'
+        </where>
+        order by a.create_time desc
+    </select>
+
+</mapper>

kxs-system/kxs-system-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -3,7 +3,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.kxs.system.biz.mapper.SysUserMapper">
     <!-- 通用查询映射结果 -->
-    <resultMap id="baseResultMap" type="com.kxs.system.api.vo.UserVO">
+    <resultMap id="baseResultMap" type="com.kxs.system.api.vo.admin.UserVO">
         <id column="user_id" property="userId"/>
         <result column="username" property="username"/>
         <result column="password" property="password"/>