Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

liyj

2024-09-23 dac9b1293fc59f64856bd8f9d6d872cfd5bef715

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java

@@ -1,5 +1,6 @@
package cn.huge.module.cases.controller.web;

import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.module.cases.domain.dto.CaseRegisterDTO;
@@ -113,20 +114,51 @@
    private CaseInfoService service;

    @GetMapping("/pageQuery")
    public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, @RequestParam(value = "orderBy") String orderBy) {
    public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size
            ) {
        try {
            Sort sort = null;
            if (StringUtil.isEmpty(orderBy)) {
                sort = Sort.by(Sort.Direction.DESC, "createTime");
            } else {
                sort = Sort.by(Sort.Direction.DESC, orderBy);
            }
            Map<String, Object> terms = getParameter();
            // 排序
            Sort sort = null;
            String sortName = null;
            String sortColmnStr = request.getParameter("sortColmn");
            String sortTypeStr = request.getParameter("sortType");
            int sortColmn = 1;
            int sortType = 1;
            if(StringUtils.isNotBlank(sortColmnStr)){
                sortColmn = Integer.valueOf(sortColmnStr);
            }
            if(StringUtils.isNotBlank(sortTypeStr)){
                sortType = Integer.valueOf(sortTypeStr);
            }
            switch (sortColmn){
                case 1:
                    sortName = "t1.create_time";
                    break;
                case 2:
                    sortName = "t1.case_level";
                    break;
                case 3:
                    sortName = "t3.number";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }

            PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
            Page<CaseRegisterDTO> caseInfoPage = service.pageQueryRegister(pageRequest, terms);
            return ReturnSucUtils.getRepInfo("处理成功", caseInfoPage);
        } catch (Exception e) {

            log.error("Controller接口[CaseRegisterInfoWebController.pageQuery]请求异常："+e, e);
            return ReturnFailUtils.getRepInfo();
        }
    }