Prechádzať zdrojové kódy

【修复】编辑菜单时防止传入状态参数导致修改状态,完善代码规范,定时任务实体符合驼峰命名,去掉@TableField注解保持统一风格

就是那个锅 4 rokov pred
rodič
commit
7a820d11cc

+ 8 - 5
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/service/impl/SysMenuServiceImpl.java

@ -311,10 +311,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                if (updateSubPidsFlag) {
                    list.forEach(child -> {
                        // 子节点pids组成 = 当前菜单新pids + 当前菜单id + 子节点自己的pids后缀
                        String oldPcodesPrefix = oldPids + "[" + oldMenu.getId() + "],";
                        String oldPcodesSuffix = child.getPids().substring(oldPcodesPrefix.length());
                        String menuPcodes = newPids + "[" + oldMenu.getId() + "]," + oldPcodesSuffix;
                        child.setPids(menuPcodes);
                        String oldPCodesPrefix = oldPids + SymbolConstant.LEFT_SQUARE_BRACKETS + oldMenu.getId()
                                + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA;
                        String oldPCodesSuffix = child.getPids().substring(oldPCodesPrefix.length());
                        String menuPCodes = newPids + SymbolConstant.LEFT_SQUARE_BRACKETS + oldMenu.getId()
                                + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA + oldPCodesSuffix;
                        child.setPids(menuPCodes);
                    });
                }
@ -327,7 +329,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
        // 设置新的pids
        oldMenu.setPids(newPids);
        //不能修改状态,用修改状态接口修改状态
        oldMenu.setStatus(null);
        this.updateById(oldMenu);
    }

+ 1 - 6
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/timer/entity/SysTimers.java

@ -47,37 +47,32 @@ public class SysTimers extends BaseEntity {
    /**
     * 定时器id
     */
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 任务名称
     */
    @TableField("timer_name")
    private String timerName;
    /**
     * 执行任务的class的类名(实现了TimerTaskRunner接口的类的全称)
     */
    @TableField("action_class")
    private String actionClass;
    /**
     * 定时任务表达式
     */
    @TableField("cron")
    private String cron;
    /**
     * 状态(字典 1运行  2停止)
     */
    @TableField("job_status")
    private Integer jobStatus;
    /**
     * 备注信息
     */
    @TableField("remark")
    private String remark;
}