花田厝 1 tydzień temu
rodzic
commit
4246dae02c

+ 110 - 0
jsjp-admin/src/main/java/com/miaxis/app/controller/icon/IconClassifyController.java

@@ -0,0 +1,110 @@
+package com.miaxis.app.controller.icon;
+
+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.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.icon.domain.IconClassify;
+import com.miaxis.icon.service.IIconClassifyService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【图标分类】Controller
+ *
+ * @author miaxis
+ * @date 2025-07-16
+ */
+@RestController
+@RequestMapping(Constants.OPEN_PREFIX+"/icon/classify")
+@Api(tags={"【APP-图标分类】"})
+public class IconClassifyController extends BaseController{
+    @Autowired
+    private IIconClassifyService iconClassifyService;
+
+    /**
+     * 查询图标分类列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon: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<IconClassify> list(@ModelAttribute IconClassify iconClassify){
+        startPage();
+        List<IconClassify> list = iconClassifyService.selectIconClassifyList(iconClassify);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出图标分类列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:export')")
+    @Log(title = "图标分类", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出图标分类列表Excel")
+    public Response<String> export(@ModelAttribute IconClassify iconClassify){
+        List<IconClassify> list = iconClassifyService.selectIconClassifyList(iconClassify);
+        ExcelUtil<IconClassify> util = new ExcelUtil<IconClassify>(IconClassify.class);
+        return util.exportExcel(list, "icon");
+    }
+
+    /**
+     * 获取图标分类详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取图标分类详细信息")
+    public Response<IconClassify> getInfo(
+            @ApiParam(name = "id", value = "图标分类参数", required = true)
+            @PathVariable("id") String id
+    ){
+        return Response.success(iconClassifyService.getById(id));
+    }
+
+    /**
+     * 新增图标分类
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:add')")
+    @Log(title = "图标分类", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增图标分类")
+    public Response<Integer> add(@RequestBody IconClassify iconClassify){
+        return toResponse(iconClassifyService.save(iconClassify) ? 1 : 0);
+    }
+
+    /**
+     * 修改图标分类
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:edit')")
+    @Log(title = "图标分类", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改图标分类")
+    public Response<Integer> edit(@RequestBody IconClassify iconClassify){
+        return toResponse(iconClassifyService.updateById(iconClassify) ? 1 : 0);
+    }
+
+    /**
+     * 删除图标分类
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:remove')")
+    @Log(title = "图标分类", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除图标分类")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "图标分类ids参数", required = true)
+            @PathVariable String[] ids
+    ){
+        return toResponse(iconClassifyService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

+ 110 - 0
jsjp-admin/src/main/java/com/miaxis/app/controller/icon/IconDataController.java

@@ -0,0 +1,110 @@
+package com.miaxis.app.controller.icon;
+
+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.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.icon.domain.IconData;
+import com.miaxis.icon.service.IIconDataService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【图标】Controller
+ *
+ * @author miaxis
+ * @date 2025-07-14
+ */
+@RestController
+@RequestMapping(Constants.OPEN_PREFIX+"/icon/data")
+@Api(tags={"【APP-图标】"})
+public class IconDataController extends BaseController{
+    @Autowired
+    private IIconDataService iconDataService;
+
+    /**
+     * 查询图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon: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<IconData> list(@ModelAttribute IconData iconData){
+        startPage();
+        List<IconData> list = iconDataService.selectIconDataList(iconData);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:export')")
+    @Log(title = "图标", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出图标列表Excel")
+    public Response<String> export(@ModelAttribute IconData iconData){
+        List<IconData> list = iconDataService.selectIconDataList(iconData);
+        ExcelUtil<IconData> util = new ExcelUtil<IconData>(IconData.class);
+        return util.exportExcel(list, "icon");
+    }
+
+    /**
+     * 获取图标详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取图标详细信息")
+    public Response<IconData> getInfo(
+            @ApiParam(name = "id", value = "图标参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(iconDataService.getById(id));
+    }
+
+    /**
+     * 新增图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:add')")
+    @Log(title = "图标", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增图标")
+    public Response<Integer> add(@RequestBody IconData iconData){
+        return toResponse(iconDataService.save(iconData) ? 1 : 0);
+    }
+
+    /**
+     * 修改图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon:edit')")
+    @Log(title = "图标", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改图标")
+    public Response<Integer> edit(@RequestBody IconData iconData){
+        return toResponse(iconDataService.updateById(iconData) ? 1 : 0);
+    }
+
+    /**
+     * 删除图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:icon: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(iconDataService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

Plik diff jest za duży
+ 42 - 0
jsjp-admin/src/test/java/com/miaxis/test/Test11.java


Plik diff jest za duży
+ 0 - 0
jsjp-admin/src/test/java/com/miaxis/test/指路标志.txt


+ 62 - 0
jsjp-service/src/main/java/com/miaxis/icon/domain/IconClassify.java

@@ -0,0 +1,62 @@
+package com.miaxis.icon.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;
+/**
+ * 图标分类对象 icon_classify
+ *
+ * @author miaxis
+ * @date 2025-07-16
+ */
+@Data
+@TableName("icon_classify")
+@ApiModel(value = "IconClassify", description = "图标分类对象 icon_classify")
+public class IconClassify extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    @TableField("name")
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    /** 图标数量 */
+    @Excel(name = "图标数量")
+    @TableField("icon_count")
+    @ApiModelProperty(value = "图标数量")
+    private Integer iconCount;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    @TableField("cover_img")
+    @ApiModelProperty(value = "图片地址")
+    private String coverImg;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("iconCount", getIconCount())
+            .append("coverImg", getCoverImg())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 84 - 0
jsjp-service/src/main/java/com/miaxis/icon/domain/IconData.java

@@ -0,0 +1,84 @@
+package com.miaxis.icon.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;
+/**
+ * 图标对象 icon_data
+ *
+ * @author miaxis
+ * @date 2025-07-14
+ */
+@Data
+@TableName("icon_data")
+@ApiModel(value = "IconData", description = "图标对象 icon_data")
+public class IconData extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "ID", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /** 分类ID */
+    @Excel(name = "分类ID")
+    @TableField("icon_classif_id")
+    @ApiModelProperty(value = "分类ID")
+    private String iconClassifyId;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    @TableField("icon_classify_name")
+    @ApiModelProperty(value = "分类名称")
+    private String iconClassifyName;
+
+    /** 图标名称 */
+    @Excel(name = "图标名称")
+    @TableField("name")
+    @ApiModelProperty(value = "图标名称")
+    private String name;
+
+    /** 图标地址 */
+    @Excel(name = "图标地址")
+    @TableField("icon")
+    @ApiModelProperty(value = "图标地址")
+    private String icon;
+
+    /** 图标描述 */
+    @Excel(name = "图标描述")
+    @TableField("description")
+    @ApiModelProperty(value = "图标描述")
+    private String description;
+
+    /** 关联的题目ID */
+    @Excel(name = "关联的题目ID")
+    @TableField("question_ids")
+    @ApiModelProperty(value = "关联的题目ID")
+    private String questionIds;
+
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("iconClassifId", getIconClassifyId())
+            .append("iconClassifyName", getIconClassifyName())
+            .append("name", getName())
+            .append("icon", getIcon())
+            .append("description", getDescription())
+            .append("createTime", getCreateTime())
+            .append("questionIds", getQuestionIds())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 22 - 0
jsjp-service/src/main/java/com/miaxis/icon/mapper/IconClassifyMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.icon.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.icon.domain.IconClassify;
+
+/**
+ * 图标分类Mapper接口
+ *
+ * @author miaxis
+ * @date 2025-07-16
+ */
+public interface IconClassifyMapper extends BaseMapper<IconClassify> {
+    /**
+     * 查询图标分类列表
+     *
+     * @param iconClassify 图标分类
+     * @return 图标分类集合
+     */
+    public List<IconClassify> selectIconClassifyList(IconClassify iconClassify);
+
+}

+ 22 - 0
jsjp-service/src/main/java/com/miaxis/icon/mapper/IconDataMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.icon.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.icon.domain.IconData;
+
+/**
+ * 图标Mapper接口
+ *
+ * @author miaxis
+ * @date 2025-07-14
+ */
+public interface IconDataMapper extends BaseMapper<IconData> {
+    /**
+     * 查询图标列表
+     *
+     * @param iconData 图标
+     * @return 图标集合
+     */
+    public List<IconData> selectIconDataList(IconData iconData);
+
+}

+ 21 - 0
jsjp-service/src/main/java/com/miaxis/icon/service/IIconClassifyService.java

@@ -0,0 +1,21 @@
+package com.miaxis.icon.service;
+
+import java.util.List;
+import com.miaxis.icon.domain.IconClassify;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 图标分类Service接口
+ *
+ * @author miaxis
+ * @date 2025-07-16
+ */
+public interface IIconClassifyService extends IService<IconClassify>{
+    /**
+     * 查询图标分类列表
+     *
+     * @param iconClassify 图标分类
+     * @return 图标分类集合
+     */
+    public List<IconClassify> selectIconClassifyList(IconClassify iconClassify);
+}

+ 21 - 0
jsjp-service/src/main/java/com/miaxis/icon/service/IIconDataService.java

@@ -0,0 +1,21 @@
+package com.miaxis.icon.service;
+
+import java.util.List;
+import com.miaxis.icon.domain.IconData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 图标Service接口
+ *
+ * @author miaxis
+ * @date 2025-07-14
+ */
+public interface IIconDataService extends IService<IconData>{
+    /**
+     * 查询图标列表
+     *
+     * @param iconData 图标
+     * @return 图标集合
+     */
+    public List<IconData> selectIconDataList(IconData iconData);
+}

+ 36 - 0
jsjp-service/src/main/java/com/miaxis/icon/service/impl/IconClassifyServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.icon.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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.icon.mapper.IconClassifyMapper;
+import com.miaxis.icon.domain.IconClassify;
+import com.miaxis.icon.service.IIconClassifyService;
+
+/**
+ * 图标分类Service业务层处理
+ *
+ * @author miaxis
+ * @date 2025-07-16
+ */
+@Service
+public class IconClassifyServiceImpl extends ServiceImpl<IconClassifyMapper, IconClassify> implements IIconClassifyService {
+    @Autowired
+    private IconClassifyMapper iconClassifyMapper;
+
+    /**
+     * 查询图标分类列表
+     *
+     * @param iconClassify 图标分类
+     * @return 图标分类
+     */
+    @Override
+    public List<IconClassify> selectIconClassifyList(IconClassify iconClassify){
+        return iconClassifyMapper.selectIconClassifyList(iconClassify);
+    }
+}

+ 36 - 0
jsjp-service/src/main/java/com/miaxis/icon/service/impl/IconDataServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.icon.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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.icon.mapper.IconDataMapper;
+import com.miaxis.icon.domain.IconData;
+import com.miaxis.icon.service.IIconDataService;
+
+/**
+ * 图标Service业务层处理
+ *
+ * @author miaxis
+ * @date 2025-07-14
+ */
+@Service
+public class IconDataServiceImpl extends ServiceImpl<IconDataMapper, IconData> implements IIconDataService {
+    @Autowired
+    private IconDataMapper iconDataMapper;
+
+    /**
+     * 查询图标列表
+     *
+     * @param iconData 图标
+     * @return 图标
+     */
+    @Override
+    public List<IconData> selectIconDataList(IconData iconData){
+        return iconDataMapper.selectIconDataList(iconData);
+    }
+}

+ 29 - 0
jsjp-service/src/main/resources/mapper/icon/IconClassifyMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.icon.mapper.IconClassifyMapper">
+
+    <resultMap type="IconClassify" id="IconClassifyResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="iconCount"    column="icon_count"    />
+        <result property="coverImg"    column="cover_img"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectIconClassifyVo">
+        select * from icon_classify
+    </sql>
+
+    <select id="selectIconClassifyList" parameterType="IconClassify" resultMap="IconClassifyResult">
+        <include refid="selectIconClassifyVo"/>
+        <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="iconCount != null  and iconCount != ''"> and icon_count = #{iconCount}</if>
+            <if test="coverImg != null  and coverImg != ''"> and cover_img = #{coverImg}</if>
+        </where>
+    </select>
+
+</mapper>

+ 35 - 0
jsjp-service/src/main/resources/mapper/icon/IconDataMapper.xml

@@ -0,0 +1,35 @@
+<?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.icon.mapper.IconDataMapper">
+
+    <resultMap type="IconData" id="IconDataResult">
+        <result property="id"    column="id"    />
+        <result property="iconClassifyId"    column="icon_classif_id"    />
+        <result property="iconClassifyName"    column="icon_classify_name"    />
+        <result property="name"    column="name"    />
+        <result property="icon"    column="icon"    />
+        <result property="description"    column="description"    />
+        <result property="questionIds"    column="question_ids"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectIconDataVo">
+        select * from icon_data
+    </sql>
+
+    <select id="selectIconDataList" parameterType="IconData" resultMap="IconDataResult">
+        <include refid="selectIconDataVo"/>
+        <where>
+            <if test="iconClassifyId != null  and iconClassifyId != ''"> and icon_classify_id = #{iconClassifyId}</if>
+            <if test="iconClassifyName != null  and iconClassifyName != ''"> and icon_classify_name like concat('%', #{iconClassifyName}, '%')</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="icon != null  and icon != ''"> and icon = #{icon}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="questionIds != null  and questionIds != ''"> and question_ids = #{questionIds}</if>
+        </where>
+    </select>
+
+</mapper>

+ 1 - 1
jsjp-service/src/main/resources/mapper/newgzpt/GzptSchPayConfigMapper.xml

@@ -17,7 +17,7 @@
 
 
     <select id="getSchPayConfigByJxbh"  resultType="com.miaxis.newgzpt.domain.GzptSchPayConfig">
-        select * from GZPT_SCH_PAY_CONFIG where jxbh =#{jxbh}
+        select * from GZPT_SCH_PAY_CONFIG where jxbh =#{jxbh,jdbcType=VARCHAR}
     </select>
 
     <select id="selectSchPayConfigList"  parameterType="com.miaxis.newgzpt.dto.GzptSchPayConfigDTO" resultMap="GzptSchPayConfigResult">

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików