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
9218645d
Commit
9218645d
authored
Dec 23, 2021
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增 消防装备单位部门树
parent
fa119eaa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
9 deletions
+25
-9
FireStationController.java
...t/module/common/biz/controller/FireStationController.java
+3
-1
EquipmentDetailController.java
...oin/equipmanage/controller/EquipmentDetailController.java
+22
-8
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireStationController.java
View file @
9218645d
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.utils.MenuFrom
;
import
com.yeejoin.amos.boot.biz.common.utils.MenuFrom
;
import
com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify
;
import
com.yeejoin.amos.boot.module.common.api.dto.FireStationDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.FireStationDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl
;
...
@@ -172,8 +173,9 @@ public class FireStationController extends BaseController {
...
@@ -172,8 +173,9 @@ public class FireStationController extends BaseController {
* @param
* @param
* @return
* @return
*/
*/
@PersonIdentify
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@
Pu
tMapping
(
value
=
"/companyTreeByUserAndType"
)
@
Ge
tMapping
(
value
=
"/companyTreeByUserAndType"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"微型消防站单位部门树"
,
notes
=
"微型消防站单位部门树"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"微型消防站单位部门树"
,
notes
=
"微型消防站单位部门树"
)
public
ResponseModel
<
List
<
OrgMenuDto
>>
companyTreeByUserAndType
(
@RequestParam
(
required
=
false
)
String
type
)
{
public
ResponseModel
<
List
<
OrgMenuDto
>>
companyTreeByUserAndType
(
@RequestParam
(
required
=
false
)
String
type
)
{
// 获取登陆人角色
// 获取登陆人角色
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @
9218645d
...
@@ -10,20 +10,17 @@ import java.util.Map;
...
@@ -10,20 +10,17 @@ import java.util.Map;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
...
@@ -84,6 +81,8 @@ public class EquipmentDetailController extends AbstractBaseController {
...
@@ -84,6 +81,8 @@ public class EquipmentDetailController extends AbstractBaseController {
IStockService
iStockService
;
IStockService
iStockService
;
@Autowired
@Autowired
private
ManufacturerInfoMapper
manufacturerInfoMapper
;
private
ManufacturerInfoMapper
manufacturerInfoMapper
;
@Autowired
OrgUsrServiceImpl
iOrgUsrService
;
@Autowired
@Autowired
private
IEquipmentSpecificIndexSerivce
equipmentSpecificIndexSerivce
;
private
IEquipmentSpecificIndexSerivce
equipmentSpecificIndexSerivce
;
...
@@ -591,5 +590,20 @@ public class EquipmentDetailController extends AbstractBaseController {
...
@@ -591,5 +590,20 @@ public class EquipmentDetailController extends AbstractBaseController {
//
//
// return ;
// return ;
// }
// }
/**
* 消防装备单位部门树
*
* @param
* @return
*/
@PersonIdentify
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/companyTreeByUserAndType"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"消防装备单位部门树"
,
notes
=
"消防装备单位部门树"
)
public
ResponseModel
<
List
<
OrgMenuDto
>>
companyTreeByUserAndType
(
@RequestParam
(
required
=
false
)
String
type
)
{
// 获取登陆人角色
ReginParams
reginParams
=
getSelectedOrgInfo
();
return
ResponseHelper
.
buildResponse
(
iOrgUsrService
.
companyTreeByUserAndType
(
reginParams
,
type
));
}
}
}
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