Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
base-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
赵啸非
base-platform
Commits
7944315e
Commit
7944315e
authored
Mar 25, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加站点事项部门名称
parent
34dc3c04
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
11 deletions
+43
-11
base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
.../com/mortals/xhx/module/matter/service/MatterService.java
+2
-1
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
...als/xhx/module/matter/service/impl/MatterServiceImpl.java
+9
-8
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteMatterVo.java
...va/com/mortals/xhx/module/site/model/vo/SiteMatterVo.java
+5
-0
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
...s/xhx/module/site/service/impl/SiteMatterServiceImpl.java
+26
-1
base-manager/src/test/java/com/mortals/httpclient/business/BusinessController.http
...a/com/mortals/httpclient/business/BusinessController.http
+1
-1
No files found.
base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
View file @
7944315e
package
com.mortals.xhx.module.matter.service
;
package
com.mortals.xhx.module.matter.service
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.service.ICRUDCacheService
;
import
com.mortals.framework.service.ICRUDService
;
import
com.mortals.framework.service.ICRUDService
;
import
com.mortals.xhx.module.matter.model.MatterEntity
;
import
com.mortals.xhx.module.matter.model.MatterEntity
;
/**
/**
...
@@ -10,7 +11,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
...
@@ -10,7 +11,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
* @author zxfei
* @author zxfei
* @date 2022-01-12
* @date 2022-01-12
*/
*/
public
interface
MatterService
extends
ICRUD
Service
<
MatterEntity
,
Long
>
{
public
interface
MatterService
extends
ICRUD
CacheService
<
MatterEntity
,
Long
>
{
/**
/**
* 添加业务到站点
* 添加业务到站点
...
...
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @
7944315e
package
com.mortals.xhx.module.matter.service.impl
;
package
com.mortals.xhx.module.matter.service.impl
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl
;
import
com.mortals.xhx.common.utils.BeanUtil
;
import
com.mortals.xhx.common.utils.BeanUtil
;
import
com.mortals.xhx.module.business.model.BusinessQuery
;
import
com.mortals.xhx.module.business.model.BusinessQuery
;
import
com.mortals.xhx.module.matter.model.MatterQuery
;
import
com.mortals.xhx.module.matter.model.MatterQuery
;
...
@@ -26,14 +28,14 @@ import java.util.List;
...
@@ -26,14 +28,14 @@ import java.util.List;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
/**
/**
* MatterService
* MatterService
* 基础事项 service实现
* 基础事项 service实现
*
*
* @author zxfei
* @author zxfei
* @date 2022-01-12
* @date 2022-01-12
*/
*/
@Service
(
"matterService"
)
@Service
(
"matterService"
)
public
class
MatterServiceImpl
extends
AbstractCRUDServiceImpl
<
MatterDao
,
MatterEntity
,
Long
>
implements
MatterService
{
public
class
MatterServiceImpl
extends
AbstractCRUD
Cache
ServiceImpl
<
MatterDao
,
MatterEntity
,
Long
>
implements
MatterService
{
@Autowired
@Autowired
private
SiteMatterService
siteMatterService
;
private
SiteMatterService
siteMatterService
;
@Autowired
@Autowired
...
@@ -69,7 +71,6 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
...
@@ -69,7 +71,6 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
@Override
@Override
protected
void
removeBefore
(
Long
[]
ids
,
Context
context
)
throws
AppException
{
protected
void
removeBefore
(
Long
[]
ids
,
Context
context
)
throws
AppException
{
//有子节点 禁止删除
//有子节点 禁止删除
super
.
removeBefore
(
ids
,
context
);
super
.
removeBefore
(
ids
,
context
);
}
}
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteMatterVo.java
View file @
7944315e
...
@@ -14,4 +14,9 @@ import java.util.List;
...
@@ -14,4 +14,9 @@ import java.util.List;
@Data
@Data
public
class
SiteMatterVo
extends
BaseEntityLong
{
public
class
SiteMatterVo
extends
BaseEntityLong
{
/**
* 所属部门
*/
private
String
belongDept
;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
View file @
7944315e
package
com.mortals.xhx.module.site.service.impl
;
package
com.mortals.xhx.module.site.service.impl
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.xhx.module.matter.model.MatterEntity
;
import
com.mortals.xhx.module.matter.service.MatterService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.xhx.module.site.dao.SiteMatterDao
;
import
com.mortals.xhx.module.site.dao.SiteMatterDao
;
import
com.mortals.xhx.module.site.model.SiteMatterEntity
;
import
com.mortals.xhx.module.site.model.SiteMatterEntity
;
import
com.mortals.xhx.module.site.service.SiteMatterService
;
import
com.mortals.xhx.module.site.service.SiteMatterService
;
import
org.springframework.util.ObjectUtils
;
import
java.util.List
;
/**
/**
* SiteMatterService
* SiteMatterService
* 站点事项 service实现
* 站点事项 service实现
...
@@ -13,5 +23,20 @@ import com.mortals.xhx.module.site.service.SiteMatterService;
...
@@ -13,5 +23,20 @@ import com.mortals.xhx.module.site.service.SiteMatterService;
*/
*/
@Service
(
"siteMatterService"
)
@Service
(
"siteMatterService"
)
public
class
SiteMatterServiceImpl
extends
AbstractCRUDServiceImpl
<
SiteMatterDao
,
SiteMatterEntity
,
Long
>
implements
SiteMatterService
{
public
class
SiteMatterServiceImpl
extends
AbstractCRUDServiceImpl
<
SiteMatterDao
,
SiteMatterEntity
,
Long
>
implements
SiteMatterService
{
@Autowired
private
MatterService
matterService
;
@Override
protected
void
findAfter
(
SiteMatterEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
SiteMatterEntity
>
list
)
throws
AppException
{
list
.
stream
().
peek
(
item
->{
MatterEntity
matterEntity
=
matterService
.
getCache
(
item
.
getMatterId
().
toString
());
if
(
ObjectUtils
.
isEmpty
(
matterEntity
)){
item
.
setBelongDept
(
matterEntity
.
getBelongDept
());
}
}).
count
();
super
.
findAfter
(
params
,
pageInfo
,
context
,
list
);
}
}
}
\ No newline at end of file
base-manager/src/test/java/com/mortals/httpclient/business/BusinessController.http
View file @
7944315e
...
@@ -43,7 +43,7 @@ Accept: application/json
...
@@ -43,7 +43,7 @@ Accept: application/json
###站点业务删除
###站点业务删除
GET {{baseUrl}}/business/delete?id=
{{Business_id}}
GET {{baseUrl}}/business/delete?id=
9&id=10
Accept: application/json
Accept: application/json
...
...
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