二手家电回收
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mitao
2024-09-04 ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb 
 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java


@@ -1,6 +1,7 @@


package com.ruoyi.worker.controller;






import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.ruoyi.admin.api.entity.Agreement;


import com.ruoyi.admin.api.feignClient.AdminClient;


import com.ruoyi.common.core.constant.Constants;


@@ -13,8 +14,10 @@


import com.ruoyi.order.api.entity.WorkerOrderCountVO;


import com.ruoyi.order.api.feignClient.OrderClient;


import com.ruoyi.system.api.model.LoginUserInfo;


import com.ruoyi.worker.entity.AppVersion;


import com.ruoyi.worker.entity.MasterWorker;


import com.ruoyi.worker.entity.WorkerProcess;


import com.ruoyi.worker.mapper.AppMapper;


import com.ruoyi.worker.request.LoginPasswordRequest;


import com.ruoyi.worker.request.LoginPhoneRequest;


import com.ruoyi.worker.service.MasterWorkerService;


@@ -25,16 +28,20 @@


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.regex.Pattern;


import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;




/**


 * <p>


@@ -61,7 +68,16 @@


    private AdminClient adminClient;


    @Resource


    private OrderClient orderClient;


    @Resource


    private AppMapper appMapper;






    @PostMapping("/version/check")


    @ApiOperation(value = "获取最新的版本信息", tags = {"自动更新"})


    public R<AppVersion> check() {


        AppVersion appVersion = appMapper.selectOne(new QueryWrapper<AppVersion>().orderByDesc("createTime").eq("is_delete", 0).last("limit 1"));


            return R.ok(appVersion);


    }


    /**


     * 师傅端-密码登录


     *


@@ -362,6 +378,14 @@


        return R.ok(masterWorkerService.orderNotHandle(loginWorker.getUserid(), longitude, latitude));


    }




    @ApiOperation(value = "下拉框", tags = {"后台-下拉框"})


    @GetMapping(value = "/workSelect")


    public R<List<MasterWorker>> workSelect() {




        List<MasterWorker> list = masterWorkerService.lambdaQuery().eq(MasterWorker::getIsEnable, 1).eq(MasterWorker::getIsDelete, 0).list();


        return R.ok(list);


    }




    /**


     * 师傅端-订单列表-地图模式


     */