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
1de45ba6
Commit
1de45ba6
authored
Jan 08, 2024
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加社会力量相关逻辑
parent
1260a048
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
356 additions
and
0 deletions
+356
-0
SocialPowerImportParam.java
...eejoin/equipmanage/common/dto/SocialPowerImportParam.java
+44
-0
SocialPower.java
...va/com/yeejoin/equipmanage/common/entity/SocialPower.java
+87
-0
FileItem.java
...n/java/com/yeejoin/equipmanage/common/utils/FileItem.java
+21
-0
EmergencyController.java
...m/yeejoin/equipmanage/controller/EmergencyController.java
+7
-0
SocialPowerController.java
...yeejoin/equipmanage/controller/SocialPowerController.java
+0
-0
EmergencyMapper.java
.../java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
+2
-0
SocialPowerMapper.java
...ava/com/yeejoin/equipmanage/mapper/SocialPowerMapper.java
+23
-0
IEmergencyService.java
...va/com/yeejoin/equipmanage/service/IEmergencyService.java
+2
-0
ISocialPowerService.java
.../com/yeejoin/equipmanage/service/ISocialPowerService.java
+23
-0
EmergencyServiceImpl.java
...eejoin/equipmanage/service/impl/EmergencyServiceImpl.java
+5
-0
SocialPowerServiceImpl.java
...join/equipmanage/service/impl/SocialPowerServiceImpl.java
+33
-0
wl-3.6.0.xml
...ot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
+27
-0
EmergencyMapper.xml
...ystem-equip/src/main/resources/mapper/EmergencyMapper.xml
+48
-0
SocialPowerMapper.xml
...tem-equip/src/main/resources/mapper/SocialPowerMapper.xml
+34
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/SocialPowerImportParam.java
0 → 100644
View file @
1de45ba6
package
com
.
yeejoin
.
equipmanage
.
common
.
dto
;
import
cn.afterturn.easypoi.excel.annotation.Excel
;
import
cn.afterturn.easypoi.excel.annotation.ExcelIgnore
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @author keyong
* @title: SocialPowerImportParam
* <pre>
* @description: TODO
* </pre>
* @date 2024/01/04 15:27
*/
@Data
public
class
SocialPowerImportParam
{
@ExcelIgnore
private
Date
createDate
;
@Excel
(
name
=
"单位名称"
,
orderNum
=
"0"
)
private
String
companyName
;
@Excel
(
name
=
"所在地"
,
orderNum
=
"1"
)
private
String
location
;
@Excel
(
name
=
"联系人"
,
orderNum
=
"2"
)
private
String
contactUser
;
@Excel
(
name
=
"联系电话"
,
orderNum
=
"3"
)
private
String
contactPhone
;
@Excel
(
name
=
"到站距离"
,
orderNum
=
"4"
)
private
String
arrivalDistance
;
@Excel
(
name
=
"到站时间"
,
orderNum
=
"5"
)
private
String
arrivalTime
;
@Excel
(
name
=
"备注信息"
,
orderNum
=
"6"
)
private
String
remark
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/SocialPower.java
0 → 100644
View file @
1de45ba6
package
com
.
yeejoin
.
equipmanage
.
common
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.equipmanage.common.entity.publics.BaseEntity
;
import
com.yeejoin.equipmanage.common.utils.FileItem
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.util.List
;
/**
* 社会力量表
*
* @author system_generator
* @date 2024-01-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"wl_social_power"
)
public
class
SocialPower
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableField
(
"id"
)
private
Long
id
;
/**
* 单位名称
*/
@TableField
(
"company_name"
)
private
String
companyName
;
/**
* 所在地
*/
@TableField
(
"location"
)
private
String
location
;
/**
* 联系人
*/
@TableField
(
"contact_user"
)
private
String
contactUser
;
/**
* 联系电话
*/
@TableField
(
"contact_phone"
)
private
String
contactPhone
;
/**
* 到站距离
*/
@TableField
(
"arrival_distance"
)
private
String
arrivalDistance
;
/**
* 到站时间
*/
@TableField
(
"arrival_time"
)
private
String
arrivalTime
;
/**
* 备注信息
*/
@TableField
(
"remark"
)
private
String
remark
;
@TableField
(
"biz_org_name"
)
private
String
bizOrgName
;
@TableField
(
"biz_org_code"
)
private
String
bizOrgCode
;
/**
* 路线图
*/
@TableField
(
exist
=
false
)
private
List
<
FileItem
>
attachFiles
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/FileItem.java
0 → 100644
View file @
1de45ba6
package
com
.
yeejoin
.
equipmanage
.
common
.
utils
;
import
lombok.Data
;
/**
* @author keyong
* @title: FileItem
* <pre>
* @description: TODO
* </pre>
* @date 2024/1/5 17:33
*/
@Data
public
class
FileItem
{
private
String
uid
;
private
String
name
;
private
String
status
;
private
String
reponse
;
private
String
url
;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
View file @
1de45ba6
...
@@ -704,4 +704,11 @@ public class EmergencyController extends AbstractBaseController {
...
@@ -704,4 +704,11 @@ public class EmergencyController extends AbstractBaseController {
return
CommonResponseUtil
.
success
(
iEmergencyService
.
alarmList
(
page
,
bizOrgCode
,
types
,
emergencyLevels
,
name
,
cleanStatus
,
handleStatus
));
return
CommonResponseUtil
.
success
(
iEmergencyService
.
alarmList
(
page
,
bizOrgCode
,
types
,
emergencyLevels
,
name
,
cleanStatus
,
handleStatus
));
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@ApiOperation
(
"应急物资及红绿码信息"
)
@GetMapping
(
value
=
"/materials"
)
public
Map
<
String
,
Object
>
getEmergencyMaterials
()
{
return
iEmergencyService
.
emergencyMaterials
();
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SocialPowerController.java
0 → 100644
View file @
1de45ba6
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/mapper/EmergencyMapper.java
View file @
1de45ba6
...
@@ -20,6 +20,8 @@ public interface EmergencyMapper extends BaseMapper{
...
@@ -20,6 +20,8 @@ public interface EmergencyMapper extends BaseMapper{
*/
*/
Map
<
String
,
Object
>
selectEmergencyMaterials
();
Map
<
String
,
Object
>
selectEmergencyMaterials
();
Map
<
String
,
Object
>
getEmergencyMaterials
();
/**
/**
* 应急物资详情
* 应急物资详情
* @param bizOrgCode
* @param bizOrgCode
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/SocialPowerMapper.java
0 → 100644
View file @
1de45ba6
package
com
.
yeejoin
.
equipmanage
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.equipmanage.common.entity.SocialPower
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
* 社会力量表 Mapper 接口
*
* @author system_generator
* @date 2022-02-18
*/
public
interface
SocialPowerMapper
extends
BaseMapper
<
SocialPower
>
{
Page
<
SocialPower
>
listPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"dto"
)
SocialPower
dto
);
List
<
Map
<
String
,
Object
>>
getSocialPowerList
();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java
View file @
1de45ba6
...
@@ -26,6 +26,8 @@ public interface IEmergencyService {
...
@@ -26,6 +26,8 @@ public interface IEmergencyService {
Map
<
String
,
Object
>
emergencyMaterials
();
Map
<
String
,
Object
>
emergencyMaterials
();
Map
<
String
,
Object
>
getEmergencyMaterials
();
Page
<
Map
<
String
,
Object
>>
emergencyMaterialsDetails
(
Page
<
Map
<
String
,
Object
>>
page
,
String
bizOrgCode
);
Page
<
Map
<
String
,
Object
>>
emergencyMaterialsDetails
(
Page
<
Map
<
String
,
Object
>>
page
,
String
bizOrgCode
);
Page
<
Map
<
String
,
Object
>>
selectFireMonitor
(
Page
<
Map
<
String
,
Object
>>
page
,
String
bizOrgCode
,
String
code
);
Page
<
Map
<
String
,
Object
>>
selectFireMonitor
(
Page
<
Map
<
String
,
Object
>>
page
,
String
bizOrgCode
,
String
code
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISocialPowerService.java
0 → 100644
View file @
1de45ba6
package
com
.
yeejoin
.
equipmanage
.
service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yeejoin.equipmanage.common.entity.SocialPower
;
import
java.util.List
;
import
java.util.Map
;
/**
* 社会力量表
*
* @author system_generator
* @date 2022-02-18
*/
public
interface
ISocialPowerService
extends
IService
<
SocialPower
>
{
Page
<
SocialPower
>
listPage
(
Page
page
,
SocialPower
socialPower
);
List
<
Map
<
String
,
Object
>>
getSocialPowerList
();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @
1de45ba6
...
@@ -657,4 +657,9 @@ public class EmergencyServiceImpl implements IEmergencyService {
...
@@ -657,4 +657,9 @@ public class EmergencyServiceImpl implements IEmergencyService {
}
}
return
dataMap
;
return
dataMap
;
}
}
@Override
public
Map
<
String
,
Object
>
getEmergencyMaterials
()
{
return
emergencyMapper
.
getEmergencyMaterials
();
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SocialPowerServiceImpl.java
0 → 100644
View file @
1de45ba6
package
com
.
yeejoin
.
equipmanage
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yeejoin.equipmanage.common.entity.SocialPower
;
import
com.yeejoin.equipmanage.mapper.SocialPowerMapper
;
import
com.yeejoin.equipmanage.service.ISocialPowerService
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
/**
* 社会力量表服务实现类
*
* @author system_generator
* @date 2022-02-18
*/
@Service
public
class
SocialPowerServiceImpl
extends
ServiceImpl
<
SocialPowerMapper
,
SocialPower
>
implements
ISocialPowerService
{
@Override
public
Page
<
SocialPower
>
listPage
(
Page
page
,
SocialPower
socialPower
)
{
Page
<
SocialPower
>
pages
=
this
.
baseMapper
.
listPage
(
page
,
socialPower
);
return
pages
;
}
@Override
public
List
<
Map
<
String
,
Object
>>
getSocialPowerList
()
{
return
this
.
baseMapper
.
getSocialPowerList
();
}
}
\ No newline at end of file
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @
1de45ba6
...
@@ -1039,4 +1039,30 @@
...
@@ -1039,4 +1039,30 @@
) ENGINE=InnoDB AUTO_INCREMENT=20220218 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='故障案例表';
) ENGINE=InnoDB AUTO_INCREMENT=20220218 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='故障案例表';
</sql>
</sql>
</changeSet>
</changeSet>
<changeSet
author=
"keyong"
id=
"1698392228"
>
<preConditions
onFail=
"MARK_RAN"
>
<not>
<tableExists
tableName=
"wl_social_power"
/>
</not>
</preConditions>
<comment>
create table wl_social_power 社会力量表
</comment>
<sql>
CREATE TABLE `wl_social_power` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`company_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '单位名称',
`location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '所在地',
`contact_user` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '联系人',
`contact_phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '联系电话',
`arrival_distance` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '到站距离',
`arrival_time` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '到站时间',
`remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注信息',
`create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
`biz_org_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构编码',
`biz_org_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构/部门名称',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=20240103 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='社会力量表';
</sql>
</changeSet>
</databaseChangeLog>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @
1de45ba6
...
@@ -1364,4 +1364,52 @@
...
@@ -1364,4 +1364,52 @@
wlesal.create_date DESC
wlesal.create_date DESC
</select>
</select>
<select
id=
"getEmergencyMaterials"
resultType=
"java.util.Map"
>
SELECT
*
FROM (
(SELECT
COUNT(1) AS fireExtinguisher,
COUNT( CASE WHEN wes.equip_status = '1' THEN 1 END ) AS fireExtinguisherYellowCount,
COUNT( CASE WHEN wes.equip_status = '2' THEN 1 END ) AS fireExtinguisherRedCount
FROM
wl_equipment_specific wes
WHERE wes.equipment_code LIKE CONCAT('3104', '%')) AS fireExtinguisherStates,
(SELECT
COUNT(1) AS fireHydrant,
COUNT( CASE WHEN wes.equip_status = '1' THEN 1 END ) AS fireHydrantYellowCount,
COUNT( CASE WHEN wes.equip_status = '2' THEN 1 END ) AS fireHydrantRedCount
FROM
wl_equipment_specific wes
WHERE wes.equipment_code LIKE CONCAT('3105', '%')) AS fireHydrantStates,
(SELECT
COUNT(1) AS fireShovel,
COUNT( CASE WHEN wes.equip_status = '1' THEN 1 END ) AS fireShovelYellowCount,
COUNT( CASE WHEN wes.equip_status = '2' THEN 1 END ) AS fireShovelRedCount
FROM
wl_equipment_specific wes
WHERE wes.equipment_code LIKE CONCAT('3910', '%')) AS fireShovelStates,
(SELECT
COUNT(1) AS fireAxe,
COUNT( CASE WHEN wes.equip_status = '1' THEN 1 END ) AS fireAxeYellowCount,
COUNT( CASE WHEN wes.equip_status = '2' THEN 1 END ) AS fireAxeRedCount
FROM
wl_equipment_specific wes
WHERE wes.equipment_code LIKE CONCAT('3904', '%')) AS fireAxeStates,
(SELECT
COUNT(1) AS fireBucket,
COUNT( CASE WHEN wes.equip_status = '1' THEN 1 END ) AS fireBucketYellowCount,
COUNT( CASE WHEN wes.equip_status = '2' THEN 1 END ) AS fireBucketRedCount
FROM
wl_equipment_specific wes
WHERE wes.equipment_code LIKE CONCAT('3911', '%')) AS fireBucketStates,
(SELECT
COUNT(1) AS respirator,
COUNT( CASE WHEN wes.equip_status = '1' THEN 1 END ) AS respiratorYellowCount,
COUNT( CASE WHEN wes.equip_status = '2' THEN 1 END ) AS respiratorRedCount
FROM
wl_equipment_specific wes
WHERE wes.equipment_code LIKE CONCAT('1106', '%')) AS respiratorStates
)
</select>
</mapper>
</mapper>
amos-boot-system-equip/src/main/resources/mapper/SocialPowerMapper.xml
0 → 100644
View file @
1de45ba6
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.equipmanage.mapper.SocialPowerMapper"
>
<select
id=
"listPage"
resultType=
"com.yeejoin.equipmanage.common.entity.SocialPower"
>
SELECT
wsp.*
FROM
wl_social_power wsp
<where>
<if
test=
"dto.bizOrgCode != null and dto.bizOrgCode != ''"
>
wsp.biz_org_code LIKE CONCAT(#{dto.bizOrgCode},'%')
</if>
<if
test=
"dto.companyName != null and dto.companyName != ''"
>
AND wsp.company_name like CONCAT('%', #{dto.companyName},'%')
</if>
<if
test=
"dto.contactUser != null and dto.contactUser != ''"
>
AND wsp.contact_user like CONCAT('%', #{dto.contactUser},'%')
</if>
<if
test=
"dto.remark != null and dto.remark != ''"
>
AND wsp.remark like CONCAT('%', #{dto.remark},'%')
</if>
</where>
ORDER BY
wsp.create_date DESC
</select>
<select
id=
"getSocialPowerList"
resultType=
"Map"
>
SELECT
count(1) AS `value`
FROM
wl_social_power wsp
</select>
</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