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
6d167314
Commit
6d167314
authored
Jun 26, 2025
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(api): 新增综合统计分析API筛选设备种类接口添加
parent
bf9f9ceb
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
150 additions
and
2 deletions
+150
-2
CommonController.java
.../amos/boot/module/jg/biz/controller/CommonController.java
+1
-1
TzsCustomFilterMapper.java
...t/module/statistics/api/mapper/TzsCustomFilterMapper.java
+8
-1
TzsCustomFilterMapper.xml
...s-api/src/main/resources/mapper/TzsCustomFilterMapper.xml
+8
-0
ComprehensiveStatisticalAnalysisController.java
...ontroller/ComprehensiveStatisticalAnalysisController.java
+46
-0
ComprehensiveStatisticalAnalysisServiceImpl.java
...ice/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
+41
-0
equipCategory.json
...statistics-biz/src/main/resources/json/equipCategory.json
+44
-0
EquipmentClassifityEnum.java
...os/boot/module/ymt/api/enums/EquipmentClassifityEnum.java
+2
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @
6d167314
...
@@ -675,7 +675,7 @@ public class CommonController extends BaseController {
...
@@ -675,7 +675,7 @@ public class CommonController extends BaseController {
public
ResponseModel
<
Object
>
permissionTreeV2
(
@RequestParam
String
menuAgent
,
public
ResponseModel
<
Object
>
permissionTreeV2
(
@RequestParam
String
menuAgent
,
@RequestParam
String
permissionType
,
@RequestParam
String
permissionType
,
@RequestParam
(
required
=
false
)
String
path
,
@RequestParam
(
required
=
false
)
String
path
,
@Request
Body
JSONArray
params
)
{
@Request
Param
JSONArray
params
)
{
return
ResponseHelper
.
buildResponse
(
commonService
.
getPermissionTreeWithCompanyV2
(
menuAgent
,
permissionType
,
path
,
getSelectedOrgInfo
().
getCompany
(),
params
));
return
ResponseHelper
.
buildResponse
(
commonService
.
getPermissionTreeWithCompanyV2
(
menuAgent
,
permissionType
,
path
,
getSelectedOrgInfo
().
getCompany
(),
params
));
}
}
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/TzsCustomFilterMapper.java
View file @
6d167314
package
com
.
yeejoin
.
amos
.
boot
.
module
.
statistics
.
api
.
mapper
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
statistics
.
api
.
mapper
;
import
com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilter
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilter
;
import
org.apache.ibatis.annotations.MapKey
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 自定义筛选字段基础数据表 Mapper 接口
* 自定义筛选字段基础数据表 Mapper 接口
...
@@ -11,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -11,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
*/
public
interface
TzsCustomFilterMapper
extends
BaseMapper
<
TzsCustomFilter
>
{
public
interface
TzsCustomFilterMapper
extends
BaseMapper
<
TzsCustomFilter
>
{
@MapKey
(
"key"
)
List
<
Map
<
String
,
Object
>>
selectEquipmentCategoryByParentId
(
@Param
(
"parentId"
)
String
parentId
);
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/TzsCustomFilterMapper.xml
View file @
6d167314
...
@@ -2,4 +2,12 @@
...
@@ -2,4 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper"
>
<mapper
namespace=
"com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper"
>
<select
id=
"selectEquipmentCategoryByParentId"
resultType=
"java.util.Map"
>
select
id as key,
code as value,
name as label
from tz_equipment_category
where parent_id = #{parentId}
</select>
</mapper>
</mapper>
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java
0 → 100644
View file @
6d167314
package
com
.
yeejoin
.
amos
.
boot
.
module
.
statistcs
.
biz
.
controller
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ComprehensiveStatisticalAnalysisServiceImpl
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
java.util.List
;
import
java.util.Map
;
/**
* 综合统计分析API
*
* @author system_generator
* @date 2025-06-24
*/
@RestController
@Api
(
tags
=
"综合统计分析API"
)
@RequestMapping
(
value
=
"/comprehensiveStatisticalAnalysis"
)
public
class
ComprehensiveStatisticalAnalysisController
extends
BaseController
{
@Autowired
private
ComprehensiveStatisticalAnalysisServiceImpl
comprehensiveStatisticalAnalysisServiceImpl
;
/**
* @param key 筛选key
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/select/equipmentCategory"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询设备分类"
,
notes
=
"查询设备分类"
)
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
queryEquipmentCategory
(
@RequestParam
(
value
=
"key"
,
required
=
false
)
String
key
)
{
return
ResponseHelper
.
buildResponse
(
comprehensiveStatisticalAnalysisServiceImpl
.
queryEquipmentCategory
(
key
));
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
0 → 100644
View file @
6d167314
package
com
.
yeejoin
.
amos
.
boot
.
module
.
statistcs
.
biz
.
service
.
impl
;
import
com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils
;
import
com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.core.io.Resource
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
/**
* 综合统计分析服务实现类
*
* @author system_generator
* @date 2025-06-24
*/
@Service
public
class
ComprehensiveStatisticalAnalysisServiceImpl
{
@Value
(
"classpath:/json/equipCategory.json"
)
private
Resource
equipCategory
;
@Autowired
private
TzsCustomFilterMapper
tzsCustomFilterMapper
;
public
List
<
Map
<
String
,
Object
>>
queryEquipmentCategory
(
String
key
)
{
List
<
Map
<
String
,
Object
>>
list
;
Map
<
String
,
List
<
Map
<
String
,
Object
>>>
resourceJson
=
JsonUtils
.
getResourceJson
(
equipCategory
);
if
(
key
==
null
)
{
list
=
resourceJson
.
get
(
EquipmentClassifityEnum
.
ZHTJFX
.
getCode
());
}
else
{
list
=
tzsCustomFilterMapper
.
selectEquipmentCategoryByParentId
(
key
);
}
return
list
;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equipCategory.json
View file @
6d167314
...
@@ -390,5 +390,48 @@
...
@@ -390,5 +390,48 @@
"sum"
:
"0"
,
"sum"
:
"0"
,
"type"
:
"elevator"
"type"
:
"elevator"
}
}
],
"__statistical__"
:
"综合统计分析筛选项使用"
,
"statistical"
:
[
{
"key"
:
"26"
,
"label"
:
"电梯"
,
"value"
:
"3000"
},
{
"key"
:
"41"
,
"label"
:
"起重机械"
,
"value"
:
"4000"
},
{
"key"
:
"1"
,
"label"
:
"锅炉"
,
"value"
:
"1000"
},
{
"key"
:
"7"
,
"label"
:
"压力容器"
,
"value"
:
"2000"
},
{
"key"
:
"133"
,
"label"
:
"压力管道"
,
"value"
:
"8000"
},
{
"key"
:
"80"
,
"label"
:
"大型游乐设施"
,
"value"
:
"6000"
},
{
"key"
:
"144"
,
"label"
:
"客运索道"
,
"value"
:
"9000"
},
{
"key"
:
"76"
,
"label"
:
"场(厂)内专用机动车辆"
,
"value"
:
"5000"
}
]
]
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/EquipmentClassifityEnum.java
View file @
6d167314
...
@@ -24,6 +24,8 @@ public enum EquipmentClassifityEnum {
...
@@ -24,6 +24,8 @@ public enum EquipmentClassifityEnum {
KYSD
(
"客运索道"
,
"9000"
),
KYSD
(
"客运索道"
,
"9000"
),
//树类型
//树类型
ZHTJFX
(
"综合统计分析"
,
"statistical"
),
//设备认领状态
//设备认领状态
SBRLZT
(
"设备认领状态"
,
"rlzt"
),
SBRLZT
(
"设备认领状态"
,
"rlzt"
),
BDLS
(
"八大类树"
,
"eightCategory"
),
BDLS
(
"八大类树"
,
"eightCategory"
),
...
...
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