Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
a9c7512c
提交
a9c7512c
authored
12月 06, 2022
作者:
zjm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(单位模块): 添加了单位逻辑注释
添加了单位逻辑注释
上级
0cb1a683
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
42 行增加
和
2 行删除
+42
-2
UnitsCache.java
.../main/java/com/tykj/dev/device/user/cache/UnitsCache.java
+5
-0
AreaExhibitionService.java
...ev/device/user/subject/service/AreaExhibitionService.java
+5
-0
UnitsService.java
...om/tykj/dev/device/user/subject/service/UnitsService.java
+6
-1
AreaExhibitionServiceImpl.java
.../user/subject/service/impl/AreaExhibitionServiceImpl.java
+18
-0
UnitsServiceImpl.java
...ev/device/user/subject/service/impl/UnitsServiceImpl.java
+8
-1
没有找到文件。
dev-user/src/main/java/com/tykj/dev/device/user/cache/UnitsCache.java
浏览文件 @
a9c7512c
...
@@ -112,4 +112,9 @@ public class UnitsCache {
...
@@ -112,4 +112,9 @@ public class UnitsCache {
return
new
ArrayList
<>(
idMap
.
values
()).
stream
().
noneMatch
(
units
->
units
.
getName
().
equals
(
name
));
return
new
ArrayList
<>(
idMap
.
values
()).
stream
().
noneMatch
(
units
->
units
.
getName
().
equals
(
name
));
}
}
public
List
<
Units
>
queryAreaExhibitionIdList
(
List
<
Integer
>
areaExhibitionIdList
)
{
return
new
ArrayList
<>(
idMap
.
values
()).
stream
().
filter
(
unit
->
areaExhibitionIdList
.
contains
(
unit
.
getExhibitionId
())).
collect
(
Collectors
.
toList
());
}
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/AreaExhibitionService.java
浏览文件 @
a9c7512c
...
@@ -16,6 +16,11 @@ public interface AreaExhibitionService extends PublicService<AreaExhibition>{
...
@@ -16,6 +16,11 @@ public interface AreaExhibitionService extends PublicService<AreaExhibition>{
*/
*/
AreaExhibition
findById
(
Integer
areaExhibitionId
);
AreaExhibition
findById
(
Integer
areaExhibitionId
);
/**
* 根据区域id查询对应下级区域以及自己
*/
List
<
AreaExhibition
>
queryLowerLevel
(
Integer
areaExhibitionId
);
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UnitsService.java
浏览文件 @
a9c7512c
...
@@ -215,5 +215,10 @@ public interface UnitsService extends PublicService<Units> {
...
@@ -215,5 +215,10 @@ public interface UnitsService extends PublicService<Units> {
*/
*/
Units
updateUnit
(
Units
units
);
Units
updateUnit
(
Units
units
);
/**
* 根据区域id查询对应所有单位id集合
* @param areaExhibitionId
* @return
*/
List
<
Integer
>
queryAreaExhibitionIdUnitIds
(
Integer
areaExhibitionId
);
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/AreaExhibitionServiceImpl.java
浏览文件 @
a9c7512c
package
com
.
tykj
.
dev
.
device
.
user
.
subject
.
service
.
impl
;
package
com
.
tykj
.
dev
.
device
.
user
.
subject
.
service
.
impl
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.tykj.dev.device.user.cache.AreaExhibitionCache
;
import
com.tykj.dev.device.user.cache.AreaExhibitionCache
;
import
com.tykj.dev.device.user.subject.dao.AreaExhibitionDao
;
import
com.tykj.dev.device.user.subject.dao.AreaExhibitionDao
;
import
com.tykj.dev.device.user.subject.entity.Area
;
import
com.tykj.dev.device.user.subject.entity.Area
;
import
com.tykj.dev.device.user.subject.entity.AreaExhibition
;
import
com.tykj.dev.device.user.subject.entity.AreaExhibition
;
import
com.tykj.dev.device.user.subject.entity.Units
;
import
com.tykj.dev.device.user.subject.entity.Units
;
import
com.tykj.dev.device.user.subject.service.AreaExhibitionService
;
import
com.tykj.dev.device.user.subject.service.AreaExhibitionService
;
import
com.tykj.dev.misc.base.BaseEntity
;
import
com.tykj.dev.misc.exception.ApiException
;
import
com.tykj.dev.misc.exception.ApiException
;
import
com.tykj.dev.misc.utils.JacksonUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.Optional
;
...
@@ -55,6 +61,18 @@ public class AreaExhibitionServiceImpl implements AreaExhibitionService {
...
@@ -55,6 +61,18 @@ public class AreaExhibitionServiceImpl implements AreaExhibitionService {
}
}
}
}
@Override
public
List
<
AreaExhibition
>
queryLowerLevel
(
Integer
areaExhibitionId
)
{
List
<
AreaExhibition
>
areaExhibitionList
=
new
ArrayList
<>();
AreaExhibition
byId
=
findById
(
areaExhibitionId
);
areaExhibitionList
.
add
(
byId
);
if
(
byId
.
getFatherId
()==
null
){
List
<
AreaExhibition
>
byFatherId
=
areaExhibitionCache
.
findByFatherId
(
byId
.
getId
());
areaExhibitionList
.
addAll
(
byFatherId
);
}
return
areaExhibitionList
;
}
@Override
@Override
public
AreaExhibition
save
(
AreaExhibition
areaExhibition
)
{
public
AreaExhibition
save
(
AreaExhibition
areaExhibition
)
{
...
...
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java
浏览文件 @
a9c7512c
...
@@ -369,7 +369,6 @@ public class UnitsServiceImpl implements UnitsService {
...
@@ -369,7 +369,6 @@ public class UnitsServiceImpl implements UnitsService {
return
leftNavigation
;
return
leftNavigation
;
}
}
@Override
@Override
public
LeftNavigation
findLeftNavigation2
(
SecurityUser
securityUser
)
{
public
LeftNavigation
findLeftNavigation2
(
SecurityUser
securityUser
)
{
//直属信息
//直属信息
...
@@ -591,6 +590,14 @@ public class UnitsServiceImpl implements UnitsService {
...
@@ -591,6 +590,14 @@ public class UnitsServiceImpl implements UnitsService {
return
units
;
return
units
;
}
}
@Override
public
List
<
Integer
>
queryAreaExhibitionIdUnitIds
(
Integer
areaExhibitionId
)
{
List
<
AreaExhibition
>
areaExhibitionList
=
areaExhibitionService
.
queryLowerLevel
(
areaExhibitionId
);
List
<
Integer
>
collect
=
areaExhibitionList
.
stream
().
map
(
AreaExhibition:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
unitIds
=
unitsCache
.
queryAreaExhibitionIdList
(
collect
).
stream
().
map
(
Units:
:
getUnitId
).
collect
(
Collectors
.
toList
());
return
unitIds
;
}
private
void
sortingUnit
(
Integer
originalOrder
,
Integer
newOrder
){
private
void
sortingUnit
(
Integer
originalOrder
,
Integer
newOrder
){
List
<
Units
>
unitsList
;
List
<
Units
>
unitsList
;
if
(
originalOrder
>
newOrder
){
if
(
originalOrder
>
newOrder
){
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论