Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周健威
rs-cloud-platform
Commits
17d7e285
Commit
17d7e285
authored
Dec 24, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
e51022f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
1 deletion
+34
-1
DatacenterFeign.java
.../upyuns/platform/rs/datacenter/fegin/DatacenterFeign.java
+8
-1
ImagePageFeginDTO.java
...upyuns/platform/rs/datacenter/pojo/ImagePageFeginDTO.java
+9
-0
RscpImageDataTotalController.java
...form/rs/datacenter/rest/RscpImageDataTotalController.java
+17
-0
No files found.
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/fegin/DatacenterFeign.java
View file @
17d7e285
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
);
}
}
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/ImagePageFeginDTO.java
0 → 100644
View file @
17d7e285
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
;
}
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java
View file @
17d7e285
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment