feat: 代码重构

hjl

2024-07-18 b9da8289051937fbbbd47bbda97414ad6c769a90

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WorkerProcessController.java

@@ -10,6 +10,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -17,6 +19,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -36,6 +39,8 @@

    @Resource
    private WorkerProcessService workerProcessService;
    @Resource
    private TokenService tokenService;

    /**
     * 师傅入驻审核分页列表
@@ -57,11 +62,30 @@
    public R<IPage<WorkerProcess>> queryPageList(String id, String realName, String city, Integer state,
                                                 @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
        }
        List<String> cityList = new ArrayList<>();
        if (loginUser.getIsFranchisee()) {
            cityList = loginUser.getCityList();
        }
        // 构建初始条件
        LambdaQueryChainWrapper<WorkerProcess> wrapper = workerProcessService.lambdaQuery();
        wrapper = StringUtils.isNotBlank(id) ? wrapper.like(WorkerProcess::getId, id) : wrapper;
        wrapper = StringUtils.isNotBlank(realName) ? wrapper.like(WorkerProcess::getRealName, realName) : wrapper;
        wrapper = StringUtils.isNotBlank(city) ? wrapper.like(WorkerProcess::getCity, city) : wrapper;
        wrapper = null != state ? wrapper.eq(WorkerProcess::getState, state) : wrapper;
        // 管辖城市
        for (int i = 0; i < cityList.size(); i++) {
            // 最后一跳城市不匹配or条件
            String s = cityList.get(i);
            if (cityList.size() - 1 == i) {
                wrapper.like(WorkerProcess::getCity, s);
            } else {
                wrapper.like(WorkerProcess::getCity, s).or();
            }
        }
        return R.ok(wrapper.eq(WorkerProcess::getIsDelete, 0)
                .orderByDesc(WorkerProcess::getCreateTime).page(Page.of(pageNum, pageSize)));
    }