二手家电回收
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
8.9
luodangjia
2024-10-31 eb286b8d88dc5fcd0290d0d243cb7f0a2448616f 
 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java


@@ -2,7 +2,6 @@






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


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


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


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


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


@@ -29,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>


@@ -71,9 +74,10 @@




    @PostMapping("/version/check")


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


    public R<AppVersion> check() {


    public R check() {


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


            return R.ok(appVersion);


//         Object version = redisService.getCacheObject("version");


        return R.ok(appVersion);


    }


    /**


     * 师傅端-密码登录


@@ -368,6 +372,7 @@


            @ApiImplicitParam(value = "师傅所在纬度", name = "latitude", dataType = "String", required = true)


    })


    public R<List<OrderListVO>> orderNotHandle(@RequestParam String longitude, @RequestParam String latitude) {




        LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();


        if (null == loginWorker) {


            return R.loginExpire("登录已失效！");