配置问题

jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptTrainRecordController.java

@@ -20,8 +20,6 @@ import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.newgzpt.vo.TrainCreditVO;
 import com.miaxis.newgzpt.vo.TrainFinishKmVO;
 import com.miaxis.newgzpt.vo.TrainFinishVO;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

jsjp-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -1,79 +0,0 @@
-package com.miaxis.app.controller.question;
-
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.question.domain.QuestionCollection;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.service.IQuestionCollectionService;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【题目收藏】Controller
- *
- * @author miaxis
- * @date 2021-03-18
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/collection")
-@Api(tags={"【小程序-题目收藏】"})
-public class QuestionCollectionController extends BaseController{
-    @Autowired
-    private IQuestionCollectionService questionCollectionService;
-
-
-
-
-
-    /**
-     * 新增题目收藏
-     */
-    @Log(title = "题目收藏", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增题目收藏")
-    public Response<Integer> add(@RequestBody QuestionCollection questionCollection){
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionCollection.setUserId(student.getId());
-        return toResponse(questionCollectionService.save(questionCollection) ? 1 : 0);
-    }
-
-    @GetMapping("/getQuestionCollectionList")
-    @ApiOperation("查询题目收藏列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionError> getQuestionCollectionList(@ModelAttribute QuestionCollectionDto questionCollectionDto){
-        startPage();
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionCollectionDto.setUserId(student.getId());
-        List<QuestionError> list = questionCollectionService.getQuestionCollectionList(questionCollectionDto);
-        return toResponsePageInfo(list);
-    }
-
-
-
-    /**
-     * 删除题目收藏
-     */
-    @Log(title = "题目收藏", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除题目收藏")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "题目收藏ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(questionCollectionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/question/QuestionErrorController.java

@@ -1,79 +0,0 @@
-package com.miaxis.app.controller.question;
-
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionErrorDto;
-import com.miaxis.question.service.IQuestionErrorService;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【错题】Controller
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/error")
-@Api(tags={"【小程序-错题】"})
-public class QuestionErrorController extends BaseController{
-    @Autowired
-    private IQuestionErrorService questionErrorService;
-
-
-    @GetMapping("/getQuestionErrorList")
-    @ApiOperation("查询错题列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionError> getQuestionErrorList(@ModelAttribute QuestionErrorDto questionErrorDto){
-        startPage();
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionErrorDto.setUserId(student.getId());
-        List<QuestionError> list = questionErrorService.getQuestionErrorList(questionErrorDto);
-        return toResponsePageInfo(list);
-    }
-
-
-
-    /**
-     * 新增错题
-     */
-    //@PreAuthorize("@ss.hasPermi('question:error:add')")
-    @Log(title = "错题", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增错题")
-    public Response<Integer> add(@RequestBody QuestionError questionError){
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionError.setUserId(student.getId());
-        return toResponse(questionErrorService.save(questionError) ? 1 : 0);
-    }
-
-
-
-    /**
-     * 删除错题
-     */
-    //@PreAuthorize("@ss.hasPermi('question:error:remove')")
-    @Log(title = "错题", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除错题")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "错题ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(questionErrorService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java

@@ -1,76 +0,0 @@
-package com.miaxis.app.controller.question;
-
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-import com.miaxis.question.service.IQuestionInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 【题库】Controller
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/info")
-@Api(tags={"【小程序-题库】"})
-public class QuestionInfoController extends BaseController{
-    @Autowired
-    private IQuestionInfoService questionInfoService;
-
-    /**
-     * 查询题库列表
-     */
-//    @PreAuthorize("@ss.hasPermi('question:info:list')")
-//    @GetMapping("/list")
-//    @ApiOperation("查询题库列表")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-//            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-//    })
-//    public ResponsePageInfo<QuestionInfo> list(@ModelAttribute QuestionInfo questionInfo){
-//        startPage();
-//        List<QuestionInfo> list = questionInfoService.selectQuestionInfoList(questionInfo);
-//        return toResponsePageInfo(list);
-//    }
-
-    @GetMapping("/getQuestionInfoList")
-    @ApiOperation("查询题库列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionInfo> getQuestionInfoList(@ModelAttribute QuestionInfoDto questionInfoDto){
-        startPage();
-        List<QuestionInfo> list = questionInfoService.getQuestionInfoList(questionInfoDto);
-        return toResponsePageInfo(list);
-    }
-
-    @GetMapping("/getRandQuestionInfoList")
-    @ApiOperation("查询随机题库列表")
-    public ResponsePageInfo<QuestionInfo> getRandQuestionInfoList(@ModelAttribute QuestionInfoRandDto questionInfoRandDto){
-//        startPage();
-        List<QuestionInfo> list = questionInfoService.getRandQuestionInfoList(questionInfoRandDto);
-        return toResponsePageInfo(list);
-    }
-
-
-
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/goods/GoodsInfoController.java

@@ -1,48 +0,0 @@
-package com.miaxis.pc.controller.goods;
-
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.goods.service.IGoodsInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【商品管理】Controller
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/goods/info")
-@Api(tags={"【pc-商品管理】"})
-public class GoodsInfoController extends BaseController{
-
-    private final IGoodsInfoService goodsInfoService;
-
-
-    /**
-     * 删除商品
-     */
-    @PreAuthorize("@ss.hasPermi('goods:info:remove')")
-    @Log(title = "商品", businessType = BusinessTypeEnum.UPDATE)
-	@PutMapping("/{ids}")
-    @ApiOperation("删除商品")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "商品ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return goodsInfoService.removeGoodsByIds(ids);
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/topic/TopicInfoController.java

@@ -1,113 +0,0 @@
-package com.miaxis.pc.controller.topic;
-
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.topic.domain.TopicInfo;
-import com.miaxis.topic.dto.TopicInfoDto;
-import com.miaxis.topic.service.ITopicInfoService;
-import com.miaxis.topic.vo.TopicInfoVo;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【专题管理】Controller
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/topic/info")
-@Api(tags={"【pc-专题管理】"})
-public class TopicInfoController extends BaseController{
-
-    private final ITopicInfoService topicInfoService;
-
-    /**
-     * 查询专题列表
-     */
-    @PreAuthorize("@ss.hasPermi('topic:info:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询专题列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<TopicInfoVo> list(@ModelAttribute TopicInfoVo topicInfoVo){
-        startPage();
-        List<TopicInfoVo> list = topicInfoService.selectTopicInfoList(topicInfoVo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 获取专题详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('topic:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取专题详细信息")
-    public Response<TopicInfoVo> getInfo(
-            @ApiParam(name = "id", value = "专题参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return topicInfoService.getTopicDetailsById(id);
-    }
-
-    /**
-     * 新增专题
-     */
-    @PreAuthorize("@ss.hasPermi('topic:info:add')")
-    @Log(title = "专题", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增专题")
-    public Response<Integer> add(@RequestBody TopicInfoDto topicInfoDto){
-        return topicInfoService.addTopic(topicInfoDto);
-    }
-
-    /**
-     * 修改专题
-     */
-    @PreAuthorize("@ss.hasPermi('topic:info:edit')")
-    @Log(title = "专题", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改专题")
-    public Response<Integer> edit(@RequestBody TopicInfo topicInfo){
-        return toResponse(topicInfoService.updateById(topicInfo) ? 1 : 0);
-    }
-
-    /**
-     * 更新 0：上架 / 1：下架
-     */
-    @PreAuthorize("@ss.hasPermi('topic:info:updateShelfStatus')")
-    @Log(title = "专题", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/updateShelfStatus")
-    @ApiOperation("上架、下架")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "客户信息ids参数", dataType = "List", required = true),
-            @ApiImplicitParam(name = "shelfStatus", value = "上架状态  0：上架、1：下架", dataType = "int", required = true),
-    })
-    public Response updateShelfStatus(Long[] ids,Integer shelfStatus) {
-        return topicInfoService.updateShelfStatus(ids,shelfStatus);
-    }
-
-    /**
-     * 删除专题
-     */
-    @PreAuthorize("@ss.hasPermi('topic:info:remove')")
-    @Log(title = "专题", businessType = BusinessTypeEnum.DELETE)
-	@PutMapping("/{ids}")
-    @ApiOperation("删除专题")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "专题ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return topicInfoService.removeTopicByIds(ids);
-    }
-}

jsjp-service/src/main/java/com/miaxis/goods/domain/GoodsInfo.java

@@ -1,64 +0,0 @@
-package com.miaxis.goods.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-/**
- * 商品对象 goods_info
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@TableName("goods_info")
-@ApiModel(value = "GoodsInfo", description = "商品对象 goods_info")
-public class GoodsInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 商品名称 */
-    @TableField("goods_name")
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    /** 商品价格 */
-    @TableField("goods_price")
-    @ApiModelProperty(value = "商品价格")
-    private BigDecimal goodsPrice;
-
-    /** 商品链接 */
-    @TableField("goods_link")
-    @ApiModelProperty(value = "商品链接")
-    private String goodsLink;
-
-    /** 商品描述 */
-    @TableField("goods_describe")
-    @ApiModelProperty(value = "商品描述")
-    private String goodsDescribe;
-
-    /** 商品图片---对应file_info的id */
-    @TableField("goods_picture")
-    @ApiModelProperty(value = "商品图片---对应file_info的id")
-    private Long goodsPicture;
-
-    @TableField("topic_id")
-    @ApiModelProperty(value = "专题id")
-    private Integer topicId;
-
-    /** 状态  0：有效(默认)、1：失效 （伪删除） */
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-
-}

jsjp-service/src/main/java/com/miaxis/goods/mapper/GoodsInfoMapper.java

@@ -1,31 +0,0 @@
-package com.miaxis.goods.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.goods.domain.GoodsInfo;
-import com.miaxis.goods.vo.GoodsInfoVo;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 商品Mapper接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface GoodsInfoMapper extends BaseMapper<GoodsInfo> {
-
-    /**
-     * 查询商品列表
-     *
-     * @param goodsInfo 商品
-     * @return 商品集合
-     */
-    List<GoodsInfo> selectGoodsInfoList(GoodsInfo goodsInfo);
-
-    /**
-     * 根据专题id 获取商品
-     * @param topicId
-     * @return
-     */
-    List<GoodsInfoVo> getGoodsInfoListByTopicId(@Param("topicId") Long topicId);
-}

jsjp-service/src/main/java/com/miaxis/goods/service/IGoodsInfoService.java

@@ -1,21 +0,0 @@
-package com.miaxis.goods.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.goods.domain.GoodsInfo;
-
-/**
- * 商品Service接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface IGoodsInfoService extends IService<GoodsInfo>{
-
-    /**
-     * 删除商品
-     * @param ids
-     * @return
-     */
-    Response<Integer> removeGoodsByIds(Long[] ids);
-}

jsjp-service/src/main/java/com/miaxis/goods/service/impl/GoodsInfoServiceImpl.java

@@ -1,41 +0,0 @@
-package com.miaxis.goods.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.goods.domain.GoodsInfo;
-import com.miaxis.goods.mapper.GoodsInfoMapper;
-import com.miaxis.goods.service.IGoodsInfoService;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 商品Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Service
-@RequiredArgsConstructor
-public class GoodsInfoServiceImpl extends ServiceImpl<GoodsInfoMapper, GoodsInfo> implements IGoodsInfoService {
-
-    private final GoodsInfoMapper goodsInfoMapper;
-
-    /**
-     * 删除商品
-     * @param ids
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response<Integer> removeGoodsByIds(Long[] ids) {
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<GoodsInfo>().set("status","1").eq("id",id));
-        }
-        return Response.success();
-    }
-
-}

jsjp-service/src/main/java/com/miaxis/goods/vo/GoodsInfoVo.java

@@ -1,56 +0,0 @@
-package com.miaxis.goods.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 商品对象返回参
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@ApiModel(value = "GoodsInfoVo", description = "商品对象返回参")
-public class GoodsInfoVo extends BaseBusinessEntity{
-
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @TableField("goods_name")
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @TableField("goods_price")
-    @ApiModelProperty(value = "商品价格")
-    private BigDecimal goodsPrice;
-
-    @TableField("goods_link")
-    @ApiModelProperty(value = "商品链接")
-    private String goodsLink;
-
-    @TableField("goods_describe")
-    @ApiModelProperty(value = "商品描述")
-    private String goodsDescribe;
-
-    @TableField("goods_picture")
-    @ApiModelProperty(value = "商品图片---对应file_info的id")
-    private Long goodsPicture;
-
-    @TableField("topic_id")
-    @ApiModelProperty(value = "专题id")
-    private Integer topicId;
-
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-    @ApiModelProperty(value = "商品图片访问地址")
-    private String fileUrl;
-
-}

jsjp-service/src/main/java/com/miaxis/question/domain/QuestionCollection.java

@@ -1,76 +0,0 @@
-package com.miaxis.question.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import lombok.Data;
-/**
- * 题目收藏对象 question_collection
- *
- * @author miaxis
- * @date 2021-03-18
- */
-@Data
-@TableName("question_collection")
-@ApiModel(value = "QuestionCollection", description = "题目收藏对象 question_collection")
-public class QuestionCollection extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    /** 用户id */
-    @Excel(name = "用户id")
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    /** 题目id */
-    @Excel(name = "题目id")
-    @TableField("question_id")
-    @ApiModelProperty(value = "题目id")
-    private Long questionId;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setUserId(Long userId){
-        this.userId = userId;
-    }
-
-    public Long getUserId(){
-        return userId;
-    }
-    public void setQuestionId(Long questionId){
-        this.questionId = questionId;
-    }
-
-    public Long getQuestionId(){
-        return questionId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("questionId", getQuestionId())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

jsjp-service/src/main/java/com/miaxis/question/domain/QuestionError.java

@@ -1,74 +0,0 @@
-package com.miaxis.question.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-/**
- * 错题对象 question_error
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@Data
-@TableName("question_error")
-@ApiModel(value = "QuestionError", description = "错题对象 question_error")
-public class QuestionError extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    /** 用户id */
-    @Excel(name = "用户id")
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    /** 题目id */
-    @Excel(name = "题目id")
-    @TableField("question_id")
-    @ApiModelProperty(value = "题目id")
-    private Long questionId;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setUserId(Long userId){
-        this.userId = userId;
-    }
-
-    public Long getUserId(){
-        return userId;
-    }
-    public void setQuestionId(Long questionId){
-        this.questionId = questionId;
-    }
-
-    public Long getQuestionId(){
-        return questionId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("questionId", getQuestionId())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

jsjp-service/src/main/java/com/miaxis/question/domain/QuestionInfo.java

@@ -1,452 +0,0 @@
-package com.miaxis.question.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import lombok.Data;
-/**
- * 题库对象 question_info
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Data
-@TableName("question_info")
-@ApiModel(value = "QuestionInfo", description = "题库对象 question_info")
-public class QuestionInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    @TableId("id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 类型 */
-    @Excel(name = "类型")
-    @TableField("type")
-    @ApiModelProperty(value = "类型")
-    private Long type;
-
-    /** 未知字段 */
-    @Excel(name = "未知字段")
-    @TableField("int_number")
-    @ApiModelProperty(value = "未知字段")
-    private String intNumber;
-
-    /** 未知字段 */
-    @Excel(name = "未知字段")
-    @TableField("str_tppe")
-    @ApiModelProperty(value = "未知字段")
-    private String strTppe;
-
-    /** 未知字段 */
-    @Excel(name = "未知字段")
-    @TableField("str_type_l")
-    @ApiModelProperty(value = "未知字段")
-    private String strTypeL;
-
-    /** 许可车型 */
-    @Excel(name = "许可车型")
-    @TableField("license_type")
-    @ApiModelProperty(value = "许可车型")
-    private String licenseType;
-
-    /** 问题 */
-    @Excel(name = "问题")
-    @TableField("question")
-    @ApiModelProperty(value = "问题")
-    private String question;
-
-    /** 答案1 */
-    @Excel(name = "答案1")
-    @TableField("an1")
-    @ApiModelProperty(value = "答案1")
-    private String an1;
-
-    /** 答案2 */
-    @Excel(name = "答案2")
-    @TableField("an2")
-    @ApiModelProperty(value = "答案2")
-    private String an2;
-
-    /** 答案3 */
-    @Excel(name = "答案3")
-    @TableField("an3")
-    @ApiModelProperty(value = "答案3")
-    private String an3;
-
-    /** 答案4 */
-    @Excel(name = "答案4")
-    @TableField("an4")
-    @ApiModelProperty(value = "答案4")
-    private String an4;
-
-    /** 答案5 */
-    @Excel(name = "答案5")
-    @TableField("an5")
-    @ApiModelProperty(value = "答案5")
-    private String an5;
-
-    /** 答案6 */
-    @Excel(name = "答案6")
-    @TableField("an6")
-    @ApiModelProperty(value = "答案6")
-    private String an6;
-
-    /** 答案7 */
-    @Excel(name = "答案7")
-    @TableField("an7")
-    @ApiModelProperty(value = "答案7")
-    private String an7;
-
-    /** 正确答案 */
-    @Excel(name = "正确答案")
-    @TableField("answer_true")
-    @ApiModelProperty(value = "正确答案")
-    private String answerTrue;
-
-    /** 解释 */
-    @Excel(name = "解释")
-    @TableField("explain1")
-    @ApiModelProperty(value = "解释")
-    private String explain1;
-
-    /** 最佳答案 */
-    @Excel(name = "最佳答案")
-    @TableField("best_answer_id")
-    @ApiModelProperty(value = "最佳答案")
-    private String bestAnswerId;
-
-    /** 科目 */
-    @Excel(name = "科目")
-    @TableField("kemu")
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-    /** 解释_from */
-    @Excel(name = "解释_from")
-    @TableField("jieshi_from")
-    @ApiModelProperty(value = "解释_from")
-    private String jieshiFrom;
-
-    /** 更多类型 */
-    @Excel(name = "更多类型")
-    @TableField("moretypes")
-    @ApiModelProperty(value = "更多类型")
-    private String moretypes;
-
-    /** chapterid */
-    @Excel(name = "chapterid")
-    @TableField("chapterid")
-    @ApiModelProperty(value = "chapterid")
-    private Long chapterid;
-
-    /** 图片文件名 */
-    @Excel(name = "图片文件名")
-    @TableField("sinaimg")
-    @ApiModelProperty(value = "图片文件名")
-    private String sinaimg;
-
-    /** 视频文件名 */
-    @Excel(name = "视频文件名")
-    @TableField("video_url")
-    @ApiModelProperty(value = "视频文件名")
-    private String videoUrl;
-
-    /** 未知 */
-    @Excel(name = "未知")
-    @TableField("diff_degree")
-    @ApiModelProperty(value = "未知")
-    private Long diffDegree;
-
-    /** 城市 */
-    @Excel(name = "城市")
-    @TableField("cityid")
-    @ApiModelProperty(value = "城市")
-    private Long cityid;
-
-    /** gs */
-    @Excel(name = "gs")
-    @TableField("gs")
-    @ApiModelProperty(value = "gs")
-    private String gs;
-
-    /** 关键字 */
-    @Excel(name = "关键字")
-    @TableField("keyword")
-    @ApiModelProperty(value = "关键字")
-    private String keyword;
-
-    /** 错误率 */
-    @Excel(name = "错误率")
-    @TableField("error_rate")
-    @ApiModelProperty(value = "错误率")
-    private Long errorRate;
-
-    /** 文件地址 */
-    @Excel(name = "文件地址")
-    @TableField("media_url")
-    @ApiModelProperty(value = "文件地址")
-    private String mediaUrl;
-
-    /** 是否显示 */
-    @Excel(name = "是否显示")
-    @TableField("show_option_type")
-    @ApiModelProperty(value = "是否显示")
-    private Long showOptionType;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setType(Long type){
-        this.type = type;
-    }
-
-    public Long getType(){
-        return type;
-    }
-    public void setIntNumber(String intNumber){
-        this.intNumber = intNumber;
-    }
-
-    public String getIntNumber(){
-        return intNumber;
-    }
-    public void setStrTppe(String strTppe){
-        this.strTppe = strTppe;
-    }
-
-    public String getStrTppe(){
-        return strTppe;
-    }
-    public void setStrTypeL(String strTypeL){
-        this.strTypeL = strTypeL;
-    }
-
-    public String getStrTypeL(){
-        return strTypeL;
-    }
-    public void setLicenseType(String licenseType){
-        this.licenseType = licenseType;
-    }
-
-    public String getLicenseType(){
-        return licenseType;
-    }
-    public void setQuestion(String question){
-        this.question = question;
-    }
-
-    public String getQuestion(){
-        return question;
-    }
-    public void setAn1(String an1){
-        this.an1 = an1;
-    }
-
-    public String getAn1(){
-        return an1;
-    }
-    public void setAn2(String an2){
-        this.an2 = an2;
-    }
-
-    public String getAn2(){
-        return an2;
-    }
-    public void setAn3(String an3){
-        this.an3 = an3;
-    }
-
-    public String getAn3(){
-        return an3;
-    }
-    public void setAn4(String an4){
-        this.an4 = an4;
-    }
-
-    public String getAn4(){
-        return an4;
-    }
-    public void setAn5(String an5){
-        this.an5 = an5;
-    }
-
-    public String getAn5(){
-        return an5;
-    }
-    public void setAn6(String an6){
-        this.an6 = an6;
-    }
-
-    public String getAn6(){
-        return an6;
-    }
-    public void setAn7(String an7){
-        this.an7 = an7;
-    }
-
-    public String getAn7(){
-        return an7;
-    }
-    public void setAnswerTrue(String answerTrue){
-        this.answerTrue = answerTrue;
-    }
-
-    public String getAnswerTrue(){
-        return answerTrue;
-    }
-    public void setExplain1(String explain1){
-        this.explain1 = explain1;
-    }
-
-    public String getExplain1(){
-        return explain1;
-    }
-    public void setBestAnswerId(String bestAnswerId){
-        this.bestAnswerId = bestAnswerId;
-    }
-
-    public String getBestAnswerId(){
-        return bestAnswerId;
-    }
-    public void setKemu(Long kemu){
-        this.kemu = kemu;
-    }
-
-    public Long getKemu(){
-        return kemu;
-    }
-    public void setJieshiFrom(String jieshiFrom){
-        this.jieshiFrom = jieshiFrom;
-    }
-
-    public String getJieshiFrom(){
-        return jieshiFrom;
-    }
-    public void setMoretypes(String moretypes){
-        this.moretypes = moretypes;
-    }
-
-    public String getMoretypes(){
-        return moretypes;
-    }
-    public void setChapterid(Long chapterid){
-        this.chapterid = chapterid;
-    }
-
-    public Long getChapterid(){
-        return chapterid;
-    }
-    public void setSinaimg(String sinaimg){
-        this.sinaimg = sinaimg;
-    }
-
-    public String getSinaimg(){
-        return sinaimg;
-    }
-    public void setVideoUrl(String videoUrl){
-        this.videoUrl = videoUrl;
-    }
-
-    public String getVideoUrl(){
-        return videoUrl;
-    }
-    public void setDiffDegree(Long diffDegree){
-        this.diffDegree = diffDegree;
-    }
-
-    public Long getDiffDegree(){
-        return diffDegree;
-    }
-    public void setCityid(Long cityid){
-        this.cityid = cityid;
-    }
-
-    public Long getCityid(){
-        return cityid;
-    }
-    public void setGs(String gs){
-        this.gs = gs;
-    }
-
-    public String getGs(){
-        return gs;
-    }
-    public void setKeyword(String keyword){
-        this.keyword = keyword;
-    }
-
-    public String getKeyword(){
-        return keyword;
-    }
-    public void setErrorRate(Long errorRate){
-        this.errorRate = errorRate;
-    }
-
-    public Long getErrorRate(){
-        return errorRate;
-    }
-    public void setMediaUrl(String mediaUrl){
-        this.mediaUrl = mediaUrl;
-    }
-
-    public String getMediaUrl(){
-        return mediaUrl;
-    }
-    public void setShowOptionType(Long showOptionType){
-        this.showOptionType = showOptionType;
-    }
-
-    public Long getShowOptionType(){
-        return showOptionType;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("type", getType())
-            .append("intNumber", getIntNumber())
-            .append("strTppe", getStrTppe())
-            .append("strTypeL", getStrTypeL())
-            .append("licenseType", getLicenseType())
-            .append("question", getQuestion())
-            .append("an1", getAn1())
-            .append("an2", getAn2())
-            .append("an3", getAn3())
-            .append("an4", getAn4())
-            .append("an5", getAn5())
-            .append("an6", getAn6())
-            .append("an7", getAn7())
-            .append("answerTrue", getAnswerTrue())
-            .append("explain1", getExplain1())
-            .append("bestAnswerId", getBestAnswerId())
-            .append("kemu", getKemu())
-            .append("jieshiFrom", getJieshiFrom())
-            .append("moretypes", getMoretypes())
-            .append("chapterid", getChapterid())
-            .append("sinaimg", getSinaimg())
-            .append("videoUrl", getVideoUrl())
-            .append("diffDegree", getDiffDegree())
-            .append("cityid", getCityid())
-            .append("gs", getGs())
-            .append("keyword", getKeyword())
-            .append("errorRate", getErrorRate())
-            .append("mediaUrl", getMediaUrl())
-            .append("showOptionType", getShowOptionType())
-            .toString();
-    }
-}

jsjp-service/src/main/java/com/miaxis/question/dto/QuestionCollectionDto.java

@@ -1,32 +0,0 @@
-package com.miaxis.question.dto;
-
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 题目收藏对象 Question_Collection
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@Data
-@ApiModel(value = "QuestionCollectionDto", description = "题目收藏对象")
-public class QuestionCollectionDto extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 用户id */
-    @ApiModelProperty(value = "用户id",hidden = true)
-    private Long userId;
-
-    /** 题目id */
-    @ApiModelProperty(value = "题目id")
-    private Long questionId;
-
-    /** 科目 */
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-
-}

jsjp-service/src/main/java/com/miaxis/question/dto/QuestionErrorDto.java

@@ -1,32 +0,0 @@
-package com.miaxis.question.dto;
-
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 错题对象 question_error
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@Data
-@ApiModel(value = "QuestionErrorDto", description = "错题对象 question_error")
-public class QuestionErrorDto extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 用户id */
-    @ApiModelProperty(value = "用户id",hidden = true)
-    private Long userId;
-
-    /** 题目id */
-    @ApiModelProperty(value = "题目id")
-    private Long questionId;
-
-    /** 科目 */
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-
-}

jsjp-service/src/main/java/com/miaxis/question/dto/QuestionInfoDto.java

@@ -1,62 +0,0 @@
-package com.miaxis.question.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 题库对象 question_info
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Data
-@ApiModel(value = "QuestionInfoDto", description = "题库传参")
-public class QuestionInfoDto extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    @TableId("id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 类型 */
-    @TableField("type")
-    @ApiModelProperty(value = "类型 1:选择题 2:单选题 3:多选题")
-    private Long type;
-
-
-    /** 许可车型 */
-    @TableField("license_type")
-    @ApiModelProperty(value = "许可车型")
-    private String licenseType;
-
-
-    /** 科目 */
-    @TableField("kemu")
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-
-    /**
-     * 是否显示
-     */
-    @TableField("show_option_type")
-    @ApiModelProperty(value = "是否显示")
-    private Long showOptionType;
-
-
-    /**
-     * 排序
-     */
-    @ApiModelProperty(value = "排序")
-    private String orderByClause;
-
-}

jsjp-service/src/main/java/com/miaxis/question/dto/QuestionInfoRandDto.java

@@ -1,48 +0,0 @@
-package com.miaxis.question.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 题库对象 question_info
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Data
-@ApiModel(value = "QuestionInfoDto", description = "题库传参")
-public class QuestionInfoRandDto extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-
-    /** 类型 */
-    @TableField("type")
-    @ApiModelProperty(value = "类型 1:选择题 2:单选题 3:多选题")
-    private Long type;
-
-
-    /** 许可车型 */
-    @TableField("license_type")
-    @ApiModelProperty(value = "许可车型")
-    private String licenseType;
-
-
-    /** 科目 */
-    @TableField("kemu")
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-
-
-
-    /**
-     * 承机条数
-     */
-    @ApiModelProperty(value = "随机条数",required = true)
-    private Integer num;
-
-}

jsjp-service/src/main/java/com/miaxis/question/mapper/QuestionCollectionMapper.java

@@ -1,26 +0,0 @@
-package com.miaxis.question.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.question.domain.QuestionCollection;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.dto.QuestionErrorDto;
-
-/**
- * 题目收藏Mapper接口
- *
- * @author miaxis
- * @date 2021-03-18
- */
-public interface QuestionCollectionMapper extends BaseMapper<QuestionCollection> {
-    /**
-     * 查询题目收藏列表
-     *
-     * @param questionCollection 题目收藏
-     * @return 题目收藏集合
-     */
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollection questionCollection);
-
-    List<QuestionError> getQuestionCollectionList(QuestionCollectionDto questionCollectionDto);
-}

jsjp-service/src/main/java/com/miaxis/question/mapper/QuestionErrorMapper.java

@@ -1,26 +0,0 @@
-package com.miaxis.question.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionErrorDto;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 错题Mapper接口
- *
- * @author miaxis
- * @date 2021-03-16
- */
-public interface QuestionErrorMapper extends BaseMapper<QuestionError> {
-    /**
-     * 查询错题列表
-     *
-     * @param questionError 错题
-     * @return 错题集合
-     */
-    public List<QuestionError> selectQuestionErrorList(QuestionError questionError);
-
-    List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto);
-}

jsjp-service/src/main/java/com/miaxis/question/mapper/QuestionInfoMapper.java

@@ -1,27 +0,0 @@
-package com.miaxis.question.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-
-/**
- * 题库Mapper接口
- *
- * @author miaxis
- * @date 2021-03-12
- */
-public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
-    /**
-     * 查询题库列表
-     *
-     * @param questionInfo 题库
-     * @return 题库集合
-     */
-    public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
-
-    List<QuestionInfo> getQuestionInfoList(QuestionInfoDto questionInfoDto);
-
-    List<QuestionInfo> getRandQuestionInfoList(QuestionInfoRandDto questionInfoRandDto);
-}

jsjp-service/src/main/java/com/miaxis/question/service/IQuestionCollectionService.java

@@ -1,26 +0,0 @@
-package com.miaxis.question.service;
-
-import java.util.List;
-import com.miaxis.question.domain.QuestionCollection;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.dto.QuestionErrorDto;
-
-/**
- * 题目收藏Service接口
- *
- * @author miaxis
- * @date 2021-03-18
- */
-public interface IQuestionCollectionService extends IService<QuestionCollection>{
-    /**
-     * 查询题目收藏列表
-     *
-     * @param questionCollection 题目收藏
-     * @return 题目收藏集合
-     */
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollection questionCollection);
-
-    List<QuestionError> getQuestionCollectionList(QuestionCollectionDto questionCollectionDto);
-}

jsjp-service/src/main/java/com/miaxis/question/service/IQuestionErrorService.java

@@ -1,24 +0,0 @@
-package com.miaxis.question.service;
-
-import java.util.List;
-import com.miaxis.question.domain.QuestionError;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.question.dto.QuestionErrorDto;
-
-/**
- * 错题Service接口
- *
- * @author miaxis
- * @date 2021-03-16
- */
-public interface IQuestionErrorService extends IService<QuestionError>{
-    /**
-     * 查询错题列表
-     *
-     * @param questionError 错题
-     * @return 错题集合
-     */
-    public List<QuestionError> selectQuestionErrorList(QuestionError questionError);
-
-    public List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto);
-}

jsjp-service/src/main/java/com/miaxis/question/service/IQuestionInfoService.java

@@ -1,20 +0,0 @@
-package com.miaxis.question.service;
-
-import java.util.List;
-import com.miaxis.question.domain.QuestionInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-
-/**
- * 题库Service接口
- *
- * @author miaxis
- * @date 2021-03-12
- */
-public interface IQuestionInfoService extends IService<QuestionInfo>{
-
-    List<QuestionInfo> getQuestionInfoList(QuestionInfoDto questionInfoDto);
-
-    List<QuestionInfo> getRandQuestionInfoList(QuestionInfoRandDto questionInfoRandDto);
-}

jsjp-service/src/main/java/com/miaxis/question/service/impl/QuestionCollectionServiceImpl.java

@@ -1,41 +0,0 @@
-package com.miaxis.question.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.question.domain.QuestionCollection;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.mapper.QuestionCollectionMapper;
-import com.miaxis.question.service.IQuestionCollectionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 题目收藏Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-18
- */
-@Service
-public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectionMapper, QuestionCollection> implements IQuestionCollectionService {
-    @Autowired
-    private QuestionCollectionMapper questionCollectionMapper;
-
-    /**
-     * 查询题目收藏列表
-     *
-     * @param questionCollection 题目收藏
-     * @return 题目收藏
-     */
-    @Override
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollection questionCollection){
-        return questionCollectionMapper.selectQuestionCollectionList(questionCollection);
-    }
-
-
-    @Override
-    public List<QuestionError> getQuestionCollectionList(QuestionCollectionDto questionCollectionDto) {
-        return questionCollectionMapper.getQuestionCollectionList(questionCollectionDto);
-    }
-}

jsjp-service/src/main/java/com/miaxis/question/service/impl/QuestionErrorServiceImpl.java

@@ -1,42 +0,0 @@
-package com.miaxis.question.service.impl;
-
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
-import com.miaxis.question.dto.QuestionErrorDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
-import com.miaxis.question.mapper.QuestionErrorMapper;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.service.IQuestionErrorService;
-
-/**
- * 错题Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@Service
-public class QuestionErrorServiceImpl extends ServiceImpl<QuestionErrorMapper, QuestionError> implements IQuestionErrorService {
-    @Autowired
-    private QuestionErrorMapper questionErrorMapper;
-
-    /**
-     * 查询错题列表
-     *
-     * @param questionError 错题
-     * @return 错题
-     */
-    @Override
-    public List<QuestionError> selectQuestionErrorList(QuestionError questionError){
-        return questionErrorMapper.selectQuestionErrorList(questionError);
-    }
-
-    @Override
-    public List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto) {
-        return questionErrorMapper.getQuestionErrorList(questionErrorDto);
-    }
-}

jsjp-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoServiceImpl.java

@@ -1,45 +0,0 @@
-package com.miaxis.question.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-import com.miaxis.question.mapper.QuestionInfoMapper;
-import com.miaxis.question.service.IQuestionInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 题库Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Service
-public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, QuestionInfo> implements IQuestionInfoService {
-    @Autowired
-    private QuestionInfoMapper questionInfoMapper;
-
-//    /**
-//     * 查询题库列表
-//     *
-//     * @param questionInfo 题库
-//     * @return 题库
-//     */
-//    @Override
-//    public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo){
-//        return questionInfoMapper.selectQuestionInfoList(questionInfo);
-//    }
-
-    @Override
-    public List<QuestionInfo> getQuestionInfoList(QuestionInfoDto questionInfoDto) {
-        return questionInfoMapper.getQuestionInfoList(questionInfoDto);
-    }
-
-    @Override
-    public List<QuestionInfo> getRandQuestionInfoList(QuestionInfoRandDto questionInfoRandDto) {
-        return questionInfoMapper.getRandQuestionInfoList(questionInfoRandDto);
-    }
-}

jsjp-service/src/main/java/com/miaxis/question/vo/QuestionInfoVo.java

@@ -1,198 +0,0 @@
-package com.miaxis.question.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 题库对象 question_info
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Data
-@ApiModel(value = "QuestionInfoVo", description = "题库对象出参")
-public class QuestionInfoVo extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId("id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /**
-     * 类型
-     */
-    @Excel(name = "类型 1:选择题 2:单选题 3:多选题")
-    @TableField("type")
-    @ApiModelProperty(value = "类型 1:选择题 2:单选题 3:多选题")
-    private Long type;
-
-
-    /**
-     * 许可车型
-     */
-    @Excel(name = "许可车型")
-    @TableField("license_type")
-    @ApiModelProperty(value = "许可车型")
-    private String licenseType;
-
-    /**
-     * 问题
-     */
-    @Excel(name = "问题")
-    @TableField("question")
-    @ApiModelProperty(value = "问题")
-    private String question;
-
-    /**
-     * 答案1
-     */
-    @Excel(name = "答案1")
-    @TableField("an1")
-    @ApiModelProperty(value = "答案1")
-    private String an1;
-
-    /**
-     * 答案2
-     */
-    @Excel(name = "答案2")
-    @TableField("an2")
-    @ApiModelProperty(value = "答案2")
-    private String an2;
-
-    /**
-     * 答案3
-     */
-    @Excel(name = "答案3")
-    @TableField("an3")
-    @ApiModelProperty(value = "答案3")
-    private String an3;
-
-    /**
-     * 答案4
-     */
-    @Excel(name = "答案4")
-    @TableField("an4")
-    @ApiModelProperty(value = "答案4")
-    private String an4;
-
-    /**
-     * 答案5
-     */
-    @Excel(name = "答案5")
-    @TableField("an5")
-    @ApiModelProperty(value = "答案5")
-    private String an5;
-
-    /**
-     * 答案6
-     */
-    @Excel(name = "答案6")
-    @TableField("an6")
-    @ApiModelProperty(value = "答案6")
-    private String an6;
-
-    /**
-     * 答案7
-     */
-    @Excel(name = "答案7")
-    @TableField("an7")
-    @ApiModelProperty(value = "答案7")
-    private String an7;
-
-    /**
-     * 正确答案
-     */
-    @Excel(name = "正确答案")
-    @TableField("answer_true")
-    @ApiModelProperty(value = "正确答案")
-    private String answerTrue;
-
-    /**
-     * 解释
-     */
-    @Excel(name = "解释")
-    @TableField("explain1")
-    @ApiModelProperty(value = "解释")
-    private String explain1;
-
-    /**
-     * 最佳答案
-     */
-    @Excel(name = "最佳答案")
-    @TableField("best_answer_id")
-    @ApiModelProperty(value = "最佳答案")
-    private String bestAnswerId;
-
-    /**
-     * 科目
-     */
-    @Excel(name = "科目")
-    @TableField("kemu")
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-    /**
-     * 更多类型
-     */
-    @Excel(name = "更多类型")
-    @TableField("moretypes")
-    @ApiModelProperty(value = "更多类型")
-    private String moretypes;
-
-
-    /**
-     * 图片文件名
-     */
-    @Excel(name = "图片文件名")
-    @TableField("sinaimg")
-    @ApiModelProperty(value = "图片文件名")
-    private String sinaimg;
-
-    /**
-     * 视频文件名
-     */
-    @Excel(name = "视频文件名")
-    @TableField("video_url")
-    @ApiModelProperty(value = "视频文件名")
-    private String videoUrl;
-
-
-    /**
-     * 城市
-     */
-    @Excel(name = "城市")
-    @TableField("cityid")
-    @ApiModelProperty(value = "城市")
-    private Long cityid;
-
-
-
-    /**
-     * 文件地址
-     */
-    @Excel(name = "文件地址")
-    @TableField("media_url")
-    @ApiModelProperty(value = "文件地址")
-    private String mediaUrl;
-
-    /**
-     * 是否显示
-     */
-    @Excel(name = "是否显示")
-    @TableField("show_option_type")
-    @ApiModelProperty(value = "是否显示")
-    private Long showOptionType;
-
-}
-

jsjp-service/src/main/java/com/miaxis/topic/domain/TopicInfo.java

@@ -1,78 +0,0 @@
-package com.miaxis.topic.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-/**
- * 专题对象 topic_info
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@TableName("topic_info")
-@ApiModel(value = "TopicInfo", description = "专题对象 topic_info")
-public class TopicInfo extends BaseBusinessEntity{
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 专题名称 */
-    @TableField("topic_name")
-    @ApiModelProperty(value = "专题名称")
-    private String topicName;
-
-    /** 专题插图--对应file_info的id */
-    @TableField("topic_illustration")
-    @ApiModelProperty(value = "专题插图--对应file_info的id")
-    private Long topicIllustration;
-
-    /** 是否允许分享   0：是 、1：否 */
-    @TableField("sharing_status")
-    @ApiModelProperty(value = "是否允许分享   0：是 、1：否")
-    private Integer sharingStatus;
-
-    /** 是否显示分享数量    0：是 、1：否 */
-    @TableField("sharing_number_status")
-    @ApiModelProperty(value = "是否显示分享数量    0：是 、1：否")
-    private Integer sharingNumberStatus;
-
-    /** 是否允许评论   0：是 、1：否 */
-    @TableField("comment_status")
-    @ApiModelProperty(value = "是否允许评论   0：是 、1：否")
-    private Integer commentStatus;
-
-    /** 是否显示评论数量    0：是 、1：否 */
-    @TableField("comment_number_status")
-    @ApiModelProperty(value = "是否显示评论数量    0：是 、1：否")
-    private Integer commentNumberStatus;
-
-    /** 是否显示收藏数量   0：是 、1：否 */
-    @TableField("collection_number_status")
-    @ApiModelProperty(value = "是否显示收藏数量   0：是 、1：否")
-    private Integer collectionNumberStatus;
-
-    /** 专题内容 */
-    @TableField("topic_content")
-    @ApiModelProperty(value = "专题内容")
-    private String topicContent;
-
-    /** 上架状态  0：已上架、1：未上架 */
-    @TableField("shelf_status")
-    @ApiModelProperty(value = "上架状态  0：已上架、1：未上架")
-    private Integer shelfStatus;
-
-    /** 状态  0：有效(默认)、1：失效 （伪删除） */
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private Integer status;
-
-
-}

jsjp-service/src/main/java/com/miaxis/topic/dto/TopicInfoDto.java

@@ -1,64 +0,0 @@
-package com.miaxis.topic.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import com.miaxis.goods.domain.GoodsInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 专题对象入参
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@ApiModel(value = "TopicInfoDto", description = "专题对象入参")
-public class TopicInfoDto extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @ApiModelProperty(value = "专题名称")
-    private String topicName;
-
-    @ApiModelProperty(value = "专题插图--对应file_info的id")
-    private Long topicIllustration;
-
-    @ApiModelProperty(value = "是否允许分享   0：是 、1：否")
-    private Integer sharingStatus;
-
-    @ApiModelProperty(value = "是否显示分享数量    0：是 、1：否")
-    private Integer sharingNumberStatus;
-
-    @ApiModelProperty(value = "是否允许评论   0：是 、1：否")
-    private Integer commentStatus;
-
-    @ApiModelProperty(value = "是否显示评论数量    0：是 、1：否")
-    private Integer commentNumberStatus;
-
-    @ApiModelProperty(value = "是否显示收藏数量   0：是 、1：否")
-    private Integer collectionNumberStatus;
-
-    @ApiModelProperty(value = "专题内容")
-    private String topicContent;
-
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private Integer status;
-
-    @ApiModelProperty(value = "上架状态  0：已上架、1：未上架")
-    private Integer shelfStatus;
-
-    @ApiModelProperty(value = "商品集合")
-    private List<GoodsInfo> goodsInfoList;
-
-}

jsjp-service/src/main/java/com/miaxis/topic/mapper/TopicInfoMapper.java

@@ -1,30 +0,0 @@
-package com.miaxis.topic.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.topic.domain.TopicInfo;
-import com.miaxis.topic.vo.TopicInfoVo;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 专题Mapper接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface TopicInfoMapper extends BaseMapper<TopicInfo> {
-    /**
-     * 查询专题列表
-     *
-     * @param topicInfo 专题
-     * @return 专题集合
-     */
-    List<TopicInfoVo> selectTopicInfoList(TopicInfoVo topicInfo);
-
-    /**
-     * 获取专题详情信息
-     * @param id
-     * @return
-     */
-    TopicInfoVo getTopicDetailsById(@Param("id") Long id);
-}

jsjp-service/src/main/java/com/miaxis/topic/service/ITopicInfoService.java

@@ -1,55 +0,0 @@
-package com.miaxis.topic.service;
-
-import java.util.List;
-
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.topic.domain.TopicInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.topic.dto.TopicInfoDto;
-import com.miaxis.topic.vo.TopicInfoVo;
-
-/**
- * 专题Service接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface ITopicInfoService extends IService<TopicInfo>{
-
-    /**
-     * 查询专题列表
-     *
-     * @param topicInfoVo 专题
-     * @return 专题集合
-     */
-    List<TopicInfoVo> selectTopicInfoList(TopicInfoVo topicInfoVo);
-
-    /**
-     * 新增专题
-     * @param topicInfoDto
-     * @return
-     */
-    Response<Integer> addTopic(TopicInfoDto topicInfoDto);
-
-    /**
-     * 删除专题
-     * @param ids
-     * @return
-     */
-    Response<Integer> removeTopicByIds(Long[] ids);
-
-    /**
-     * 查询专题详情
-     * @param id
-     * @return
-     */
-    Response<TopicInfoVo> getTopicDetailsById(Long id);
-
-    /**
-     * 更新 0：上架 / 1：下架
-     * @param ids
-     * @param shelfStatus
-     * @return
-     */
-    Response updateShelfStatus(Long[] ids, Integer shelfStatus);
-}

jsjp-service/src/main/java/com/miaxis/topic/service/impl/TopicInfoServiceImpl.java

@@ -1,138 +0,0 @@
-package com.miaxis.topic.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.utils.bean.BeanUtils;
-import com.miaxis.file.service.IFileInfoService;
-import com.miaxis.goods.domain.GoodsInfo;
-import com.miaxis.goods.mapper.GoodsInfoMapper;
-import com.miaxis.goods.service.IGoodsInfoService;
-import com.miaxis.goods.vo.GoodsInfoVo;
-import com.miaxis.topic.domain.TopicInfo;
-import com.miaxis.topic.dto.TopicInfoDto;
-import com.miaxis.topic.mapper.TopicInfoMapper;
-import com.miaxis.topic.service.ITopicInfoService;
-import com.miaxis.topic.vo.TopicInfoVo;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 专题Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Service
-@RequiredArgsConstructor
-public class TopicInfoServiceImpl extends ServiceImpl<TopicInfoMapper, TopicInfo> implements ITopicInfoService {
-
-    private final TopicInfoMapper topicInfoMapper;
-
-    private final IGoodsInfoService goodsInfoService;
-
-    private final GoodsInfoMapper goodsInfoMapper;
-
-    private final IFileInfoService fileInfoService;
-
-    /**
-     * 查询专题列表
-     *
-     * @param topicInfoVo 专题
-     * @return 专题
-     */
-    @Override
-    public List<TopicInfoVo> selectTopicInfoList(TopicInfoVo topicInfoVo){
-
-        //专题列表
-        List<TopicInfoVo>  topicInfoVos = topicInfoMapper.selectTopicInfoList(topicInfoVo);
-
-        for (TopicInfoVo topic : topicInfoVos) {
-            //查询对应商品
-            List<GoodsInfoVo> goodsInfoVoList = goodsInfoMapper.getGoodsInfoListByTopicId(topic.getId());
-            if (goodsInfoVoList.size() > 0){
-                topic.setGoodsInfoList(goodsInfoVoList);
-            }
-        }
-        return topicInfoVos;
-    }
-
-    /**
-     * 新增专题
-     * @param topicInfoDto
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response<Integer> addTopic(TopicInfoDto topicInfoDto) {
-
-        //保存专题信息
-        TopicInfo topicInfo = new TopicInfo();
-        BeanUtils.copyProperties(topicInfoDto,topicInfo);
-        this.save(topicInfo);
-
-        //保存商品信息
-        List<GoodsInfo> goodsInfoList = topicInfoDto.getGoodsInfoList();
-        goodsInfoList.forEach(g -> g.setTopicId(Integer.valueOf(topicInfo.getId().toString())));
-        goodsInfoService.saveBatch(goodsInfoList);
-
-        return Response.success();
-    }
-
-    /**
-     * 删除专题
-     * @param ids
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response<Integer> removeTopicByIds(Long[] ids) {
-        for (Long id : ids) {
-            //删除专题
-            this.update(new UpdateWrapper<TopicInfo>().set("status",1).eq("id",id));
-            //删除商品
-            goodsInfoService.update(new UpdateWrapper<GoodsInfo>().set("status",1).eq("topic_id",id));
-        }
-        return Response.success();
-    }
-
-    /**
-     * 查询专题详情
-     * @param id
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    public Response getTopicDetailsById(Long id) {
-        TopicInfoVo topicInfoVo = topicInfoMapper.getTopicDetailsById(id);
-        topicInfoVo.setGoodsInfoList(goodsInfoMapper.getGoodsInfoListByTopicId(topicInfoVo.getId()));
-        return Response.success(topicInfoVo);
-    }
-
-    /**
-     * 更新 0：上架 / 1：下架
-     * @param ids
-     * @param shelfStatus
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response updateShelfStatus(Long[] ids, Integer shelfStatus) {
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<TopicInfo>().set("shelf_status",shelfStatus).eq("id",id));
-        }
-        return Response.success();
-    }
-
-
-}

jsjp-service/src/main/java/com/miaxis/topic/vo/TopicInfoVo.java

@@ -1,74 +0,0 @@
-package com.miaxis.topic.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import com.miaxis.goods.vo.GoodsInfoVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 专题对象返回参
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@ApiModel(value = "TopicInfoVo", description = "专题对象返回参")
-public class TopicInfoVo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @TableField("topic_name")
-    @ApiModelProperty(value = "专题名称")
-    private String topicName;
-
-    @TableField("topic_illustration")
-    @ApiModelProperty(value = "专题插图--对应file_info的id")
-    private Long topicIllustration;
-
-    @ApiModelProperty(value = "专题插图访问地址")
-    private String fileUrl;
-
-    @TableField("sharing_status")
-    @ApiModelProperty(value = "是否允许分享   0：是 、1：否")
-    private Integer sharingStatus;
-
-    @TableField("sharing_number_status")
-    @ApiModelProperty(value = "是否显示分享数量    0：是 、1：否")
-    private Integer sharingNumberStatus;
-
-    @TableField("comment_status")
-    @ApiModelProperty(value = "是否允许评论   0：是 、1：否")
-    private Integer commentStatus;
-
-    @TableField("comment_number_status")
-    @ApiModelProperty(value = "是否显示评论数量    0：是 、1：否")
-    private Integer commentNumberStatus;
-
-    @TableField("collection_number_status")
-    @ApiModelProperty(value = "是否显示收藏数量   0：是 、1：否")
-    private Integer collectionNumberStatus;
-
-    @TableField("topic_content")
-    @ApiModelProperty(value = "专题内容")
-    private String topicContent;
-
-    @TableField("shelf_status")
-    @ApiModelProperty(value = "上架状态  0：已上架、1：未上架")
-    private Integer shelfStatus;
-
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private Integer status;
-
-    @ApiModelProperty(value = "商品集合")
-    private List<GoodsInfoVo> goodsInfoList;
-
-}

jsjp-service/src/main/resources/mapper/goods/GoodsInfoMapper.xml

@@ -1,57 +0,0 @@
-<?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.miaxis.goods.mapper.GoodsInfoMapper">
-
-    <resultMap type="GoodsInfo" id="GoodsInfoResult">
-        <result property="id"    column="id"    />
-        <result property="goodsName"    column="goods_name"    />
-        <result property="goodsPrice"    column="goods_price"    />
-        <result property="goodsLink"    column="goods_link"    />
-        <result property="goodsDescribe"    column="goods_describe"    />
-        <result property="goodsPicture"    column="goods_picture"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="topicId"    column="topic_id"    />
-        <result property="status"    column="status"    />
-    </resultMap>
-
-    <sql id="selectGoodsInfoVo">
-        select id, goods_name, goods_price, goods_link, goods_describe, goods_picture, create_time, update_time,topic_id ,status from goods_info
-    </sql>
-
-    <select id="selectGoodsInfoList" parameterType="GoodsInfo" resultMap="GoodsInfoResult">
-        <include refid="selectGoodsInfoVo"/>
-        <where>
-            <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
-            <if test="goodsPrice != null "> and goods_price = #{goodsPrice}</if>
-            <if test="goodsLink != null  and goodsLink != ''"> and goods_link = #{goodsLink}</if>
-            <if test="goodsDescribe != null  and goodsDescribe != ''"> and goods_describe = #{goodsDescribe}</if>
-            <if test="goodsPicture != null "> and goods_picture = #{goodsPicture}</if>
-            <if test="topicId != null "> and topic_id = #{topicId}</if>
-            <if test="status != null and status != ''"> and status = #{status}</if>
-        </where>
-    </select>
-
-    <select id="getGoodsInfoListByTopicId" resultType="com.miaxis.goods.vo.GoodsInfoVo">
-        select
-        g.id,
-        g.goods_name,
-        g.goods_price,
-        g.goods_link,
-        g.goods_describe,
-        g.goods_picture,
-        g.create_time,
-        g.update_time,
-        g.topic_id ,
-        f.file_url as fileUrl,
-        g.status
-        from goods_info g
-        LEFT JOIN file_info f on f.file_id = g.goods_picture
-        where
-        g.status = 0
-        and g.topic_id = #{topicId}
-    </select>
-
-</mapper>

jsjp-service/src/main/resources/mapper/topic/TopicInfoMapper.xml

@@ -1,81 +0,0 @@
-<?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.miaxis.topic.mapper.TopicInfoMapper">
-
-    <resultMap type="TopicInfo" id="TopicInfoResult">
-        <result property="id"    column="id"    />
-        <result property="topicName"    column="topic_name"    />
-        <result property="topicIllustration"    column="topic_illustration"    />
-        <result property="sharingStatus"    column="sharing_status"    />
-        <result property="sharingNumberStatus"    column="sharing_number_status"    />
-        <result property="commentStatus"    column="comment_status"    />
-        <result property="commentNumberStatus"    column="comment_number_status"    />
-        <result property="collectionNumberStatus"    column="collection_number_status"    />
-        <result property="topicContent"    column="topic_content"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="shelfStatus"    column="shelf_status"    />
-        <result property="status"    column="status"    />
-    </resultMap>
-
-    <sql id="selectTopicInfoVo">
-        select id, topic_name, topic_illustration, sharing_status, sharing_number_status, comment_status, comment_number_status, collection_number_status, topic_content, create_time, update_time, shelf_status,status from topic_info
-    </sql>
-
-    <select id="selectTopicInfoList" resultType="com.miaxis.topic.vo.TopicInfoVo">
-        select
-        ti.id,
-        ti.topic_name,
-        ti.topic_illustration,
-        ti.sharing_status,
-        ti.sharing_number_status,
-        ti.comment_status,
-        ti.comment_number_status,
-        ti.collection_number_status,
-        ti.topic_content,
-        ti.create_time,
-        ti.update_time,
-        ti.shelf_status,
-        f.file_url as fileUrl,
-        ti.status
-        from topic_info ti
-        LEFT JOIN file_info f on f.file_id = ti.topic_illustration
-        <where>
-            <if test="topicName != null  and topicName != ''"> and topic_name like concat('%', #{topicName}, '%')</if>
-            <if test="topicIllustration != null "> and topic_illustration = #{topicIllustration}</if>
-            <if test="sharingStatus != null "> and sharing_status = #{sharingStatus}</if>
-            <if test="sharingNumberStatus != null "> and sharing_number_status = #{sharingNumberStatus}</if>
-            <if test="commentStatus != null "> and comment_status = #{commentStatus}</if>
-            <if test="commentNumberStatus != null "> and comment_number_status = #{commentNumberStatus}</if>
-            <if test="collectionNumberStatus != null "> and collection_number_status = #{collectionNumberStatus}</if>
-            <if test="topicContent != null  and topicContent != ''"> and topic_content = #{topicContent}</if>
-            <if test="shelfStatus != null "> and shelf_status = #{shelfStatus}</if>
-            <if test="status != null "> and status = #{status}</if>
-        </where>
-    </select>
-
-    <!--获取专题详情信息-->
-    <select id="getTopicDetailsById" resultType="com.miaxis.topic.vo.TopicInfoVo">
-        select
-        ti.id,
-        ti.topic_name,
-        ti.topic_illustration,
-        ti.sharing_status,
-        ti.sharing_number_status,
-        ti.comment_status,
-        ti.comment_number_status,
-        ti.collection_number_status,
-        ti.topic_content,
-        ti.create_time,
-        ti.update_time,
-        ti.shelf_status,
-        f.file_url as fileUrl,
-        ti.status
-        from topic_info ti
-        LEFT JOIN file_info f on f.file_id = ti.topic_illustration
-        WHERE ti.id = #{id}
-    </select>
-
-</mapper>