代码优化

linwe

2023-11-24 9bb3b6ba314fe1c5881aa2dda522511992b3d8c4

代码优化

 src/main/java/org/springblade/modules/discuss/controller/TopicsController.java

@@ -141,8 +141,8 @@
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(topicsService.removeByIds(Func.toLongList(ids)));
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam Integer ids) {
        return R.status(topicsService.removeById(ids));
    }



 src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java

@@ -51,8 +51,8 @@

    /** 选项 0：单 1多 */
    @ApiModelProperty(value = "选项 0：单 1多", example = "")
    @TableField("option")
    private Integer option;
    @TableField("option_range")
    private Integer optionRange;

    /** 排序 */
    @ApiModelProperty(value = "排序", example = "")

 src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml

@@ -6,7 +6,7 @@
    <resultMap id="topicsResultMap" type="org.springblade.modules.discuss.entity.TopicsEntity">
        <result property="id"    column="id"    />
        <result property="discussContent"    column="discuss_content"    />
        <result property="option"    column="option"    />
        <result property="optionRange"    column="option_range"    />
        <result property="sort"    column="sort"    />
        <result property="optionContent"    column="option_content"    />
        <result property="optionDetail"    column="option_detail"    />
@@ -23,7 +23,7 @@
    <resultMap type="org.springblade.modules.discuss.dto.TopicsDTO" id="TopicsDTOResult">
        <result property="id"    column="id"    />
        <result property="discussContent"    column="discuss_content"    />
        <result property="option"    column="option"    />
        <result property="optionRange"    column="option_range"    />
        <result property="sort"    column="sort"    />
        <result property="optionContent"    column="option_content"    />
        <result property="optionDetail"    column="option_detail"    />
@@ -34,16 +34,17 @@
        <result property="publicDiscussId"    column="public_discuss_id"    />
        <result property="parentId"    column="parent_id"    />
        <result property="level"    column="level"    />

        <collection property="children" column="id" javaType="int" select="selectStlCount">
        <collection property="children" column="id" javaType="list" ofType="org.springblade.modules.discuss.dto.TopicsDTO"  select="selectStlCount">
        </collection>


    </resultMap>

    <select id="selectStlCount" resultMap="TopicsDTOResult">
    <select id="selectStlCount" parameterType="int" resultType="org.springblade.modules.discuss.dto.TopicsDTO">
        <include refid="selectTopics"/>
        where parent_id = #{id}
        <where>
            <if test="id != null "> parent_id = #{id}</if>
        </where>
    </select>


@@ -51,7 +52,7 @@
        select
            id,
            discuss_content,
        option,
            option_range,
            sort,
            option_content,
            option_detail,
@@ -74,7 +75,7 @@
        <where>
            <if test="id != null "> and id = #{id}</if>
            <if test="discussContent != null  and discussContent != ''"> and discuss_content = #{discussContent}</if>
            <if test="option != null "> and option = #{option}</if>
            <if test="optionRange != null "> and option_range = #{optionRange}</if>
            <if test="sort != null "> and sort = #{sort}</if>
            <if test="optionContent != null  and optionContent != ''"> and option_content = #{optionContent}</if>
            <if test="optionDetail != null  and optionDetail != ''"> and option_detail = #{optionDetail}</if>
@@ -83,6 +84,9 @@
            <if test="updateTime != null "> and update_time = #{updateTime}</if>
            <if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if>
            <if test="publicDiscussId != null "> and public_discuss_id = #{publicDiscussId}</if>
            <if test="parentId != null "> and parent_id = #{parentId}</if>
            <if test="level != null "> and level = #{level}</if>
            and delete_flag = 0
        </where>
    </select>


 src/main/java/org/springblade/modules/system/entity/Menu.java

@@ -95,6 +95,11 @@
    @TableField("action")
    private Integer action;

    /** 操作按钮类型 */
    @ApiModelProperty(value = "菜单类型：0：web 1:app", example = "")
    @TableField("menu_type")
    private Integer menuType;

    /** 是否打开新页面 */
    @ApiModelProperty(value = "是否打开新页面", example = "")
    @TableField("is_open")

 src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml

@@ -22,6 +22,7 @@
        <result property="labelId"    column="label_id"    />
        <result property="background"    column="background"    />
        <result property="labelStr"    column="label_str"    />
        <result property="menuType" column="menu_type"/>
    </resultMap>

    <resultMap id="menuVOResultMap" type="org.springblade.modules.system.vo.MenuVO">
@@ -37,6 +38,7 @@
        <result column="action" property="action"/>
        <result column="is_open" property="isOpen"/>
        <result column="remark" property="remark"/>
        <result property="menuType" column="menu_type"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="has_children" property="hasChildren"/>
    </resultMap>
@@ -68,7 +70,8 @@
            picture_img,
            label_id,
            background,
            label_str
            label_str,
            menu_type
        from
            blade_menu
    </sql>
@@ -137,7 +140,10 @@
    </select>

    <select id="allMenu" resultMap="menuResultMap">
        select * from blade_menu where is_deleted = 0 and category = 1 and name != 'app'
        select *
        from blade_menu
        where is_deleted = 0
          and category = 1
    </select>

    <select id="roleMenu" resultMap="menuResultMap">