Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
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
项目统一框架
amos-boot-biz
Commits
bd135c67
Commit
bd135c67
authored
Mar 15, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生成管辖分局树
parent
35ccf1eb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
62 additions
and
2 deletions
+62
-2
IEquipmentCategoryService.java
...oot/module/tzs/api/service/IEquipmentCategoryService.java
+3
-0
EquipmentCategoryController.java
...odule/tzs/biz/controller/EquipmentCategoryController.java
+13
-1
PrivilegeFeign.java
...eejoin/amos/boot/module/tzs/biz/fegin/PrivilegeFeign.java
+15
-0
EquipmentCategoryServiceImpl.java
...le/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
+30
-0
JsonUtils.java
...com/yeejoin/amos/boot/module/tzs/biz/utils/JsonUtils.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IEquipmentCategoryService.java
View file @
bd135c67
...
...
@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.service;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -19,4 +20,6 @@ public interface IEquipmentCategoryService {
Page
equipClaimOverview
();
int
createSupervisorCode
(
Map
<
String
,
Object
>
map
);
List
<
LinkedHashMap
>
creatTree
();
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java
View file @
bd135c67
...
...
@@ -13,7 +13,6 @@ import com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService;
import
com.yeejoin.amos.boot.module.tzs.biz.service.impl.EquipmentCategoryServiceImpl
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
liquibase.pro.packaged.S
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
...
...
@@ -189,4 +188,17 @@ public class EquipmentCategoryController extends BaseController {
public
ResponseModel
<
Object
>
createSupervisorCode
(
@RequestBody
Map
<
String
,
Object
>
map
)
{
return
ResponseHelper
.
buildResponse
(
equipmentCategoryService
.
createSupervisorCode
(
map
));
}
/**
* 生成管辖分局树
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/creatTree"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"生成管辖分局树"
,
notes
=
"生成管辖分局树"
)
public
ResponseModel
<
Object
>
creatTree
()
{
return
ResponseHelper
.
buildResponse
(
equipmentCategoryService
.
creatTree
());
}
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/fegin/PrivilegeFeign.java
0 → 100644
View file @
bd135c67
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
biz
.
fegin
;
import
com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
@FeignClient
(
name
=
"${privilege.fegin.name}"
,
configuration
=
{
FeignConfiguration
.
class
})
public
interface
PrivilegeFeign
{
//获取单位树
@RequestMapping
(
value
=
"/privilege/v1/company/tree"
,
method
=
RequestMethod
.
GET
)
FeignClientResult
tree
();
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @
bd135c67
...
...
@@ -10,7 +10,9 @@ import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentClassifityEnum;
import
com.yeejoin.amos.boot.module.tzs.api.mapper.CategoryOtherInfoMapper
;
import
com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper
;
import
com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService
;
import
com.yeejoin.amos.boot.module.tzs.biz.fegin.PrivilegeFeign
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.JsonUtils
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.core.io.Resource
;
...
...
@@ -40,6 +42,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
private
Resource
equipStatus
;
@Autowired
PrivilegeFeign
privilegeFeign
;
@Autowired
CategoryOtherInfoMapper
categoryOtherInfoMapper
;
/**
...
...
@@ -144,6 +149,31 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return
categoryOtherInfoMapper
.
updateSupervisorCode
(
codeMap
.
get
(
"supervisorCode"
),
codeMap
.
get
(
"elevatorCode"
),
otherInfo
.
getSequenceNbr
());
}
@Override
public
List
<
LinkedHashMap
>
creatTree
()
{
FeignClientResult
tree
=
privilegeFeign
.
tree
();
List
<
LinkedHashMap
>
result
=
(
List
<
LinkedHashMap
>)
tree
.
getResult
();
List
<
LinkedHashMap
>
treeData
=
deleteTreeData
(
result
);
List
<
LinkedHashMap
>
resultTree
=
new
ArrayList
<>();
resultTree
.
add
(
treeData
.
get
(
5
));
return
resultTree
;
}
private
List
<
LinkedHashMap
>
deleteTreeData
(
List
<
LinkedHashMap
>
result
)
{
Iterator
it
=
result
.
iterator
();
while
(
it
.
hasNext
())
{
LinkedHashMap
e
=
(
LinkedHashMap
)
it
.
next
();
//删除使用单位
if
(
"company"
.
equals
(
e
.
get
(
"level"
)))
{
it
.
remove
();
}
if
(!
ObjectUtils
.
isEmpty
(
e
.
get
(
"children"
)))
{
deleteTreeData
((
List
<
LinkedHashMap
>)
e
.
get
(
"children"
));
}
}
return
result
;
}
/**
* 具体生成监管码和电梯96333识别码逻辑
*/
...
...
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/JsonUtils.java
View file @
bd135c67
...
...
@@ -18,6 +18,6 @@ public class JsonUtils {
}
catch
(
IOException
e
)
{
throw
new
RuntimeException
(
resource
+
"json文件转化失败"
);
}
return
(
Map
)
JSONObject
.
parseObject
(
json
,
Map
.
class
);
return
JSONObject
.
parseObject
(
json
,
Map
.
class
);
}
}
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