Merge remote-tracking branch 'origin/master'

sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionVersionController.java

@@ -1,109 +0,0 @@
-package com.miaxis.app.controller.question;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.miaxis.common.constant.Constants;
-import java.util.List;
-import java.util.Arrays;
-import io.swagger.annotations.*;
-import com.miaxis.common.core.domain.Response;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.question.domain.QuestionVersion;
-import com.miaxis.question.service.IQuestionVersionService;
-import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
-
-/**
- * 【version】Controller
- *
- * @author zhangbin
- * @date 2021-07-26
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/version")
-@Api(tags={"【APP-题库版本】"})
-public class QuestionVersionController extends BaseController{
-    @Autowired
-    private IQuestionVersionService questionVersionService;
-
-    /**
-     * 查询version列表
-     */
-//    @PreAuthorize("@ss.hasPermi('question:version:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询version列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionVersion> list(@ModelAttribute QuestionVersion questionVersion){
-        startPage();
-        List<QuestionVersion> list = questionVersionService.selectQuestionVersionList(questionVersion);
-        return toResponsePageInfo(list);
-    }
-
-
-
-    /**
-     * 获取version详细信息
-
-//    @PreAuthorize("@ss.hasPermi('question:version:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取version详细信息")
-    public Response<QuestionVersion> getInfo(
-            @ApiParam(name = "id", value = "version参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(questionVersionService.getById(id));
-    }
-     */
-    /**
-     * 新增version
-
-//    @PreAuthorize("@ss.hasPermi('question:version:add')")
-    @Log(title = "version", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增version")
-    public Response<Integer> add(@RequestBody QuestionVersion questionVersion){
-        return toResponse(questionVersionService.save(questionVersion) ? 1 : 0);
-    }
-     */
-    /**
-     * 修改version
-
-//    @PreAuthorize("@ss.hasPermi('question:version:edit')")
-    @Log(title = "version", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改version")
-    public Response<Integer> edit(@RequestBody QuestionVersion questionVersion){
-        return toResponse(questionVersionService.updateById(questionVersion) ? 1 : 0);
-    }
-     */
-    /**
-     * 删除version
-
-//    @PreAuthorize("@ss.hasPermi('question:version:remove')")
-    @Log(title = "version", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除version")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "versionids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        questionVersionService.removeByIds(Arrays.asList(ids));
-        return toResponse(questionVersionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-     */
-}

sdjk-admin/src/main/java/com/miaxis/open/controller/OpenDictDataController.java

@@ -0,0 +1,51 @@
+package com.miaxis.open.controller;
+
+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.SysDictData;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.system.service.ISysDictDataService;
+import com.miaxis.system.service.ISysDictTypeService;
+import io.swagger.annotations.*;
+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.*;
+
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author miaxis
+ */
+@RestController
+@RequestMapping(Constants.OPEN_PREFIX+"/system/dict/data")
+@Api(tags={"【OPEN-数据字典信息】"})
+public class OpenDictDataController extends BaseController
+{
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    @ApiOperation("根据字典类型查询字典数据信息")
+    public Response<List<SysDictData>> dictType(
+            @ApiParam(name = "dictType", value = "根据字典类型查询字典数据信息", required = true)
+            @PathVariable("dictType") String dictType
+    ){
+        return Response.success(dictTypeService.selectDictDataByType(dictType));
+    }
+
+
+}

sdjk-service/src/main/java/com/miaxis/question/domain/QuestionVersion.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;
-/**
- * version对象 question_version
- *
- * @author zhangbin
- * @date 2021-07-26
- */
-@Data
-@TableName("question_version")
-@ApiModel(value = "QuestionVersion", description = "version对象 question_version")
-public class QuestionVersion extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
-    @TableField("version_num")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String versionNum;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
-    @TableField("down_path")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String downPath;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setVersionNum(String versionNum){
-        this.versionNum = versionNum;
-    }
-
-    public String getVersionNum(){
-        return versionNum;
-    }
-    public void setDownPath(String downPath){
-        this.downPath = downPath;
-    }
-
-    public String getDownPath(){
-        return downPath;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("versionNum", getVersionNum())
-            .append("downPath", getDownPath())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

sdjk-service/src/main/java/com/miaxis/question/mapper/QuestionVersionMapper.java

@@ -1,22 +0,0 @@
-package com.miaxis.question.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.question.domain.QuestionVersion;
-
-/**
- * versionMapper接口
- *
- * @author zhangbin
- * @date 2021-07-26
- */
-public interface QuestionVersionMapper extends BaseMapper<QuestionVersion> {
-    /**
-     * 查询version列表
-     *
-     * @param questionVersion version
-     * @return version集合
-     */
-    public List<QuestionVersion> selectQuestionVersionList(QuestionVersion questionVersion);
-
-}

sdjk-service/src/main/java/com/miaxis/question/service/IQuestionVersionService.java

@@ -1,21 +0,0 @@
-package com.miaxis.question.service;
-
-import java.util.List;
-import com.miaxis.question.domain.QuestionVersion;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * versionService接口
- *
- * @author zhangbin
- * @date 2021-07-26
- */
-public interface IQuestionVersionService extends IService<QuestionVersion>{
-    /**
-     * 查询version列表
-     *
-     * @param questionVersion version
-     * @return version集合
-     */
-    public List<QuestionVersion> selectQuestionVersionList(QuestionVersion questionVersion);
-}

sdjk-service/src/main/java/com/miaxis/question/service/impl/QuestionVersionServiceImpl.java

@@ -1,33 +0,0 @@
-package com.miaxis.question.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.question.domain.QuestionVersion;
-import com.miaxis.question.mapper.QuestionVersionMapper;
-import com.miaxis.question.service.IQuestionVersionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * versionService业务层处理
- *
- * @author zhangbin
- * @date 2021-07-26
- */
-@Service
-public class QuestionVersionServiceImpl extends ServiceImpl<QuestionVersionMapper, QuestionVersion> implements IQuestionVersionService {
-    @Autowired
-    private QuestionVersionMapper questionVersionMapper;
-
-    /**
-     * 查询version列表
-     *
-     * @param questionVersion version
-     * @return version
-     */
-    @Override
-    public List<QuestionVersion> selectQuestionVersionList(QuestionVersion questionVersion){
-        return questionVersionMapper.selectQuestionVersionList(questionVersion);
-    }
-}

sdjk-service/src/main/resources/mapper/question/QuestionVersionMapper.xml

@@ -1,29 +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.question.mapper.QuestionVersionMapper">
-
-    <resultMap type="QuestionVersion" id="QuestionVersionResult">
-        <result property="id"    column="id"    />
-        <result property="versionNum"    column="version_num"    />
-        <result property="downPath"    column="down_path"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectQuestionVersionVo">
-        select * from question_version
-    </sql>
-
-    <select id="selectQuestionVersionList" parameterType="QuestionVersion" resultMap="QuestionVersionResult">
-        <include refid="selectQuestionVersionVo"/>
-        <where>
-            <if test="versionNum != null  and versionNum != ''"> and version_num = #{versionNum}</if>
-            <if test="downPath != null  and downPath != ''"> and down_path = #{downPath}</if>
-        </where>
-    </select>
-
-
-
-</mapper>