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
d67ba612
Commit
d67ba612
authored
Dec 27, 2021
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.增加数量统计
parent
eae491cb
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
162 additions
and
4 deletions
+162
-4
RedisUtils.java
...va/com/yeejoin/amos/boot/biz/common/utils/RedisUtils.java
+4
-0
SourceTypeEnum.java
.../com/yeejoin/equipmanage/common/enums/SourceTypeEnum.java
+26
-0
AreaController.java
...va/com/yeejoin/equipmanage/controller/AreaController.java
+4
-4
CarMapper.java
...c/main/java/com/yeejoin/equipmanage/mapper/CarMapper.java
+2
-0
EquipmentSpecificMapper.java
...m/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java
+6
-0
ICarService.java
...ain/java/com/yeejoin/equipmanage/service/ICarService.java
+5
-0
IEquipmentSpecificSerivce.java
...eejoin/equipmanage/service/IEquipmentSpecificSerivce.java
+5
-0
ISourceStatistics.java
...va/com/yeejoin/equipmanage/service/ISourceStatistics.java
+16
-0
CarServiceImpl.java
.../com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
+0
-0
EquipmentSpecificSerivceImpl.java
...quipmanage/service/impl/EquipmentSpecificSerivceImpl.java
+0
-0
SourcesStatisticsImpl.java
...ejoin/equipmanage/service/impl/SourcesStatisticsImpl.java
+63
-0
CarMapper.xml
...boot-system-equip/src/main/resources/mapper/CarMapper.xml
+15
-0
EquipmentSpecificMapper.xml
...uip/src/main/resources/mapper/EquipmentSpecificMapper.xml
+16
-0
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisUtils.java
View file @
d67ba612
...
...
@@ -456,6 +456,10 @@ public class RedisUtils {
}
return
null
;
}
public
Set
<
String
>
getPatternKeys
(
String
pattern
)
{
return
redisTemplate
.
keys
(
pattern
);
}
/**
* 获取指定前缀key列表
*
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/SourceTypeEnum.java
0 → 100644
View file @
d67ba612
package
com
.
yeejoin
.
equipmanage
.
common
.
enums
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Setter
;
/**
* @author DELL
*/
@AllArgsConstructor
@Getter
public
enum
SourceTypeEnum
{
/**
* 资源类型枚举
*/
EQUIPMENT
(
"装备"
,
"equipment"
,
"equipmentSpecificSerivceImpl"
,
"refreshStaData"
),
CAR
(
"车辆"
,
"car"
,
"carServiceImpl"
,
"refreshStaData"
);
private
String
name
;
private
String
code
;
private
String
beanName
;
private
String
methodName
;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/AreaController.java
View file @
d67ba612
...
...
@@ -2,11 +2,9 @@ package com.yeejoin.equipmanage.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto
;
import
com.yeejoin.equipmanage.common.dto.AreaDto
;
import
com.yeejoin.equipmanage.common.entity.Area
;
import
com.yeejoin.equipmanage.common.utils.StringUtil
;
import
com.yeejoin.equipmanage.common.vo.AreaResquest
;
import
com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo
;
import
com.yeejoin.equipmanage.service.IAreaService
;
...
...
@@ -47,23 +45,25 @@ public class AreaController extends AbstractBaseController {
/**
* 获取公司部门区域树
*
* @return list
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据登陆人获取单位区域树"
,
notes
=
"根据登陆人获取单位区域树"
)
@GetMapping
(
value
=
"/tree"
)
public
List
<
UnitAreaTreeVo
>
getSystemTree
()
{
public
List
<
UnitAreaTreeVo
>
getSystemTree
()
{
return
iAreaService
.
getAreaTreeListVo
();
}
/**
* 获取公司部门树
*
* @return list
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据登陆人获取公司树"
,
notes
=
"根据登陆人获取公司树"
)
@GetMapping
(
value
=
"/companyTreeByUserAndType"
)
public
List
<
OrgMenuDto
>
companyTreeByUserAndType
()
{
public
List
<
OrgMenuDto
>
companyTreeByUserAndType
()
{
return
iAreaService
.
companyDeptTree
();
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/CarMapper.java
View file @
d67ba612
...
...
@@ -71,4 +71,6 @@ public interface CarMapper extends BaseMapper<Car> {
int
equipmentCarListcount
(
Long
teamId
,
String
name
,
String
code
,
Long
id
,
Boolean
isNo
);
List
<
CarFusionDto
>
selectCarAndCarProperty
();
List
<
Map
<
String
,
Object
>>
queryCompanyCarStaData
();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java
View file @
d67ba612
...
...
@@ -200,4 +200,10 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
* @return 指标详情
*/
List
<
Map
<
String
,
String
>>
getBoxTropicsIndexDetails
();
/**
* 统计数据
* @return
*/
List
<
Map
<
String
,
Object
>>
queryCompanyStaData
();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ICarService.java
View file @
d67ba612
...
...
@@ -173,4 +173,9 @@ public interface ICarService extends IService<Car> {
* @return
*/
List
<
CarFusionDto
>
getCarFusionList
();
/**
* 更新redis 统计数据
*/
void
refreshStaData
();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java
View file @
d67ba612
...
...
@@ -194,4 +194,9 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
* @return
*/
Map
<
String
,
List
<
Map
<
String
,
String
>>>
getFessIndexDetails
();
/**
* 更新redis 统计数据
*/
void
refreshStaData
();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISourceStatistics.java
0 → 100644
View file @
d67ba612
package
com
.
yeejoin
.
equipmanage
.
service
;
import
com.yeejoin.equipmanage.common.enums.SourceTypeEnum
;
public
interface
ISourceStatistics
{
/**
* 装备、车辆按照单位及分类统计
*
* @param bizOrgCode 单位部门code
* @param sourceType 资源类型
* @param categoryCode 资源分类code
* @return int 数量
*/
int
equipCategoryStatistics
(
String
bizOrgCode
,
SourceTypeEnum
sourceType
,
String
categoryCode
);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @
d67ba612
This diff is collapsed.
Click to expand it.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @
d67ba612
This diff is collapsed.
Click to expand it.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SourcesStatisticsImpl.java
0 → 100644
View file @
d67ba612
package
com
.
yeejoin
.
equipmanage
.
service
.
impl
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.equipmanage.common.enums.SourceTypeEnum
;
import
com.yeejoin.equipmanage.service.ICarService
;
import
com.yeejoin.equipmanage.service.IEquipmentDetailService
;
import
com.yeejoin.equipmanage.service.ISourceStatistics
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.core.foundation.context.SpringContextHelper
;
import
java.lang.reflect.Method
;
import
java.util.Set
;
/**
* @author DELL
*/
@Service
public
class
SourcesStatisticsImpl
implements
ISourceStatistics
{
@Autowired
private
RedisUtils
redisUtil
;
@Override
public
int
equipCategoryStatistics
(
String
bizOrgCode
,
SourceTypeEnum
sourceType
,
String
categoryCode
)
{
// 计算处通用code,用来上下级匹配如12001010000->1200101
String
treeCode
=
subStringZero
(
categoryCode
);
Set
<
String
>
keys
=
redisUtil
.
getKeys
(
buildKey
(
bizOrgCode
,
sourceType
.
getCode
(),
treeCode
));
if
(
keys
.
size
()
>
0
)
{
//求和
return
this
.
sumNumber
(
keys
);
}
else
{
//按照类型插入缓存
Object
bean
=
SpringContextHelper
.
getBean
(
sourceType
.
getBeanName
());
Method
[]
methods
=
bean
.
getClass
().
getDeclaredMethods
();
for
(
Method
method
:
methods
)
{
if
(
method
.
getName
().
equals
(
sourceType
.
getMethodName
()))
{
try
{
method
.
invoke
(
bean
);
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
"更新redis数据失败"
+
e
.
getMessage
());
}
}
}
return
this
.
sumNumber
(
keys
);
}
}
private
int
sumNumber
(
Set
<
String
>
keys
)
{
return
keys
.
stream
().
filter
(
k
->
redisUtil
.
get
(
k
)
!=
null
).
mapToInt
(
k
->
Integer
.
parseInt
(
redisUtil
.
get
(
k
).
toString
())).
sum
();
}
private
String
subStringZero
(
String
categoryCode
)
{
String
reverse
=
new
StringBuffer
(
categoryCode
).
reverse
().
toString
();
int
noZero
=
Integer
.
parseInt
(
reverse
);
return
new
StringBuffer
(
String
.
valueOf
(
noZero
)).
reverse
().
toString
();
}
private
String
buildKey
(
String
bizOrgCode
,
String
sourceType
,
String
treeCode
)
{
return
bizOrgCode
+
"*_"
+
sourceType
+
"_"
+
treeCode
+
"*"
;
}
}
amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml
View file @
d67ba612
...
...
@@ -604,4 +604,19 @@
from wl_car wc LEFT JOIN wl_car_property wcp on wc.id = wcp.car_id
where wcp.equipment_index_key in ('FAS_Car_Video', 'FAS_Car_GIS');
</select>
<select
id=
"queryCompanyCarStaData"
resultType=
"java.util.Map"
>
SELECT
s.biz_org_code as bizOrgCode,
c.code as categoryCode,
count(1) as total
FROM
`wl_car` s,
wl_equipment e,
wl_equipment_category c
where
s.equipment_id = e.`id`
and e.category_id = c.id
and s.biz_org_code
<![CDATA[<>]]>
''
GROUP BY s.biz_org_code ,c.code
</select>
</mapper>
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @
d67ba612
...
...
@@ -1441,4 +1441,19 @@
WHERE
s.equipment_code = '92251100TZE44'
</select>
<select
id=
"queryCompanyStaData"
resultType=
"java.util.Map"
>
SELECT
s.biz_org_code as bizOrgCode,
c.code as categoryCode,
count(1) as total
FROM
`wl_equipment_specific` s,
wl_equipment e,
wl_equipment_category c
where
s.equipment_code = e.`code`
and e.category_id = c.id
and s.biz_org_code
<![CDATA[<>]]>
''
GROUP BY s.biz_org_code ,c.code
</select>
</mapper>
\ No newline at end of file
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