Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_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
赵啸非
smart_gov_platform
Commits
851049d8
Commit
851049d8
authored
Nov 29, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改app克隆
parent
f6df6365
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
3 deletions
+27
-3
base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java
.../main/java/com/mortals/xhx/module/app/model/vo/AppVo.java
+11
-0
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
...m/mortals/xhx/module/app/service/impl/AppServiceImpl.java
+13
-0
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
...c/test/java/com/mortals/httpclient/app/AppController.http
+1
-1
base-manager/src/test/java/com/mortals/httpclient/app/AppInfoTempleteFieldController.http
...ortals/httpclient/app/AppInfoTempleteFieldController.http
+2
-2
No files found.
base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java
View file @
851049d8
package
com.mortals.xhx.module.app.model.vo
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.app.model.AppEntity
;
import
com.mortals.xhx.module.site.model.SiteEntity
;
import
lombok.Data
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
@@ -9,6 +12,14 @@ import java.util.List;
* @author zxfei
* @date 2022-11-28
*/
@Data
public
class
AppVo
extends
BaseEntityLong
{
/**
* 适用站点范围数量
*/
private
Integer
applianceSiteScope
;
private
List
<
Long
>
siteIdList
;
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @
851049d8
...
...
@@ -9,6 +9,7 @@ import com.google.common.collect.Maps;
import
cn.hutool.core.io.FileUtil
;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.xhx.base.system.upload.service.UploadService
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.key.Constant
;
...
...
@@ -59,6 +60,18 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
private
AppVersionService
appVersionService
;
@Override
protected
void
findAfter
(
AppEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
AppEntity
>
list
)
throws
AppException
{
//统计站点
list
.
forEach
(
item
->{
List
<
AppEntity
>
appEntityList
=
this
.
find
(
new
AppQuery
().
appCode
(
item
.
getAppCode
()),
context
);
// int count = this.count(new AppQuery().appCode(item.getAppCode()), context);
item
.
setApplianceSiteScope
(
appEntityList
.
size
());
item
.
setSiteIdList
(
appEntityList
.
stream
().
map
(
AppEntity:
:
getSiteId
).
collect
(
Collectors
.
toList
()));
});
super
.
findAfter
(
params
,
pageInfo
,
context
,
list
);
}
@Override
public
Rest
<
String
>
appDistribute
(
AppEntity
appEntity
,
Context
context
)
{
SiteEntity
siteCache
=
siteService
.
getCache
(
appEntity
.
getSiteId
().
toString
());
...
...
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @
851049d8
...
...
@@ -63,7 +63,7 @@ Accept: application/json
###自助终端应用删除
GET {{baseUrl}}/app/delete?id=
{{App_id}}
GET {{baseUrl}}/app/delete?id=
3
Authorization: {{authToken}}
Accept: application/json
...
...
base-manager/src/test/java/com/mortals/httpclient/app/AppInfoTempleteFieldController.http
View file @
851049d8
...
...
@@ -32,8 +32,8 @@ Content-Type: application/json
{
"appId":1,
"fieldCode":"title
2
",
"fieldName":"标题
2
",
"fieldCode":"title
1
",
"fieldName":"标题
1
",
"fieldType":"input",
"dataType":"number",
"fieldValue":"zo0",
...
...
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