Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
54236876
Commit
54236876
authored
Mar 29, 2022
by
xxxxxwwwww
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
0941f2bc
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
15 deletions
+19
-15
src/main/java/com/pms/ocp/controller/AppRegisterController.java
...in/java/com/pms/ocp/controller/AppRegisterController.java
+4
-0
src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java
src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java
+3
-3
src/main/java/com/pms/ocp/model/dto/ImgDTO.java
src/main/java/com/pms/ocp/model/dto/ImgDTO.java
+3
-3
src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java
src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java
+3
-3
src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java
src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java
+3
-3
src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java
src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java
+1
-1
src/main/resources/mapper/AppRegisterMapper.xml
src/main/resources/mapper/AppRegisterMapper.xml
+2
-2
No files found.
src/main/java/com/pms/ocp/controller/AppRegisterController.java
View file @
54236876
package
com.pms.ocp.controller
;
package
com.pms.ocp.controller
;
import
com.pms.ocp.common.aspectj.WebLog
;
import
com.pms.ocp.common.config.CreateGroups
;
import
com.pms.ocp.common.config.CreateGroups
;
import
com.pms.ocp.common.utils.StringBusinessUtil
;
import
com.pms.ocp.common.utils.StringBusinessUtil
;
import
com.pms.ocp.model.dto.AppRegisterDTO
;
import
com.pms.ocp.model.dto.AppRegisterDTO
;
...
@@ -31,6 +32,7 @@ public class AppRegisterController {
...
@@ -31,6 +32,7 @@ public class AppRegisterController {
@ApiOperation
(
"新增应用注册"
)
@ApiOperation
(
"新增应用注册"
)
@PostMapping
(
"addApp"
)
@PostMapping
(
"addApp"
)
@WebLog
(
description
=
"新增应用注册"
)
public
ResponseVO
addApp
(
@RequestBody
@Validated
(
CreateGroups
.
class
)
AppRegisterDTO
appRegisterDTO
,
public
ResponseVO
addApp
(
@RequestBody
@Validated
(
CreateGroups
.
class
)
AppRegisterDTO
appRegisterDTO
,
BindingResult
bindingResult
)
{
BindingResult
bindingResult
)
{
if
(
bindingResult
.
hasErrors
())
{
if
(
bindingResult
.
hasErrors
())
{
...
@@ -42,6 +44,7 @@ public class AppRegisterController {
...
@@ -42,6 +44,7 @@ public class AppRegisterController {
@ApiOperation
(
"查询应用目录"
)
@ApiOperation
(
"查询应用目录"
)
@PostMapping
(
"getAppInfo"
)
@PostMapping
(
"getAppInfo"
)
@WebLog
(
description
=
"查询应用目录"
)
public
ResponseVO
getAppInfo
(
@RequestBody
@Validated
QueryAppDTO
queryAppDTO
,
BindingResult
bindingResult
)
{
public
ResponseVO
getAppInfo
(
@RequestBody
@Validated
QueryAppDTO
queryAppDTO
,
BindingResult
bindingResult
)
{
if
(
bindingResult
.
hasErrors
())
{
if
(
bindingResult
.
hasErrors
())
{
return
StringBusinessUtil
.
verifyDispose
(
bindingResult
);
return
StringBusinessUtil
.
verifyDispose
(
bindingResult
);
...
@@ -52,6 +55,7 @@ public class AppRegisterController {
...
@@ -52,6 +55,7 @@ public class AppRegisterController {
@ApiOperation
(
"应用预览图"
)
@ApiOperation
(
"应用预览图"
)
@PostMapping
(
"addAppImgUrl"
)
@PostMapping
(
"addAppImgUrl"
)
@WebLog
(
description
=
"应用预览图"
)
public
ResponseVO
addAppImgUrl
(
@RequestBody
@Validated
(
CreateGroups
.
class
)
List
<
ImgDTO
>
imgDTO
,
public
ResponseVO
addAppImgUrl
(
@RequestBody
@Validated
(
CreateGroups
.
class
)
List
<
ImgDTO
>
imgDTO
,
BindingResult
bindingResult
)
{
BindingResult
bindingResult
)
{
if
(
bindingResult
.
hasErrors
())
{
if
(
bindingResult
.
hasErrors
())
{
...
...
src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java
View file @
54236876
...
@@ -28,7 +28,7 @@ public class AppRegisterDTO {
...
@@ -28,7 +28,7 @@ public class AppRegisterDTO {
@ApiModelProperty
(
"应用图标"
)
@ApiModelProperty
(
"应用图标"
)
@NotBlank
(
message
=
"应用图标不能为空"
,
groups
=
CreateGroups
.
class
)
@NotBlank
(
message
=
"应用图标不能为空"
,
groups
=
CreateGroups
.
class
)
private
String
imgUrl
;
private
byte
[]
imgUrl
;
@ApiModelProperty
(
"应用名称"
)
@ApiModelProperty
(
"应用名称"
)
@NotBlank
(
message
=
"应用名称不能为空"
,
groups
=
CreateGroups
.
class
)
@NotBlank
(
message
=
"应用名称不能为空"
,
groups
=
CreateGroups
.
class
)
...
@@ -165,11 +165,11 @@ public class AppRegisterDTO {
...
@@ -165,11 +165,11 @@ public class AppRegisterDTO {
this
.
time
=
time
;
this
.
time
=
time
;
}
}
public
String
getImgUrl
()
{
public
byte
[]
getImgUrl
()
{
return
imgUrl
;
return
imgUrl
;
}
}
public
void
setImgUrl
(
String
imgUrl
)
{
public
void
setImgUrl
(
byte
[]
imgUrl
)
{
this
.
imgUrl
=
imgUrl
;
this
.
imgUrl
=
imgUrl
;
}
}
...
...
src/main/java/com/pms/ocp/model/dto/ImgDTO.java
View file @
54236876
...
@@ -20,7 +20,7 @@ public class ImgDTO {
...
@@ -20,7 +20,7 @@ public class ImgDTO {
@ApiModelProperty
(
value
=
"应用预览url"
)
@ApiModelProperty
(
value
=
"应用预览url"
)
@NotBlank
(
message
=
"应用预览url不能为空"
,
groups
=
CreateGroups
.
class
)
@NotBlank
(
message
=
"应用预览url不能为空"
,
groups
=
CreateGroups
.
class
)
private
String
img
;
private
byte
[]
img
;
public
String
getTenantCode
()
{
public
String
getTenantCode
()
{
return
tenantCode
;
return
tenantCode
;
...
@@ -30,11 +30,11 @@ public class ImgDTO {
...
@@ -30,11 +30,11 @@ public class ImgDTO {
this
.
tenantCode
=
tenantCode
;
this
.
tenantCode
=
tenantCode
;
}
}
public
String
getImg
()
{
public
byte
[]
getImg
()
{
return
img
;
return
img
;
}
}
public
void
setImg
(
String
img
)
{
public
void
setImg
(
byte
[]
img
)
{
this
.
img
=
img
;
this
.
img
=
img
;
}
}
}
}
...
...
src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java
View file @
54236876
...
@@ -40,7 +40,7 @@ public class OcpTenantIocn implements Serializable {
...
@@ -40,7 +40,7 @@ public class OcpTenantIocn implements Serializable {
* 应用调用的服务数量图标数据
* 应用调用的服务数量图标数据
*/
*/
@ApiModelProperty
(
value
=
"应用调用的服务数量图标数据"
)
@ApiModelProperty
(
value
=
"应用调用的服务数量图标数据"
)
private
String
iocn
;
private
byte
[]
iocn
;
@ApiModelProperty
(
value
=
"图片类型"
)
@ApiModelProperty
(
value
=
"图片类型"
)
private
Object
iocnKind
;
private
Object
iocnKind
;
...
@@ -77,11 +77,11 @@ public class OcpTenantIocn implements Serializable {
...
@@ -77,11 +77,11 @@ public class OcpTenantIocn implements Serializable {
this
.
codeNo
=
codeNo
;
this
.
codeNo
=
codeNo
;
}
}
public
String
getIocn
()
{
public
byte
[]
getIocn
()
{
return
iocn
;
return
iocn
;
}
}
public
void
setIocn
(
String
iocn
)
{
public
void
setIocn
(
byte
[]
iocn
)
{
this
.
iocn
=
iocn
;
this
.
iocn
=
iocn
;
}
}
...
...
src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java
View file @
54236876
...
@@ -48,7 +48,7 @@ public class ApiProvinceVo implements Serializable {
...
@@ -48,7 +48,7 @@ public class ApiProvinceVo implements Serializable {
@Excel
(
name
=
"服务厂商"
)
@Excel
(
name
=
"服务厂商"
)
private
String
apiUnit
;
private
String
apiUnit
;
@ApiModelProperty
(
value
=
"服务图标"
)
@ApiModelProperty
(
value
=
"服务图标"
)
private
String
apiPic
;
private
byte
[]
apiPic
;
@ApiModelProperty
(
value
=
"服务返回体"
)
@ApiModelProperty
(
value
=
"服务返回体"
)
private
String
apiResp
;
private
String
apiResp
;
@ApiModelProperty
(
value
=
"服务请求体"
)
@ApiModelProperty
(
value
=
"服务请求体"
)
...
@@ -137,11 +137,11 @@ public class ApiProvinceVo implements Serializable {
...
@@ -137,11 +137,11 @@ public class ApiProvinceVo implements Serializable {
this
.
apiUnit
=
apiUnit
;
this
.
apiUnit
=
apiUnit
;
}
}
public
String
getApiPic
()
{
public
byte
[]
getApiPic
()
{
return
apiPic
;
return
apiPic
;
}
}
public
void
setApiPic
(
String
apiPic
)
{
public
void
setApiPic
(
byte
[]
apiPic
)
{
this
.
apiPic
=
apiPic
;
this
.
apiPic
=
apiPic
;
}
}
...
...
src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java
View file @
54236876
...
@@ -14,7 +14,7 @@ import lombok.Data;
...
@@ -14,7 +14,7 @@ import lombok.Data;
public
class
QueryAppInfoVO
{
public
class
QueryAppInfoVO
{
@ApiModelProperty
(
"应用图标"
)
@ApiModelProperty
(
"应用图标"
)
private
Object
icon
;
private
byte
[]
icon
;
@ApiModelProperty
(
"应用名称"
)
@ApiModelProperty
(
"应用名称"
)
private
String
appName
;
private
String
appName
;
...
...
src/main/resources/mapper/AppRegisterMapper.xml
View file @
54236876
...
@@ -16,10 +16,10 @@
...
@@ -16,10 +16,10 @@
INNER JOIN ocp_tenant_group g ON g.tenant_group_code = base.tenant_group_code
INNER JOIN ocp_tenant_group g ON g.tenant_group_code = base.tenant_group_code
WHERE icon.iocn_type = 'tenant' and icon.iocn_kind is null
WHERE icon.iocn_type = 'tenant' and icon.iocn_kind is null
<if
test=
"dto.kind != null and dto.kind != ''"
>
<if
test=
"dto.kind != null and dto.kind != ''"
>
base.professional_kind like CONCAT('%', #{dto.kind}, '%')
and base.professional_kind like '${dto.kind}'
</if>
</if>
<if
test=
"dto.type != null and dto.type != ''"
>
<if
test=
"dto.type != null and dto.type != ''"
>
and g.tenant_group_name like
CONCAT('%', #{dto.type}, '%')
and g.tenant_group_name like
'${dto.type}'
</if>
</if>
</select>
</select>
...
...
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