Merge branch 'feature/0406-degree' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:

	mec-student/src/main/java/com/ym/mec/student/StudentApplication.java

	mec-teacher/src/main/java/com/ym/mec/teacher/TeacherApplication.java

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/AuthServerApplication.java

@@ -17,7 +17,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients({"com.ym.mec"})
-@MapperScan("com.ym.mec.auth.dal.dao")
+@MapperScan(basePackages = {"com.ym.mec.auth.dal.dao", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages={"com.ym.mec", "com.yonge.log"})
 @Configuration
 @EnableSwagger2Doc

mec-biz/pom.xml

@@ -57,6 +57,11 @@
 			<artifactId>microsvc-middleware-live</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.microsvc.toolkit.common</groupId>
+			<artifactId>microsvc-common-response</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 
 		<!--修复依赖冲突-->
 		<dependency>

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Degree.java

@@ -0,0 +1,78 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import lombok.Data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Optional;
+
+
+/**
+ * 考级信息
+ * 2023-04-10 10:24:25
+ */
+@Data
+@ApiModel(" Degree-考级信息")
+@TableName("degree")
+public class Degree implements Serializable {
+
+    @ApiModelProperty("主键ID") 
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("机构ID")
+    @TableField(value = "tenant_id_")
+    private Integer tenantId;
+
+    @ApiModelProperty("分部ID")
+    @TableField(value = "organ_ids_")
+    private String organIds;
+
+    @ApiModelProperty("考级名称")
+    @TableField(value = "name_")
+    private String name;
+
+    @ApiModelProperty("报名开始时间")
+    @TableField(value = "start_time_")
+    private Date startTime;
+
+    @ApiModelProperty("报名结束时间")
+    @TableField(value = "end_time_")
+    private Date endTime;
+
+    @ApiModelProperty("登记时间")
+    @TableField(value = "registration_time_")
+    private Date registrationTime;
+
+    @ApiModelProperty("报名人次")
+    @TableField(value = "register_total_")
+    private Integer registerTotal;
+
+    @ApiModelProperty("报名人数")
+    @TableField(value = "register_num_")
+    private Integer registerNum;
+
+    @ApiModelProperty("购买课程")
+    @TableField(value = "purchase_course_")
+    private Integer purchaseCourse;
+
+    @ApiModelProperty("报名状态")
+    @TableField(value = "status_")
+    private String status;
+
+    @ApiModelProperty("创建时间")
+    @TableField(value = "create_time_")
+    private Date createTime;
+
+    public Integer getTenantId() {
+        return Optional.ofNullable(tenantId).orElse(TenantContextHolder.getTenantId());
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeLevelFeeNew.java

@@ -0,0 +1,73 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import lombok.Data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import java.math.BigDecimal;
+import java.util.Optional;
+
+/**
+ * 考级等级费用配置
+ * 2023-04-10 10:24:25
+ */
+@Data
+@ApiModel(" DegreeLevelFee-考级等级费用配置")
+@TableName("degree_level_fee")
+public class DegreeLevelFeeNew implements Serializable {
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("声部ID")
+    @TableField(value = "subject_id_")
+    private Integer subjectId;
+
+    @ApiModelProperty("等级")
+    @TableField(value = "level_")
+    private Integer level;
+
+    @ApiModelProperty("费用")
+    @TableField(value = "fee_")
+    private BigDecimal fee;
+
+    @ApiModelProperty("考级分类, GRADE,THEORY")
+    @TableField(value = "degree_type_")
+    private String degreeType;
+
+    @ApiModelProperty("上传证书")
+    @TableField(value = "credentials_")
+    private Boolean credentials;
+
+    @ApiModelProperty("乐器考级费用")
+    @TableField(value = "grade_")
+    private BigDecimal grade;
+
+    @ApiModelProperty("乐理费用")
+    @TableField(value = "theory_")
+    private BigDecimal theory;
+
+    @ApiModelProperty("创建时间")
+    @TableField(value = "create_time_")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    @TableField(value = "update_time_")
+    private Date updateTime;
+
+    @TableField(value = "tenant_id_")
+    private Integer tenantId;
+
+    public Integer getTenantId() {
+        return Optional.ofNullable(tenantId).orElse(TenantContextHolder.getTenantId());
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeNews.java

@@ -0,0 +1,103 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.ym.mec.biz.dal.enums.DegreeNewsTypeEnum;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import lombok.Data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Optional;
+
+
+/**
+ * 考级资讯表
+ * 2023-04-10 10:24:25
+ */
+@Data
+@ApiModel(" DegreeNews-考级资讯表")
+@TableName("degree_news")
+public class DegreeNews implements Serializable {
+
+    @ApiModelProperty("主键ID") 
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("标题")
+    @TableField(value = "title_")
+    private String title;
+
+    @ApiModelProperty("内容")
+    @TableField(value = "content_")
+    private String content;
+
+    @ApiModelProperty("封面图片")
+    @TableField(value = "cover_image_")
+    private String coverImage;
+
+    @ApiModelProperty("咨询类型")
+    @TableField(value = "type_")
+    private DegreeNewsTypeEnum type;
+
+    @ApiModelProperty("状态（1-可见 0-不可见）")
+    @TableField(value = "status_")
+    private Boolean status;
+
+    @ApiModelProperty("上线时间")
+    @TableField(value = "online_time_")
+    private Date onlineTime;
+
+    @ApiModelProperty("下线时间")
+    @TableField(value = "offline_time_")
+    private Date offlineTime;
+
+    @ApiModelProperty("备注")
+    @TableField(value = "memo_")
+    private String memo;
+
+    @ApiModelProperty("链接地址")
+    @TableField(value = "link_url_")
+    private String linkUrl;
+
+    @ApiModelProperty("跳转类型_bank,_slef")
+    @TableField(value = "href_target_")
+    private String hrefTarget;
+
+    @ApiModelProperty("顺序号")
+    @TableField(value = "order_")
+    private Integer order;
+
+    @ApiModelProperty("删除标识")
+    @TableField(value = "del_flag_")
+    private Boolean delFlag;
+
+    @ApiModelProperty("机构ID")
+    @TableField(value = "tenant_id_")
+    private Integer tenantId;
+
+    @ApiModelProperty("所属分部")
+    @TableField(value = "organ_ids_")
+    private String organIds;
+
+    @ApiModelProperty("视频封面")
+    @TableField(value = "video_cover_image_")
+    private String videoCoverImage;
+
+    @ApiModelProperty("更新时间")
+    @TableField(value = "update_time_")
+    private Date updateTime;
+
+    @ApiModelProperty("创建时间")
+    @TableField(value = "create_time_")
+    private Date createTime;
+
+    public Integer getTenantId() {
+        return Optional.ofNullable(tenantId).orElse(TenantContextHolder.getTenantId());
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/DegreeLevelFeeMapper.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
+
+/**
+ * 考级等级费用配置
+ * 2023-04-10 10:24:25
+ */
+@Repository
+public interface DegreeLevelFeeMapper extends BaseMapper<DegreeLevelFeeNew> {
+
+	/**
+	 * 分页查询
+	 * @param page IPage<DegreeLevelFeeWrapper.DegreeLevelFee>
+	 * @param param DegreeLevelFeeWrapper.DegreeLevelFeeQuery
+	 * @return List<DegreeLevelFeeWrapper.DegreeLevelFee>
+	 */
+	List<DegreeLevelFeeNew> selectPage(@Param("page") IPage<DegreeLevelFeeNew> page, @Param("param") DegreeLevelFeeWrapper.DegreeLevelFeeQuery param);
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/DegreeMapper.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.ym.mec.biz.dal.entity.Degree;
+import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
+
+/**
+ * 考级信息
+ * 2023-04-10 10:24:25
+ */
+@Repository
+public interface DegreeMapper extends BaseMapper<Degree> {
+
+	/**
+	 * 分页查询
+	 * @param page IPage<DegreeWrapper.Degree>
+	 * @param param DegreeWrapper.DegreeQuery
+	 * @return List<DegreeWrapper.Degree>
+	 */
+	List<Degree> selectPage(@Param("page") IPage<Degree> page, @Param("param") DegreeWrapper.DegreeQuery param);
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/DegreeNewsMapper.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.ym.mec.biz.dal.entity.DegreeNews;
+import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
+
+/**
+ * 考级资讯表
+ * 2023-04-10 10:24:25
+ */
+@Repository
+public interface DegreeNewsMapper extends BaseMapper<DegreeNews> {
+
+	/**
+	 * 分页查询
+	 * @param page IPage<DegreeNewsWrapper.DegreeNews>
+	 * @param param DegreeNewsWrapper.DegreeNewsQuery
+	 * @return List<DegreeNewsWrapper.DegreeNews>
+	 */
+	List<DegreeNews> selectPage(@Param("page") IPage<DegreeNews> page, @Param("param") DegreeNewsWrapper.DegreeNewsQuery param);
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeLevelFeeWrapper.java

@@ -0,0 +1,63 @@
+package com.ym.mec.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Optional;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 考级等级费用配置
+ * 2023-04-10 10:24:25
+ */
+@ApiModel(value = "DegreeLevelFeeWrapper对象", description = "考级等级费用配置查询对象")
+public class DegreeLevelFeeWrapper {
+
+    @Data
+	@Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" DegreeLevelFeeQuery-考级等级费用配置")
+    public static class DegreeLevelFeeQuery implements QueryInfo {
+    
+    	@ApiModelProperty("当前页")
+        private Integer page;
+        
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+        
+        @ApiModelProperty("关键字匹配")
+		private String keyword;
+        
+        public String getKeyword() {
+            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
+        }
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static DegreeLevelFeeQuery from(String json) {
+            return JSON.parseObject(json, DegreeLevelFeeQuery.class);
+        }
+    }  
+
+	@ApiModel(" DegreeLevelFee-考级等级费用配置")
+    public static class DegreeLevelFee {
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static DegreeLevelFee from(String json) {
+            return JSON.parseObject(json, DegreeLevelFee.class);
+        }
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeNewsWrapper.java

@@ -0,0 +1,76 @@
+package com.ym.mec.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.ym.mec.biz.dal.enums.DegreeNewsTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Optional;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 考级资讯表
+ * 2023-04-10 10:24:25
+ */
+@ApiModel(value = "DegreeNewsWrapper对象", description = "考级资讯表查询对象")
+public class DegreeNewsWrapper {
+
+    @Data
+	@Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" DegreeNewsQuery-考级资讯表")
+    public static class DegreeNewsQuery implements QueryInfo {
+    
+    	@ApiModelProperty("当前页")
+        private Integer page;
+        
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+        
+        @ApiModelProperty("关键字匹配")
+		private String keyword;
+
+        private String organId;
+
+        @ApiModelProperty("用户所在分部")
+        private String defaultOrganId;
+
+        @ApiModelProperty("是否启用")
+        private Boolean status;
+
+        @ApiModelProperty("咨询类型")
+        private DegreeNewsTypeEnum type;
+
+        public String getKeyword() {
+            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
+        }
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static DegreeNewsQuery from(String json) {
+            return JSON.parseObject(json, DegreeNewsQuery.class);
+        }
+    }  
+
+	@ApiModel(" DegreeNews-考级资讯表")
+    public static class DegreeNews {
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static DegreeNews from(String json) {
+            return JSON.parseObject(json, DegreeNews.class);
+        }
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeWrapper.java

@@ -0,0 +1,63 @@
+package com.ym.mec.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Optional;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 考级信息
+ * 2023-04-10 10:24:25
+ */
+@ApiModel(value = "DegreeWrapper对象", description = "考级信息查询对象")
+public class DegreeWrapper {
+
+    @Data
+	@Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" DegreeQuery-考级信息")
+    public static class DegreeQuery implements QueryInfo {
+    
+    	@ApiModelProperty("当前页")
+        private Integer page;
+        
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+        
+        @ApiModelProperty("关键字匹配")
+		private String keyword;
+        
+        public String getKeyword() {
+            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
+        }
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static DegreeQuery from(String json) {
+            return JSON.parseObject(json, DegreeQuery.class);
+        }
+    }  
+
+	@ApiModel(" Degree-考级信息")
+    public static class Degree {
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static Degree from(String json) {
+            return JSON.parseObject(json, Degree.class);
+        }
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DegreeLevelFeeService.java

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
+import com.ym.mec.biz.dal.entity.DegreeLevelFee;
+
+/**
+ * 考级等级费用配置
+ * 2023-04-10 10:24:25
+ */
+public interface DegreeLevelFeeService extends IService<DegreeLevelFeeNew>  {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return DegreeLevelFee
+     */
+    DegreeLevelFeeNew detail(Long id);
+
+    /**
+     * 分页查询
+     * @param page IPage<DegreeLevelFee>
+     * @param query DegreeLevelFeeWrapper.DegreeLevelFeeQuery
+     * @return IPage<DegreeLevelFee>
+     */
+    IPage<DegreeLevelFeeNew> selectPage(IPage<DegreeLevelFeeNew> page, DegreeLevelFeeWrapper.DegreeLevelFeeQuery query);
+	
+    /**
+     * 添加
+     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
+     * @return Boolean
+     */
+     Boolean add(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee);   
+
+    /**
+     * 更新
+     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
+     * @return Boolean
+     */
+     Boolean update(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee);
+     
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DegreeNewsService.java

@@ -0,0 +1,43 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
+import com.ym.mec.biz.dal.entity.DegreeNews;
+
+/**
+ * 考级资讯表
+ * 2023-04-10 10:24:25
+ */
+public interface DegreeNewsService extends IService<DegreeNews>  {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return DegreeNews
+     */
+	DegreeNews detail(Long id);
+
+    /**
+     * 分页查询
+     * @param page IPage<DegreeNews>
+     * @param query DegreeNewsWrapper.DegreeNewsQuery
+     * @return IPage<DegreeNews>
+     */
+    IPage<DegreeNews> selectPage(IPage<DegreeNews> page, DegreeNewsWrapper.DegreeNewsQuery query);
+	
+    /**
+     * 添加
+     * @param degreeNews DegreeNewsWrapper.DegreeNews
+     * @return Boolean
+     */
+     Boolean add(DegreeNewsWrapper.DegreeNews degreeNews);   
+
+    /**
+     * 更新
+     * @param degreeNews DegreeNewsWrapper.DegreeNews
+     * @return Boolean
+     */
+     Boolean update(DegreeNewsWrapper.DegreeNews degreeNews);
+     
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DegreeService.java

@@ -0,0 +1,43 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
+import com.ym.mec.biz.dal.entity.Degree;
+
+/**
+ * 考级信息
+ * 2023-04-10 10:24:25
+ */
+public interface DegreeService extends IService<Degree>  {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return Degree
+     */
+	Degree detail(Long id);
+
+    /**
+     * 分页查询
+     * @param page IPage<Degree>
+     * @param query DegreeWrapper.DegreeQuery
+     * @return IPage<Degree>
+     */
+    IPage<Degree> selectPage(IPage<Degree> page, DegreeWrapper.DegreeQuery query);
+	
+    /**
+     * 添加
+     * @param degree DegreeWrapper.Degree
+     * @return Boolean
+     */
+     Boolean add(DegreeWrapper.Degree degree);   
+
+    /**
+     * 更新
+     * @param degree DegreeWrapper.Degree
+     * @return Boolean
+     */
+     Boolean update(DegreeWrapper.Degree degree);
+     
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeLevelFeeServiceImpl.java

@@ -0,0 +1,66 @@
+package com.ym.mec.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import com.ym.mec.biz.dal.entity.DegreeLevelFee;
+import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
+import com.ym.mec.biz.dal.mapper.DegreeLevelFeeMapper;
+import com.ym.mec.biz.service.DegreeLevelFeeService;
+
+/**
+ * 考级等级费用配置
+ * 2023-04-10 10:24:25
+ */
+@Slf4j
+@Service
+public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper, DegreeLevelFeeNew> implements DegreeLevelFeeService {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return DegreeLevelFee
+     */
+	@Override
+    public DegreeLevelFeeNew detail(Long id) {
+        
+        return baseMapper.selectById(id);
+    }
+    
+    /**
+     * 分页查询
+     * @param page IPage<DegreeLevelFee>
+     * @param query DegreeLevelFeeWrapper.DegreeLevelFeeQuery
+     * @return IPage<DegreeLevelFee>
+     */
+    @Override
+    public IPage<DegreeLevelFeeNew> selectPage(IPage<DegreeLevelFeeNew> page, DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
+        
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+    /**
+     * 添加
+     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
+     * @return Boolean
+     */
+    @Override
+    public Boolean add(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee) {    	
+        
+        return this.save(JSON.parseObject(degreeLevelFee.jsonString(), DegreeLevelFeeNew.class));
+    }
+
+    /**
+     * 更新
+     * @param degreeLevelFee DegreeLevelFeeWrapper.DegreeLevelFee
+     * @return Boolean
+     */
+    @Override
+    public Boolean update(DegreeLevelFeeWrapper.DegreeLevelFee degreeLevelFee){
+
+        return this.updateById(JSON.parseObject(degreeLevelFee.jsonString(), DegreeLevelFeeNew.class));
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeNewsServiceImpl.java

@@ -0,0 +1,65 @@
+package com.ym.mec.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import lombok.extern.slf4j.Slf4j;
+import com.ym.mec.biz.dal.entity.DegreeNews;
+import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
+import com.ym.mec.biz.dal.mapper.DegreeNewsMapper;
+import com.ym.mec.biz.service.DegreeNewsService;
+
+/**
+ * 考级资讯表
+ * 2023-04-10 10:24:25
+ */
+@Slf4j
+@Service
+public class DegreeNewsServiceImpl extends ServiceImpl<DegreeNewsMapper, DegreeNews> implements DegreeNewsService {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return DegreeNews
+     */
+	@Override
+    public DegreeNews detail(Long id) {
+        
+        return baseMapper.selectById(id);
+    }
+    
+    /**
+     * 分页查询
+     * @param page IPage<DegreeNews>
+     * @param query DegreeNewsWrapper.DegreeNewsQuery
+     * @return IPage<DegreeNews>
+     */
+    @Override
+    public IPage<DegreeNews> selectPage(IPage<DegreeNews> page, DegreeNewsWrapper.DegreeNewsQuery query) {
+        
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+    /**
+     * 添加
+     * @param degreeNews DegreeNewsWrapper.DegreeNews
+     * @return Boolean
+     */
+    @Override
+    public Boolean add(DegreeNewsWrapper.DegreeNews degreeNews) {    	
+        
+        return this.save(JSON.parseObject(degreeNews.jsonString(), DegreeNews.class));
+    }
+
+    /**
+     * 更新
+     * @param degreeNews DegreeNewsWrapper.DegreeNews
+     * @return Boolean
+     */
+    @Override
+    public Boolean update(DegreeNewsWrapper.DegreeNews degreeNews){
+
+        return this.updateById(JSON.parseObject(degreeNews.jsonString(), DegreeNews.class));       
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeServiceImpl.java

@@ -0,0 +1,66 @@
+package com.ym.mec.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
+import com.ym.mec.biz.dal.entity.Degree;
+import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
+import com.ym.mec.biz.dal.mapper.DegreeMapper;
+import com.ym.mec.biz.service.DegreeService;
+
+/**
+ * 考级信息
+ * 2023-04-10 10:24:25
+ */
+@Slf4j
+@Service
+public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> implements DegreeService {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return Degree
+     */
+	@Override
+    public Degree detail(Long id) {
+        
+        return baseMapper.selectById(id);
+    }
+    
+    /**
+     * 分页查询
+     * @param page IPage<Degree>
+     * @param query DegreeWrapper.DegreeQuery
+     * @return IPage<Degree>
+     */
+    @Override
+    public IPage<Degree> selectPage(IPage<Degree> page, DegreeWrapper.DegreeQuery query) {
+        
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+    /**
+     * 添加
+     * @param degree DegreeWrapper.Degree
+     * @return Boolean
+     */
+    @Override
+    public Boolean add(DegreeWrapper.Degree degree) {    	
+        
+        return this.save(JSON.parseObject(degree.jsonString(), Degree.class));
+    }
+
+    /**
+     * 更新
+     * @param degree DegreeWrapper.Degree
+     * @return Boolean
+     */
+    @Override
+    public Boolean update(DegreeWrapper.Degree degree){
+
+        return this.updateById(JSON.parseObject(degree.jsonString(), Degree.class));       
+    }
+}

mec-biz/src/main/resources/config/mybatis/DegreeLevelFeeNewMapper.xml

@@ -0,0 +1,11 @@
+<?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.ym.mec.biz.dal.mapper.DegreeLevelFeeMapper">
+    
+    <select id="selectPage" resultType="com.ym.mec.biz.dal.entity.DegreeLevelFeeNew">
+		SELECT         
+        	t.*
+		FROM degree_level_fee t
+	</select>
+    
+</mapper>

mec-biz/src/main/resources/config/mybatis/DegreeMapper.xml

@@ -0,0 +1,11 @@
+<?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.ym.mec.biz.dal.mapper.DegreeMapper">
+    
+    <select id="selectPage" resultType="com.ym.mec.biz.dal.entity.Degree">
+		SELECT         
+        	t.*
+		FROM degree t
+	</select>
+    
+</mapper>

mec-biz/src/main/resources/config/mybatis/DegreeNewsMapper.xml

@@ -0,0 +1,24 @@
+<?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.ym.mec.biz.dal.mapper.DegreeNewsMapper">
+    
+    <select id="selectPage" resultType="com.ym.mec.biz.dal.entity.DegreeNews">
+		select * from degree_news
+		<where>
+			<if test="param.type != null">
+				AND type_ = #{param.type}
+			</if>
+			<if test="param.status != null">
+				AND status_ = #{param.status}
+			</if>
+			<if test="param.organId != null">
+				AND FIND_IN_SET(param.organId,organ_ids_)
+			</if>
+			<if test="param.organId == null and param.defaultOrganId != null and param.defaultOrganId != ''">
+				AND (INTE_ARRAY(param.defaultOrganId,organ_ids_) OR organ_ids_ IS NULL OR organ_ids_ = '')
+			</if>
+		</where>
+		ORDER BY id_ DESC
+	</select>
+    
+</mapper>

mec-im/src/main/java/com/ym/SealClassApplication.java

@@ -19,7 +19,7 @@ import org.springframework.web.client.RestTemplate;
 @Slf4j
 @SpringBootApplication
 @EnableFeignClients("com.ym.mec")
-@MapperScan("com.ym.mec.biz.dal.dao")
+@MapperScan(basePackages = {"com.ym.mec.biz.dal.dao", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages = {"com.ym", "com.mec.redisson"})
 @EnableScheduling
 @EnableDiscoveryClient

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/MallAdminApplication.java

@@ -14,7 +14,7 @@ import org.springframework.context.annotation.ComponentScan;
  */
 @SpringBootApplication
 @EnableDiscoveryClient
-@MapperScan({"com.yonge.cooleshow.admin.dao", "com.yonge.cooleshow.mbg.mapper", "com.yonge.toolset.payment.core.dao"})
+@MapperScan({"com.yonge.cooleshow.admin.dao", "com.yonge.cooleshow.mbg.mapper", "com.yonge.toolset.payment.core.dao", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow.admin", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common","com.ym.mec"})
 @EnableSwagger2Doc
 @EnableFeignClients("com.ym.mec")

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/MallPortalApplication.java

@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@MapperScan({"com.yonge.cooleshow.portal.dao", "com.yonge.toolset.payment.core.dao", "com.yonge.cooleshow.mbg.mapper"})
+@MapperScan({"com.yonge.cooleshow.portal.dao", "com.yonge.toolset.payment.core.dao", "com.yonge.cooleshow.mbg.mapper", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages = {"com.yonge.cooleshow.portal", "com.yonge.cooleshow.mbg", "com.yonge.cooleshow.mall.common","com.ym.mec"})
 @EnableSwagger2Doc
 @EnableDiscoveryClient

mec-student/src/main/java/com/ym/mec/student/StudentApplication.java

@@ -21,8 +21,8 @@ import com.ym.mec.common.filters.EmojiEncodingFilter;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
-@MapperScan(basePackages = {"com.ym.mec.biz.**.dao", "com.yonge.datasource.dao"})
-@ComponentScan(basePackages = {"com.ym.mec", "com.yonge.log",  "com.yonge.datasource"})
+@MapperScan(basePackages = {"com.ym.mec.biz.**.dao", "com.yonge.datasource.dao", "com.ym.mec.biz.dal.mapper"})
+@ComponentScan(basePackages = {"com.ym.mec", "com.yonge.log", "com.mec.redisson", "com.yonge.datasource"})
 @Configuration
 @EnableSwagger2Doc
 @EnableAsync

mec-task/src/main/java/com/ym/mec/task/TaskApplication.java

@@ -17,7 +17,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
-@MapperScan("com.ym.mec.task.dal.dao")
+@MapperScan(basePackages = {"com.ym.mec.task.dal.dao", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages="com.ym.mec")
 @Configuration
 @EnableSwagger2Doc

mec-teacher/src/main/java/com/ym/mec/teacher/TeacherApplication.java

@@ -21,8 +21,8 @@ import com.ym.mec.common.filters.EmojiEncodingFilter;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
-@MapperScan(basePackages = {"com.ym.mec.biz.**.dao", "com.yonge.datasource.dao"})
-@ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine", "com.yonge.log",  "com.yonge.datasource"})
+@MapperScan(basePackages = {"com.ym.mec.biz.**.dao", "com.yonge.datasource.dao", "com.ym.mec.biz.dal.mapper"})
+@ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine", "com.yonge.log", "com.mec.redisson", "com.yonge.datasource"})
 @Configuration
 @EnableSwagger2Doc
 @EnableAsync

mec-web/src/main/java/com/ym/mec/web/WebApplication.java

@@ -21,7 +21,7 @@ import com.ym.mec.common.filters.EmojiEncodingFilter;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
-@MapperScan(basePackages = {"com.ym.mec.biz.**.dao", "com.yonge.datasource.dao"})
+@MapperScan(basePackages = {"com.ym.mec.biz.**.dao", "com.yonge.datasource.dao", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages = {"com.ym.mec", "com.yonge.log", "com.mec.redisson"})
 @Configuration
 @EnableSwagger2Doc

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeInfoController.java

@@ -0,0 +1,87 @@
+package com.ym.mec.web.controller.degree;
+
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.ym.mec.biz.service.DegreeService;
+import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
+import com.ym.mec.biz.dal.entity.Degree;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/degree")
+@Api(tags = "考级信息")
+public class DegreeInfoController extends BaseController {
+
+    @Autowired
+    private DegreeService degreeService;
+
+	@ApiOperation(value = "详情", notes = "考级信息-根据详情ID查询单条, 传入id")
+    //@PreAuthorize("@pcs.hasPermissions('degree/detail')")
+    @GetMapping("/detail/{id}")
+    public HttpResponseResult<Degree> detail(@PathVariable("id") Long id) {
+    
+    	Degree wrapper = degreeService.detail(id);
+        
+        return succeed(wrapper);
+	}
+    
+    @ApiOperation(value = "查询分页", notes = "考级信息- 传入 DegreeWrapper.DegreeQuery") 
+    //@PreAuthorize("@pcs.hasPermissions('degree/page')")
+    @PostMapping("/page")
+    public HttpResponseResult<PageInfo<Degree>> page(@RequestBody DegreeWrapper.DegreeQuery query) {
+        
+        IPage<Degree> pages = degreeService.selectPage(QueryInfo.getPage(query), query);
+        
+        return succeed(QueryInfo.pageInfo(pages));
+	}
+    
+    @ApiOperation(value = "新增", notes = "考级信息- 传入 DegreeWrapper.Degree")
+    @PreAuthorize("@pcs.hasPermissions('degree/save')")
+	@PostMapping("/save")
+	public HttpResponseResult<JSONObject> add(@Validated @RequestBody Degree degree) {
+        
+        // 新增数据
+        degreeService.save(degree);
+        
+        return succeed();
+	}
+    
+    @ApiOperation(value = "修改", notes = "考级信息- 传入 DegreeWrapper.Degree")
+    @PreAuthorize("@pcs.hasPermissions('degree/update')")
+	@PostMapping("/update")
+	public HttpResponseResult<JSONObject> update(@Validated @RequestBody Degree degree) {
+        
+        // 更新数据
+        degreeService.updateById(degree);
+        
+        return succeed();
+	}
+
+	@ApiOperation(value = "删除", notes = "考级信息- 传入id")
+    @PreAuthorize("@pcs.hasPermissions('degree/remove')")
+	@PostMapping("/remove")    
+	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
+    
+		return succeed(degreeService.removeById(id));
+	}
+}

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeLevelFeeController.java

@@ -0,0 +1,87 @@
+package com.ym.mec.web.controller.degree;
+
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.ym.mec.biz.service.DegreeLevelFeeService;
+import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/degreeLevelFee")
+@Api(tags = "考级等级费用配置")
+public class DegreeLevelFeeController extends BaseController {
+
+    @Autowired
+    private DegreeLevelFeeService degreeLevelFeeService;
+
+	@ApiOperation(value = "详情", notes = "考级等级费用配置-根据详情ID查询单条, 传入id")
+    //@PreAuthorize("@pcs.hasPermissions('degreeLevelFee/detail')")
+    @GetMapping("/detail/{id}")
+    public HttpResponseResult<DegreeLevelFeeNew> detail(@PathVariable("id") Long id) {
+
+        DegreeLevelFeeNew wrapper = degreeLevelFeeService.detail(id);
+        
+        return succeed(wrapper);
+	}
+    
+    @ApiOperation(value = "查询分页", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFeeQuery") 
+    @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/page')")
+    @PostMapping("/page")
+    public HttpResponseResult<PageInfo<DegreeLevelFeeNew>> page(@RequestBody DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
+        
+        IPage<DegreeLevelFeeNew> pages = degreeLevelFeeService.selectPage(QueryInfo.getPage(query), query);
+        
+        return succeed(QueryInfo.pageInfo(pages));
+	}
+    
+    @ApiOperation(value = "新增", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFee")
+    @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/save')")
+	@PostMapping("/save")
+	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
+        
+        // 新增数据
+        degreeLevelFeeService.save(degreeLevelFee);
+        
+        return succeed();
+	}
+    
+    @ApiOperation(value = "修改", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFee")
+    @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/update')")
+	@PostMapping("/update")
+	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
+        
+        // 更新数据
+        degreeLevelFeeService.updateById(degreeLevelFee);
+        
+        return succeed();
+	}
+
+	@ApiOperation(value = "删除", notes = "考级等级费用配置- 传入id")
+    @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/remove')")
+	@PostMapping("/remove")    
+	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
+    
+		return succeed(degreeLevelFeeService.removeById(id));
+	}
+}

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeNewsController.java

@@ -0,0 +1,98 @@
+package com.ym.mec.web.controller.degree;
+
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.microsvc.toolkit.common.response.template.R;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.ym.mec.biz.service.DegreeNewsService;
+import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
+import com.ym.mec.biz.dal.entity.DegreeNews;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/degreeNews")
+@Api(tags = "考级资讯表")
+public class DegreeNewsController extends BaseController {
+
+    @Autowired
+    private DegreeNewsService degreeNewsService;
+
+	@ApiOperation(value = "详情", notes = "考级资讯表-根据详情ID查询单条, 传入id")
+    @PreAuthorize("@pcs.hasPermissions('degreeNews/detail')")
+    @GetMapping("/detail/{id}")
+    public HttpResponseResult<DegreeNews> detail(@PathVariable("id") Long id) {
+    
+    	DegreeNews wrapper = degreeNewsService.detail(id);
+        
+        return succeed(wrapper);
+	}
+    
+    @ApiOperation(value = "查询分页", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNewsQuery") 
+    @PreAuthorize("@pcs.hasPermissions('degreeNews/page')")
+    @PostMapping("/page")
+    public HttpResponseResult<PageInfo<DegreeNews>> page(@RequestBody DegreeNewsWrapper.DegreeNewsQuery query) {
+        
+        IPage<DegreeNews> pages = degreeNewsService.selectPage(QueryInfo.getPage(query), query);
+
+        return succeed(QueryInfo.pageInfo(pages));
+	}
+    
+    @ApiOperation(value = "新增", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNews")
+    @PreAuthorize("@pcs.hasPermissions('degreeNews/save')")
+	@PostMapping("/save")
+	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeNews degreeNews) {
+        
+        // 新增数据
+        degreeNewsService.save(degreeNews);
+        
+        return succeed();
+	}
+    
+    @ApiOperation(value = "修改", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNews")
+    @PreAuthorize("@pcs.hasPermissions('degreeNews/update')")
+	@PostMapping("/update")
+	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeNews degreeNews) {
+        
+        // 更新数据
+        degreeNewsService.updateById(degreeNews);
+        
+        return succeed();
+	}
+
+    @ApiOperation(value = "启用、停用")
+    @PreAuthorize("@pcs.hasPermissions('degreeNews/enable')")
+	@PostMapping("/enable")
+	public HttpResponseResult<JSONObject> enable(Long newsId) {
+        DegreeNews degreeNews = degreeNewsService.getById(newsId);
+        degreeNews.setStatus(!degreeNews.getStatus());
+        degreeNewsService.updateById(degreeNews);
+        return succeed();
+	}
+
+	@ApiOperation(value = "删除", notes = "考级资讯表- 传入id")
+    @PreAuthorize("@pcs.hasPermissions('degreeNews/remove')")
+	@PostMapping("/remove")    
+	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
+    
+		return succeed(degreeNewsService.removeById(id));
+	}
+}

mec-websocket/src/main/java/com/ym/mec/web/WebSocketApplication.java

@@ -18,7 +18,7 @@ import javax.servlet.Filter;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
-@MapperScan("com.ym.mec.biz.dal.dao")
+@MapperScan(basePackages = {"com.ym.mec.biz.dal.dao", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages = {"com.ym.mec", "com.yonge.log"})
 @Configuration
 @EnableSwagger2Doc

mec-workflow/src/main/java/com/ym/mec/workfow/WorkflowApplication.java

@@ -19,7 +19,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
-@MapperScan("com.ym.mec.workflow.dal.dao")
+@MapperScan(basePackages = {"com.ym.mec.workflow.dal.dao", "com.ym.mec.biz.dal.mapper"})
 @ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine" })
 @Configuration
 @EnableSwagger2Doc