fix

zhanzhiqin

2022-05-27 ce72201c7cd63b8eb02af930b7b8302d5395ae6a

fix

 dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package com.sandu.ximon.dao.enums;

/**
 * @author ZZQ
 * @date 2022/5/27 14:22
 */
public enum OrderByEnums {
    /**
     * ç®¡ç†å‘˜åˆ—表
     */
    //ID
    ADMIN_ID("id"),
    //创建时间
    ADMIN_CREATE_TIME("create_time"),
    //登录时间
    ADMIN_LOGIN_TIME("login_time"),

    /**
     * éŸ³æŸ±ç´ æåˆ—表
     */
    //创建时间
    IP_VOLUME_FILE_CREATE_TIME("create_time"),


    /**
     * æŽ’序方式
     */
    //正序
    ASC("ASC"),
    //倒序
    DESC("DESC"),
    ;

    private final String code;

    OrderByEnums(String code) {
        this.code = code;
    }

    public String getCode() {
        return code;
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java

@@ -209,11 +209,14 @@

    @Log("后台用户列表")
    @GetMapping(value = "/list")
    public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO,
                                        @RequestParam(value = "keyword", required = false) String keyword,
                                        @RequestParam(value = "order", required = false) Integer order,
                                        @RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
        return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword, order, seq));
    }

    @Log("后台用户注册")

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java

@@ -20,6 +20,7 @@
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -200,10 +201,41 @@
        return updateById(one);
    }

    public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword) {
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
    public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
        //排序字段
        String orderByResult = OrderByEnums.ADMIN_ID.getCode();
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.ADMIN_ID.getCode();
                    break;
                case 2:
                    orderByResult = OrderByEnums.ADMIN_CREATE_TIME.getCode();
                    break;
                case 3:
                    orderByResult = OrderByEnums.ADMIN_LOGIN_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = OrderByEnums.ASC.getCode();
                    break;
                case 2:
                    orderBySeq = OrderByEnums.DESC.getCode();
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;

        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);

        return adminMapper.listAdmin(keyword);
    }

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java

@@ -16,6 +16,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -107,13 +108,13 @@
        }

        //排序字段
        String orderByResult = "create_time";
        String orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
        //正序、倒叙
        String orderBySeq = "ASC";
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = "create_time";
                    orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
                    break;
                default:
            }
@@ -121,10 +122,10 @@
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    orderBySeq = OrderByEnums.ASC.getCode();
                    break;
                case 2:
                    orderBySeq = " DESC";
                    orderBySeq = OrderByEnums.DESC.getCode();
                    break;
                default:
                    break;