Commit 17d7e285 authored by 周健威's avatar 周健威

修改代码

parent e51022f4
package com.upyuns.platform.rs.datacenter.fegin; package com.upyuns.platform.rs.datacenter.fegin;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo; import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal; import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO; import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
import com.upyuns.platform.rs.datacenter.pojo.ImagePageFeginDTO;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import sun.jvm.hotspot.debugger.Page;
import java.util.List; import java.util.List;
...@@ -25,5 +29,8 @@ public interface DatacenterFeign { ...@@ -25,5 +29,8 @@ public interface DatacenterFeign {
public ObjectRestResponse<RscpAreaInfo> queryByCode(@RequestParam("areaCode") String areaCode); public ObjectRestResponse<RscpAreaInfo> queryByCode(@RequestParam("areaCode") String areaCode);
@RequestMapping(value = "/web/imageData/app/unauth/Fegin/queryByIds", method = RequestMethod.GET) @RequestMapping(value = "/web/imageData/app/unauth/Fegin/queryByIds", method = RequestMethod.GET)
public ObjectRestResponse<List<ImageDataVO>> queryByIds(String ids); public ObjectRestResponse<List<ImageDataVO>> queryByIds(@RequestParam("ids") String ids);
@RequestMapping(value = "/web/imageData/app/unauth/Fegin/pageBykey", method = RequestMethod.POST)
public ObjectRestResponse<PageDataVO<ImageDataVO>> pageBykey(@RequestBody ImagePageFeginDTO dto);
} }
package com.upyuns.platform.rs.datacenter.pojo;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
@Data
public class ImagePageFeginDTO extends PageParam {
private String keyword;
}
...@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.util.Query; ...@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.UserAgentUtil; import com.github.wxiaoqi.security.common.util.UserAgentUtil;
import com.github.wxiaoqi.security.common.util.process.ResultCode; import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.util.result.JsonResultUtil; import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageParam; import com.github.wxiaoqi.security.common.vo.PageParam;
import com.upyuns.platform.rs.datacenter.biz.RscpAreaImageTotalBiz; import com.upyuns.platform.rs.datacenter.biz.RscpAreaImageTotalBiz;
import com.upyuns.platform.rs.datacenter.biz.RscpImageDataTotalBiz; import com.upyuns.platform.rs.datacenter.biz.RscpImageDataTotalBiz;
...@@ -22,6 +23,7 @@ import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal; ...@@ -22,6 +23,7 @@ import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice; import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
import com.upyuns.platform.rs.datacenter.mapper.RscpAreaInfoMapper; import com.upyuns.platform.rs.datacenter.mapper.RscpAreaInfoMapper;
import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO; import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
import com.upyuns.platform.rs.datacenter.pojo.ImagePageFeginDTO;
import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO; import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
import com.upyuns.platform.rs.datacenter.vo.ImageInputVO; import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -37,6 +39,7 @@ import java.math.BigDecimal; ...@@ -37,6 +39,7 @@ import java.math.BigDecimal;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@RestController @RestController
...@@ -125,6 +128,20 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo ...@@ -125,6 +128,20 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
return ObjectRestResponse.succ(list3); return ObjectRestResponse.succ(list3);
} }
@RequestMapping(value = "/app/unauth/Fegin/pageBykey", method = RequestMethod.POST)
@IgnoreUserToken
public ObjectRestResponse<PageDataVO<ImageDataVO>> pageBykey(@RequestBody ImagePageFeginDTO dto){
return ObjectRestResponse.succ(
PageDataVO.pageInfo(dto.initQuery(),()-> baseBiz.selectByWeekend(w -> {
if(StrUtil.isNotBlank(dto.getKeyword())) {
w.andLike(RscpImageDataTotal::getName, "%"+ dto.getKeyword()+ "%");
}
w.andEqualTo(RscpImageDataTotal::getIsDel, SYS_FALSE);
return w;
}), ImageDataVO.class)
);
}
@Data @Data
static public class QueryDTO { static public class QueryDTO {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment