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
d0efef32
Commit
d0efef32
authored
Mar 18, 2024
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
装备器材列表及统计
parent
5b620747
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
59 additions
and
5 deletions
+59
-5
EquipTypeAmountPageDTO.java
...equipmanage/common/entity/dto/EquipTypeAmountPageDTO.java
+2
-1
EmergencyController.java
...m/yeejoin/equipmanage/controller/EmergencyController.java
+11
-0
EmergencyMapper.java
.../java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
+3
-1
IEmergencyService.java
...va/com/yeejoin/equipmanage/service/IEmergencyService.java
+2
-0
EmergencyServiceImpl.java
...eejoin/equipmanage/service/impl/EmergencyServiceImpl.java
+14
-3
EmergencyMapper.xml
...ystem-equip/src/main/resources/mapper/EmergencyMapper.xml
+27
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/EquipTypeAmountPageDTO.java
View file @
d0efef32
...
@@ -66,7 +66,6 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
...
@@ -66,7 +66,6 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
@ApiModelProperty
(
value
=
"缺陷管理新增页面用,其余地方可忽略 1-是缺陷管理 0-不是"
)
@ApiModelProperty
(
value
=
"缺陷管理新增页面用,其余地方可忽略 1-是缺陷管理 0-不是"
)
private
Integer
isDefect
;
private
Integer
isDefect
;
@ApiModelProperty
(
value
=
"关键字-地图用"
)
@ApiModelProperty
(
value
=
"关键字-地图用"
)
private
String
keyword
;
private
String
keyword
;
...
@@ -85,4 +84,6 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
...
@@ -85,4 +84,6 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
@ApiModelProperty
(
value
=
"概览装备分类"
)
@ApiModelProperty
(
value
=
"概览装备分类"
)
private
String
equipCodeKey
;
private
String
equipCodeKey
;
@ApiModelProperty
(
value
=
"设备3.0--查询器材装备列表,1-统计六类设备"
)
private
String
sixEquipType
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
View file @
d0efef32
...
@@ -799,4 +799,15 @@ public class EmergencyController extends AbstractBaseController {
...
@@ -799,4 +799,15 @@ public class EmergencyController extends AbstractBaseController {
return
iEmergencyService
.
getEquipStatistic
(
bizOrgCode
,
equipCodeKey
);
return
iEmergencyService
.
getEquipStatistic
(
bizOrgCode
,
equipCodeKey
);
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@GetMapping
(
value
=
"/equip/all/statistic"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询监测部件列表"
,
notes
=
"查询监测部件列表"
)
public
List
<
Map
<
String
,
Object
>>
getAllTypeEquipStatistic
(
@RequestParam
(
required
=
false
)
String
bizOrgCode
)
{
if
(
StringUtils
.
isEmpty
(
bizOrgCode
))
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
bizOrgCode
=
!
ValidationUtil
.
isEmpty
(
reginParams
.
getPersonIdentity
())
&&
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isNotEmpty
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
())
?
reginParams
.
getPersonIdentity
().
getBizOrgCode
()
:
null
;
}
return
iEmergencyService
.
getAllTypeEquipStatistic
(
bizOrgCode
);
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
View file @
d0efef32
...
@@ -109,7 +109,9 @@ public interface EmergencyMapper extends BaseMapper{
...
@@ -109,7 +109,9 @@ public interface EmergencyMapper extends BaseMapper{
*/
*/
Page
<
Map
<
String
,
Object
>>
alarmList
(
@Param
(
"page"
)
Page
<
Map
<
String
,
Object
>>
page
,
@Param
(
"bizOrgCode"
)
String
bizOrgCode
,
@Param
(
"systemCode"
)
String
systemCode
,
@Param
(
"types"
)
List
<
String
>
types
,
@Param
(
"emergencyLevels"
)
List
<
String
>
emergencyLevels
,
@Param
(
"name"
)
String
name
,
@Param
(
"cleanStatus"
)
Integer
cleanStatus
,
@Param
(
"handleStatus"
)
Integer
handleStatus
);
Page
<
Map
<
String
,
Object
>>
alarmList
(
@Param
(
"page"
)
Page
<
Map
<
String
,
Object
>>
page
,
@Param
(
"bizOrgCode"
)
String
bizOrgCode
,
@Param
(
"systemCode"
)
String
systemCode
,
@Param
(
"types"
)
List
<
String
>
types
,
@Param
(
"emergencyLevels"
)
List
<
String
>
emergencyLevels
,
@Param
(
"name"
)
String
name
,
@Param
(
"cleanStatus"
)
Integer
cleanStatus
,
@Param
(
"handleStatus"
)
Integer
handleStatus
);
IPage
<
EquipTypeImgAmountVO
>
getEmergencyEquipList
(
@Param
(
"page"
)
IPage
page
,
@Param
(
"equipTypeAmountPage"
)
EquipTypeAmountPageDTO
equipTypeAmountPage
);
IPage
<
EquipTypeImgAmountVO
>
getEmergencyEquipList
(
@Param
(
"page"
)
IPage
page
,
@Param
(
"equipTypeAmountPage"
)
EquipTypeAmountPageDTO
equipTypeAmountPage
,
@Param
(
"list"
)
List
<
String
>
list
);
List
<
Map
<
String
,
Object
>>
getEquipStatistic
(
@Param
(
"bizOrgCode"
)
String
bizOrgCode
,
@Param
(
"equipCodeKey"
)
String
equipCodeKey
);
List
<
Map
<
String
,
Object
>>
getEquipStatistic
(
@Param
(
"bizOrgCode"
)
String
bizOrgCode
,
@Param
(
"equipCodeKey"
)
String
equipCodeKey
);
List
<
Map
<
String
,
Object
>>
getAllTypeEquipStatistic
(
@Param
(
"bizOrgCode"
)
String
bizOrgCode
,
@Param
(
"list"
)
List
<
String
>
list
);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java
View file @
d0efef32
...
@@ -85,4 +85,6 @@ public interface IEmergencyService {
...
@@ -85,4 +85,6 @@ public interface IEmergencyService {
IPage
<
EquipTypeImgAmountVO
>
getEmergencyEquipList
(
EquipTypeAmountPageDTO
equipTypeAmountPage
);
IPage
<
EquipTypeImgAmountVO
>
getEmergencyEquipList
(
EquipTypeAmountPageDTO
equipTypeAmountPage
);
List
<
Map
<
String
,
Object
>>
getEquipStatistic
(
String
bizOrgCode
,
String
equipCodeKey
);
List
<
Map
<
String
,
Object
>>
getEquipStatistic
(
String
bizOrgCode
,
String
equipCodeKey
);
List
<
Map
<
String
,
Object
>>
getAllTypeEquipStatistic
(
String
bizOrgCode
);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @
d0efef32
...
@@ -386,9 +386,14 @@ public class EmergencyServiceImpl implements IEmergencyService {
...
@@ -386,9 +386,14 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
@Override
public
IPage
<
EquipTypeImgAmountVO
>
getEmergencyEquipList
(
EquipTypeAmountPageDTO
equipTypeAmountPage
)
{
public
IPage
<
EquipTypeImgAmountVO
>
getEmergencyEquipList
(
EquipTypeAmountPageDTO
equipTypeAmountPage
)
{
String
equipCodeLike
=
EmergencyEquipTypeEnum
.
getCodeByKey
(
equipTypeAmountPage
.
getEquipCodeKey
());
List
<
String
>
list
=
new
ArrayList
<>();
equipTypeAmountPage
.
setEquipCodeKey
(
equipCodeLike
);
if
(
StringUtil
.
isNotEmpty
(
equipTypeAmountPage
.
getSixEquipType
()))
{
return
emergencyMapper
.
getEmergencyEquipList
(
equipTypeAmountPage
.
getPage
(),
equipTypeAmountPage
);
list
=
EmergencyEquipTypeEnum
.
getCodeList
();
}
else
{
String
equipCodeLike
=
EmergencyEquipTypeEnum
.
getCodeByKey
(
equipTypeAmountPage
.
getEquipCodeKey
());
equipTypeAmountPage
.
setEquipCodeKey
(
equipCodeLike
);
}
return
emergencyMapper
.
getEmergencyEquipList
(
equipTypeAmountPage
.
getPage
(),
equipTypeAmountPage
,
list
);
}
}
@Override
@Override
...
@@ -684,4 +689,10 @@ public class EmergencyServiceImpl implements IEmergencyService {
...
@@ -684,4 +689,10 @@ public class EmergencyServiceImpl implements IEmergencyService {
String
equipCodeLike
=
EmergencyEquipTypeEnum
.
getCodeByKey
(
equipCodeKey
);
String
equipCodeLike
=
EmergencyEquipTypeEnum
.
getCodeByKey
(
equipCodeKey
);
return
emergencyMapper
.
getEquipStatistic
(
bizOrgCode
,
equipCodeLike
);
return
emergencyMapper
.
getEquipStatistic
(
bizOrgCode
,
equipCodeLike
);
}
}
@Override
public
List
<
Map
<
String
,
Object
>>
getAllTypeEquipStatistic
(
String
bizOrgCode
)
{
List
<
String
>
list
=
EmergencyEquipTypeEnum
.
getCodeList
();
return
emergencyMapper
.
getAllTypeEquipStatistic
(
bizOrgCode
,
list
);
}
}
}
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @
d0efef32
...
@@ -1542,6 +1542,11 @@
...
@@ -1542,6 +1542,11 @@
wl_equipment_specific wes
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
<where>
<where>
<if
test=
"list != null and list.size > 0"
>
<foreach
collection=
"list"
item=
"item"
index=
"index"
open=
"("
close=
")"
separator=
"OR"
>
wes.equipment_code LIKE CONCAT(#{item}, '%')
</foreach>
</if>
<if
test=
"equipTypeAmountPage.equipCodeKey!=null and equipTypeAmountPage.equipCodeKey!=''"
>
<if
test=
"equipTypeAmountPage.equipCodeKey!=null and equipTypeAmountPage.equipCodeKey!=''"
>
wes.equipment_code LIKE CONCAT(#{equipTypeAmountPage.equipCodeKey}, '%')
wes.equipment_code LIKE CONCAT(#{equipTypeAmountPage.equipCodeKey}, '%')
</if>
</if>
...
@@ -1577,4 +1582,26 @@
...
@@ -1577,4 +1582,26 @@
</if>
</if>
GROUP BY wes.equipment_code
GROUP BY wes.equipment_code
</select>
</select>
<select
id=
"getAllTypeEquipStatistic"
resultType=
"java.util.Map"
>
SELECT
wes.id,
count(wes.equipment_code) AS count,
SUBSTRING(wed.code, 1, 4) AS code,
c.name AS `name`
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
WHERE
<if
test=
"list != null and list.size > 0"
>
<foreach
collection=
"list"
item=
"item"
index=
"index"
open=
"("
close=
")"
separator=
"OR"
>
wes.equipment_code LIKE CONCAT(#{item}, '%')
</foreach>
</if>
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%')
</if>
AND wed.equipment_name is not null
GROUP BY `code`
</select>
</mapper>
</mapper>
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