修复了获取协议内容bug,修复了个人消息-消息列表未返回字段bug,新增了商品列表接口,新增了服务中心-服务分类列表接口,新增了服务中心-服务详情接口,修复了市场活动-市场活动列表bug

kxs-common/kxs-common-core/pom.xml

@@ -71,4 +71,16 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-common/kxs-common-mybatis/pom.xml

@@ -60,4 +60,16 @@
             <artifactId>kxs-common-core</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-common/kxs-common-oss/pom.xml

@@ -29,4 +29,16 @@
             <artifactId>aliyun-sdk-oss</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-common/kxs-common-security/pom.xml

@@ -62,4 +62,16 @@
             <artifactId>kxs-user-api</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-gateway/pom.xml

@@ -167,6 +167,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>10</source>
+                    <target>10</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

kxs-product/kxs-product-api/pom.xml

@@ -8,6 +8,18 @@
     </parent>
 
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <artifactId>kxs-product-api</artifactId>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

kxs-product/kxs-product-biz/pom.xml

@@ -173,6 +173,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsShopGoodsMapper.xml

@@ -30,7 +30,7 @@
             a.del_flag = 0
             and a.status = 1
             <if test="colId != null">
-                a.col_id like concat('%' #{colId} '%')
+                and a.col_id like concat('%', #{colId} ,'%')
             </if>
         </where>
     </select>

kxs-store/kxs-store-api/pom.xml

@@ -59,4 +59,16 @@
             <artifactId>kxs-common-seata</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-store/kxs-store-biz/pom.xml

@@ -185,6 +185,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

kxs-system/kxs-system-api/pom.xml

@@ -50,4 +50,16 @@
             <artifactId>kxs-common-seata</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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

@@ -0,0 +1,108 @@
+package com.kxs.system.api.vo.kxsapp.school;
+
+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 io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class SchoolFirstMenuVO {
+    /**
+     * 主键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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 分类名称
+     */
+    @Schema(description = "分类名称")
+    private String colName;
+
+    /**
+     * 老库分类标识
+     */
+    @Schema(description = "分类标识")
+    private String colId;
+
+
+    /**
+     * 分类封面图
+     */
+    @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;
+    private int childCount;
+    private int isUpdate;
+}

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

@@ -0,0 +1,102 @@
+package com.kxs.system.api.vo.kxsapp.school;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SchoolListVO {
+    /**
+     * 主键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已删除")
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    private String 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;
+    /**
+     * 是否最新
+     */
+    private int isUpdate;
+}

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

@@ -0,0 +1,66 @@
+package com.kxs.system.api.vo.kxsapp.serviceCenter;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 服务中心-服务详情vo
+ *
+ * @author 系统
+ * @date 2024-04-24 16:19:08
+ */
+@Data
+@Schema(description = "服务中心-服务详情返回实体")
+public class ServiceCenterGetByIdVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+    /**
+     * 内容
+     */
+    @Schema(description = "内容")
+    private String content;
+
+
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    private String createBy;
+
+
+
+
+
+	
+
+}

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

@@ -0,0 +1,45 @@
+package com.kxs.system.api.vo.kxsapp.serviceCenter;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 服务中心-服务列表vo
+ *
+ * @author 系统
+ * @date 2024-04-24 16:19:08
+ */
+@Data
+@Schema(description = "服务中心-服务列表返回实体")
+public class ServiceCenterListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 标题
+     */
+    @Schema(description = "标题")
+    private String title;
+
+
+
+
+
+	
+
+}

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

@@ -0,0 +1,52 @@
+package com.kxs.system.api.vo.kxsapp.serviceCenter;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 服务中心-服务分类列表vo
+ *
+ * @author 系统
+ * @date 2024-04-24 16:19:08
+ */
+@Data
+@Schema(description = "服务中心-服务分类列表返回实体")
+public class ServiceCenterMenuListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 分类名称
+     */
+    @Schema(description = "分类名称")
+    private String title;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+
+
+
+	
+
+}

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

@@ -63,10 +63,14 @@ public class UserMsgPageVO implements Serializable {
     @Schema(description = "跳转地址")
     private String url;
 
-
-
-
-
+    /**
+     *0未读 1已读
+     */
+    private Integer readFlag;
+    /**
+     * 背景图片
+     */
+    private String bgPic;
 	
 
 }

kxs-system/kxs-system-biz/pom.xml

@@ -191,6 +191,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

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

@@ -41,7 +41,7 @@ public class MorningController {
         AssertUtil.isYyyyMM(month);
         String skbYear = month.substring(0, 4);
         String subMonth = month.substring(5, 7);
-        //拼接
+        //拼接sql
         return R.ok(kxsMorningService.page(page,
                 new QueryWrapper<KxsMorning>()
                         .apply("YEAR(create_time) = {0} AND MONTH(create_time) = {1}", skbYear, subMonth)
@@ -56,10 +56,8 @@ public class MorningController {
      * @param addStudyPersonDTO 参数对象
      * @return 商学院-晨会列表
      */
-    @GetMapping("/addStudyPerson")
+    @PostMapping("/addStudyPerson")
     public R addStudyPerson(@Valid @RequestBody AddStudyPersonDTO addStudyPersonDTO) {
-
-        //拼接
         return kxsMorningService.addStudyPerson(addStudyPersonDTO.getId(),addStudyPersonDTO.getType());
     }
 

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

@@ -54,8 +54,7 @@ public class SchoolController {
     @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)));
+        return R.ok(kxsSchoolStudyService.schoolList(page,menuId));
     }
 
 

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

@@ -0,0 +1,82 @@
+package com.kxs.system.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kxs.common.core.util.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.security.annotation.Inner;
+import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO;
+import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterMenuListVO;
+import com.kxs.system.biz.service.KxsServiceMenuService;
+import org.springdoc.core.annotations.ParameterObject;
+import com.kxs.system.api.model.KxsServiceMenu;
+import com.kxs.system.api.model.KxsServiceCenter;
+
+
+import com.kxs.system.biz.service.KxsServiceCenterService;
+
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 首页(ServiceCenter)控制层
+ *
+ * @author 系统
+ * @since 2024-04-24 16:19:09
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("serviceCenter")
+public class ServiceCenterController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsServiceMenuService kxsServiceMenuService;
+    private final KxsServiceCenterService kxsServiceCenterService;
+
+
+
+    /**
+     * 服务中心-服务分类列表
+     *
+     * @param page 分页对象
+     * @return 服务中心-服务分类列表
+     */
+    @GetMapping("/menuList")
+    public R menuList(@ParameterObject Page<KxsServiceMenu> page) {
+        return R.ok(kxsServiceMenuService.page(page));
+    }
+
+
+    /**
+     * 服务中心-服务列表
+     *
+     * @param page 分页对象
+     * @return 服务中心-服务列表
+     */
+    @GetMapping("/list")
+    public R list(@ParameterObject Page<ServiceCenterListVO> page, @RequestParam("menuId")Long menuId) {
+        return R.ok(kxsServiceCenterService.ServiceCenterList(page,menuId));
+    }
+
+
+    /**
+     * 服务中心-服务详情
+     *
+     * @param id 主键ID
+     * @return 服务中心-服务详情
+     */
+    @GetMapping("/getById")
+    public R getById(@RequestParam("id") Integer id) {
+        return R.ok(kxsServiceCenterService.getById(id));
+    }
+
+
+
+
+
+}
+

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

@@ -1,8 +1,12 @@
 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.KxsServiceCenter;
+import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 服务中心(KxsServiceCenter)表数据库访问层
@@ -13,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KxsServiceCenterMapper extends BaseMapper<KxsServiceCenter> {
 
+    IPage<ServiceCenterListVO> ServiceCenterList(Page<ServiceCenterListVO> page, @Param("menuId")Long menuId);
 }
 

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

@@ -1,5 +1,6 @@
 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.model.KxsSchoolStudy;
 
@@ -11,5 +12,7 @@ import com.kxs.system.api.model.KxsSchoolStudy;
  */
 public interface KxsSchoolStudyService extends IService<KxsSchoolStudy> {
 
+
+    Object schoolList(Page<KxsSchoolStudy> page, Integer menuId);
 }
 

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

@@ -1,7 +1,10 @@
 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.KxsServiceCenter;
+import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO;
 
 /**
  * 服务中心(KxsServiceCenter)表服务接口
@@ -11,5 +14,6 @@ import com.kxs.system.api.model.KxsServiceCenter;
  */
 public interface KxsServiceCenterService extends IService<KxsServiceCenter> {
 
+    IPage<ServiceCenterListVO> ServiceCenterList(Page<ServiceCenterListVO> page, Long menuId);
 }
 

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

@@ -1,11 +1,18 @@
 package com.kxs.system.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+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.vo.kxsapp.school.SchoolListVO;
 import com.kxs.system.biz.mapper.KxsSchoolStudyMapper;
 import com.kxs.system.api.model.KxsSchoolStudy;
 import com.kxs.system.biz.service.KxsSchoolStudyService;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 /**
  * 商学院创客学堂(KxsSchoolStudy)表服务实现类
  *
@@ -15,5 +22,29 @@ import org.springframework.stereotype.Service;
 @Service("kxsSchoolStudyService")
 public class KxsSchoolStudyServiceImpl extends ServiceImpl<KxsSchoolStudyMapper, KxsSchoolStudy> implements KxsSchoolStudyService {
 
+    @Override
+    public Object schoolList(Page<KxsSchoolStudy> page, Integer menuId) {
+        //根据创建时间获取数据
+        Page<KxsSchoolStudy> kxsSchoolStudyPage = page(page, Wrappers.<KxsSchoolStudy>lambdaQuery().eq(KxsSchoolStudy::getMenuId, menuId).orderByDesc(KxsSchoolStudy::getCreateTime));
+        ArrayList<SchoolListVO> schoolListVOS = new ArrayList<>();
+        //最新标记
+        int isUpdate = 1;
+        //根据取出顺序第一条数据既是最新数据
+        for (KxsSchoolStudy record : kxsSchoolStudyPage.getRecords()) {
+            SchoolListVO schoolListVO = new SchoolListVO();
+            BeanUtil.copyProperties(record,schoolListVO);
+            schoolListVO.setIsUpdate(isUpdate);
+            schoolListVOS.add(schoolListVO);
+            //取出第一条数据后修改标记
+            if (isUpdate == 1){
+                isUpdate = 0;
+            }
+        }
+        //构造返回数据
+        Page<SchoolListVO> schoolListVOPage = new Page<>();
+        schoolListVOPage.setTotal(kxsSchoolStudyPage.getTotal());
+        schoolListVOPage.setRecords(schoolListVOS);
+        return schoolListVOPage;
+    }
 }
 

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

@@ -1,9 +1,13 @@
 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.serviceCenter.ServiceCenterListVO;
 import com.kxs.system.biz.mapper.KxsServiceCenterMapper;
 import com.kxs.system.api.model.KxsServiceCenter;
 import com.kxs.system.biz.service.KxsServiceCenterService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,7 +17,12 @@ import org.springframework.stereotype.Service;
  * @since 2024-03-01 17:26:39
  */
 @Service("kxsServiceCenterService")
+@RequiredArgsConstructor
 public class KxsServiceCenterServiceImpl extends ServiceImpl<KxsServiceCenterMapper, KxsServiceCenter> implements KxsServiceCenterService {
-
+    private final KxsServiceCenterMapper kxsServiceCenterMapper;
+    @Override
+    public IPage<ServiceCenterListVO> ServiceCenterList(Page<ServiceCenterListVO> page, Long menuId) {
+        return kxsServiceCenterMapper.ServiceCenterList(page,menuId);
+    }
 }
 

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

@@ -21,7 +21,7 @@
         <where>
             a.del_flag = '0'
             <if test="menuId != null and menuId != ''">
-                AND u.menu_id = #{menuId}
+                AND a.menu_id = #{menuId}
             </if>
         </where>
     </select>

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

@@ -16,5 +16,8 @@
         <result column="update_by" property="updateBy" />
 
     </resultMap>
+    <select id="ServiceCenterList" resultType="com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO">
+        select id,title,sort from kxs_service_center where menu_id = #{menuId}
+    </select>
 
 </mapper>

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

@@ -22,7 +22,7 @@
 
     </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
+        select id, title, summary, msg_type, push_time, url,bg_pic,read_flag from kxs_user_msg a
         <where>
             a.del_flag = '0'
         </where>

kxs-user/kxs-user-api/pom.xml

@@ -8,6 +8,18 @@
     </parent>
 
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <artifactId>kxs-user-api</artifactId>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>