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
695466e1
Commit
695466e1
authored
Jul 20, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加指挥 重点单位,执勤实力,跑马灯数据来源
parent
878dfa53
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
260 additions
and
35 deletions
+260
-35
BaseDto.java
...in/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java
+1
-1
SeismometeorologyDto.java
...mos/boot/module/command/api/dto/SeismometeorologyDto.java
+4
-1
CompanyDto.java
...m/yeejoin/amos/boot/module/common/api/dto/CompanyDto.java
+41
-0
RequestData.java
.../yeejoin/amos/boot/module/common/api/dto/RequestData.java
+6
-0
OrgUsrMapper.java
...join/amos/boot/module/common/api/mapper/OrgUsrMapper.java
+16
-1
IOrgUsrService.java
...n/amos/boot/module/common/api/service/IOrgUsrService.java
+25
-9
OrgUsrMapper.xml
...ule-common-api/src/main/resources/mapper/OrgUsrMapper.xml
+52
-0
AlertCalledZhDto.java
...eejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java
+2
-0
AlertStageEnums.java
...ejoin/amos/boot/module/jcs/api/enums/AlertStageEnums.java
+13
-1
AlertCalledMapper.java
...in/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java
+2
-1
IAlertCalledService.java
...amos/boot/module/jcs/api/service/IAlertCalledService.java
+2
-1
AlertCalledMapper.xml
...e-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
+6
-2
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+61
-5
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+26
-11
AlertCalledServiceImpl.java
...t/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
+3
-2
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java
View file @
695466e1
...
...
@@ -23,7 +23,7 @@ public class BaseDto implements Serializable{
@ExcelIgnore
@ApiModelProperty
(
value
=
"主键ID"
)
protected
Long
sequenceNbr
;
protected
Long
sequenceNbr
;
@ExcelIgnore
@ApiModelProperty
(
value
=
"更新时间"
)
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/SeismometeorologyDto.java
View file @
695466e1
...
...
@@ -27,7 +27,7 @@ public class SeismometeorologyDto {
@ApiModelProperty
(
value
=
"主键ID"
)
protected
Long
sequenceNbr
;
@ApiModelProperty
(
value
=
"预警类型"
)
@ApiModelProperty
(
value
=
"预警类型
1:警情通知 0:气象通知
"
)
@Field
(
"type"
)
private
String
type
;
...
...
@@ -61,4 +61,7 @@ public class SeismometeorologyDto {
this
.
releaseCompany
=
releaseCompany
;
this
.
content
=
content
;
}
public
SeismometeorologyDto
()
{
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CompanyDto.java
0 → 100644
View file @
695466e1
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
api
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* @description:
* @author: tw
* @createDate: 2021/7/20
*/
@Data
@ApiModel
(
value
=
"CompanyDto"
,
description
=
"重点单位资源"
)
public
class
CompanyDto
{
@ApiModelProperty
(
value
=
"主键ID"
)
protected
Long
id
;
@ApiModelProperty
(
value
=
"经度"
)
private
Double
longitude
;
@ApiModelProperty
(
value
=
"纬度"
)
private
Double
latitude
;
@ApiModelProperty
(
value
=
"距离"
)
private
Double
distance
;
@ApiModelProperty
(
value
=
"男员工人数"
)
private
Integer
companyMaleEmployees
;
@ApiModelProperty
(
value
=
"女员工人数"
)
private
Integer
companyFemaleEmployees
;
@ApiModelProperty
(
value
=
"单位类型"
)
private
String
managementType
;
@ApiModelProperty
(
value
=
"单位名称"
)
private
String
name
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RequestData.java
View file @
695466e1
...
...
@@ -27,4 +27,10 @@ public class RequestData {
@ApiModelProperty
(
value
=
"队伍类型code"
)
private
String
typeCode
;
@ApiModelProperty
(
value
=
"是否只显示24小时内警情"
)
private
Boolean
whether24
=
false
;
@ApiModelProperty
(
value
=
"灾情地址模糊匹配"
)
private
String
address
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @
695466e1
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
api
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.common.api.dto.
OrgPersonExcelDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.
*
;
import
com.yeejoin.amos.boot.module.common.api.entity.OrgUsr
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -38,4 +38,19 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
* @return
*/
List
<
OrgUsr
>
listOrgUserById
(
Long
orgUserId
);
/**
* * @param null
* @return
* <PRE>
* author tw
* date 2021/7/20
* </PRE>
* 指挥重点单位资源
*/
List
<
CompanyDto
>
listContractDto
(
@Param
(
"pageNum"
)
int
pageNum
,
@Param
(
"pageSize"
)
int
pageSize
,
@Param
(
"par"
)
RequestData
par
);
Integer
listContractDtoCount
(
@Param
(
"par"
)
RequestData
par
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java
View file @
695466e1
...
...
@@ -5,15 +5,7 @@ import java.util.List;
import
java.util.Map
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.FormValue
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.*
;
import
com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance
;
import
com.yeejoin.amos.boot.module.common.api.entity.OrgUsr
;
...
...
@@ -143,4 +135,28 @@ public interface IOrgUsrService {
OrgDepartmentFormDto
selectDepartmentById
(
Long
id
)
throws
Exception
;
List
<
Map
<
String
,
Object
>>
selectForShowByListId
(
List
<
Long
>
ids
)
throws
Exception
;
/**
* * @param null
* @return
* <PRE>
* author tw
* date 2021/7/20
* </PRE>
* 列表
*/
List
<
CompanyDto
>
listContractDto
(
Integer
pageNum
,
Integer
pageSize
,
RequestData
requestData
);
/**
* * @param null
* @return
* <PRE>
* author tw
* date 2021/7/20
* </PRE>
* 统计
*/
Integer
listContractDtoCount
(
RequestData
par
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @
695466e1
...
...
@@ -209,4 +209,56 @@
AND biz_org_code LIKE CONCAT((SELECT biz_org_code FROM cb_org_usr WHERE sequence_nbr = #{orgUserId}),'%');
</if>
</select>
<select
id=
"listContractDto"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.CompanyDto"
>
SELECT
a.id,
a.name,
a.longitude,
a.latitude,
a.companyMaleEmployees,
a.companyFemaleEmployees,
a.managementType,
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
FROM important_companys a
where a.longitude is not null and a.latitude is not null
<if
test=
'par.distance!=null'
>
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
<
=
#{par.distance}
</if>
ORDER BY distance limit #{pageNum},#{pageSize}
</select>
<select
id=
"listContractDtoCount"
resultType=
"Integer"
>
SELECT
COUNT(a.id) num
FROM important_companys a
where a.longitude is not null and a.latitude is not null
<if
test=
'par.distance!=null'
>
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
<
=
#{par.distance}
</if>
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java
View file @
695466e1
...
...
@@ -47,6 +47,8 @@ public class AlertCalledZhDto {
@ApiModelProperty
(
value
=
"地址"
)
private
String
address
;
@ApiModelProperty
(
value
=
"救援方格"
)
private
String
rescueGrid
;
@ApiModelProperty
(
value
=
"经度"
)
private
String
longitude
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AlertStageEnums.java
View file @
695466e1
...
...
@@ -28,7 +28,19 @@ public enum AlertStageEnums {
RG
(
"226"
,
"人工上报"
),
DJ
(
"228"
,
"对讲呼入"
),
JK
(
"388"
,
"监控中心报警"
),
DH
(
"389"
,
"电话报警"
);
DH
(
"389"
,
"电话报警"
),
JYZD
(
"111"
,
"消防救援总队"
),
SZD
(
"112"
,
"省消防救援总队"
),
XFZD
(
"113"
,
"消防救援支队"
),
CSZD
(
"114"
,
"城市消防救援支队"
),
DQZD
(
"115"
,
"地区消防救援支队"
),
ZZZD
(
"116"
,
"企(事)业单位专职消防救援支队"
),
YWDD
(
"117"
,
"企(事)业单位义务消防救援大队"
),
JKDD
(
"118"
,
"企(事)业单位监控大队"
);
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java
View file @
695466e1
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jcs
.
api
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.common.api.dto.RequestData
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -25,5 +26,5 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
*/
Map
<
String
,
Integer
>
queryAlertStatusCount
(
@Param
(
"beginDate"
)
String
beginDate
,
@Param
(
"endDate"
)
String
endDate
);
List
<
AlertCalledZhDto
>
alertCalledListByAlertStatus
(
@Param
(
"
address"
)
String
address
);
List
<
AlertCalledZhDto
>
alertCalledListByAlertStatus
(
@Param
(
"
par"
)
RequestData
par
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertCalledService.java
View file @
695466e1
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jcs
.
api
.
service
;
import
com.yeejoin.amos.boot.module.common.api.dto.RequestData
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled
;
import
org.springframework.web.bind.annotation.PathVariable
;
...
...
@@ -25,7 +26,7 @@ public interface IAlertCalledService {
*
* **/
List
<
AlertCalledZhDto
>
alertCalledListByAlertStatus
(
String
address
);
List
<
AlertCalledZhDto
>
alertCalledListByAlertStatus
(
RequestData
par
);
/**
*
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @
695466e1
...
...
@@ -24,6 +24,7 @@
a.sequence_nbr sequenceNbr,
a.alert_stage alertStage,
a.call_time callTime,
a.rescue_grid rescueGrid,
a.alert_type alertType,
a.alarm_type_code alarmTypeCode,
a.unit_involved unitInvolved,
...
...
@@ -42,8 +43,11 @@
AND a.is_delete=0
AND a.coordinate_x IS NOT NULL
AND a.coordinate_y IS NOT NULL
<if
test=
'address!=null'
>
and a.address like CONCAT('%',#{address},'%')
<if
test=
'par.address!=null'
>
and a.address like CONCAT('%',#{par.address},'%')
</if>
<if
test=
'par.whether24!=false'
>
and a.call_time
>
= (NOW() - interval 24 hour)
</if>
ORDER BY
a.call_time DESC
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @
695466e1
...
...
@@ -3,14 +3,17 @@ package com.yeejoin.amos.boot.module.command.biz.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.utils.DateUtils
;
import
com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao
;
import
com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.*
;
import
com.yeejoin.amos.boot.module.common.api.entity.FireTeam
;
import
com.yeejoin.amos.boot.module.common.api.service.IFireStationService
;
import
com.yeejoin.amos.boot.module.common.api.service.IFireTeamService
;
import
com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService
;
import
com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto
;
import
com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums
;
import
com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService
;
import
com.yeejoin.amos.component.rule.config.RuleConfig
;
import
io.swagger.annotations.Api
;
...
...
@@ -21,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
import
org.springframework.web.bind.annotation.*
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.foundation.utils.DateUtil
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
...
...
@@ -52,6 +56,8 @@ public class CommandController extends BaseController {
IWaterResourceService
iWaterResourceService
;
@Autowired
SeismometeorologyDtoDao
seismometeorologyDtoDao
;
@Autowired
IOrgUsrService
iOrgUsrService
;
/**
* 警情列表
...
...
@@ -61,11 +67,28 @@ public class CommandController extends BaseController {
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"JQ/list"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"警情列表查询"
,
notes
=
"警情列表查询"
)
public
ResponseModel
<
Object
>
listPage
(
String
address
)
{
List
<
AlertCalledZhDto
>
list
=
iAlertCalledService
.
alertCalledListByAlertStatus
(
address
);
public
ResponseModel
<
Object
>
listPage
(
RequestData
par
)
{
List
<
AlertCalledZhDto
>
list
=
iAlertCalledService
.
alertCalledListByAlertStatus
(
par
);
return
ResponseHelper
.
buildResponse
(
list
);
}
/**
* 微型消防站列表分页查询
*
* @return
*/
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"ZDDW/list"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"保卫目标列表分页查询"
,
notes
=
"保卫目标列表分页查询"
)
public
ResponseModel
<
IPage
<
CompanyDto
>>
listPageZDDW
(
Integer
pageNum
,
Integer
pageSize
,
RequestData
par
)
{
Page
<
CompanyDto
>
pageBean
=
new
Page
<>(
pageNum
,
pageSize
);
List
<
CompanyDto
>
list
=
iOrgUsrService
.
listContractDto
(
pageNum
,
pageSize
,
par
);
Integer
num
=
iOrgUsrService
.
listContractDtoCount
(
par
);
pageBean
.
setRecords
(
list
);
pageBean
.
setTotal
(
num
);
return
ResponseHelper
.
buildResponse
(
pageBean
);
}
/**
* 微型消防站列表分页查询
*
...
...
@@ -151,6 +174,7 @@ public class CommandController extends BaseController {
@GetMapping
(
value
=
"DW/list"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"消防队伍列表分页查询"
,
notes
=
"消防队伍列表分页查询"
)
public
ResponseModel
<
IPage
<
FireTeamZhDto
>>
listPage
(
Integer
pageNum
,
Integer
pageSize
,
RequestData
par
)
{
par
.
setTypeCode
(
AlertStageEnums
.
YWDD
.
getCode
());
Page
<
FireTeamZhDto
>
pageBean
=
new
Page
<>(
pageNum
,
pageSize
);
List
<
FireTeamZhDto
>
list
=
iFireTeamService
.
getFireTeamList
(
pageNum
,
pageSize
,
par
);
Integer
num
=
iFireTeamService
.
getFireTeamListCount
(
par
);
...
...
@@ -162,6 +186,23 @@ public class CommandController extends BaseController {
/**
* 消防队伍列表分页查询
*
* @return
*/
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"ZQ/list"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"执勤实力列表分页查询"
,
notes
=
"执勤实力列表分页查询"
)
public
ResponseModel
<
IPage
<
FireTeamZhDto
>>
ZQlistPage
(
Integer
pageNum
,
Integer
pageSize
,
RequestData
par
)
{
par
.
setTypeCode
(
AlertStageEnums
.
ZZZD
.
getCode
());
Page
<
FireTeamZhDto
>
pageBean
=
new
Page
<>(
pageNum
,
pageSize
);
List
<
FireTeamZhDto
>
list
=
iFireTeamService
.
getFireTeamList
(
pageNum
,
pageSize
,
par
);
Integer
num
=
iFireTeamService
.
getFireTeamListCount
(
par
);
pageBean
.
setRecords
(
list
);
pageBean
.
setTotal
(
num
);
return
ResponseHelper
.
buildResponse
(
pageBean
);
}
/**
*
* 根据id查询警情详情
*
...
...
@@ -231,9 +272,23 @@ public class CommandController extends BaseController {
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"/seismometeorology"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"跑马灯"
,
notes
=
"跑马灯"
)
public
ResponseModel
<
Object
>
seismometeorology
()
{
public
ResponseModel
<
Object
>
seismometeorology
()
throws
Exception
{
RequestData
requestData
=
new
RequestData
();
requestData
.
setWhether24
(
true
);
List
<
AlertCalledZhDto
>
list
=
iAlertCalledService
.
alertCalledListByAlertStatus
(
requestData
);
List
<
SeismometeorologyDto
>
li
=
seismometeorologyDtoDao
.
findCarStateByWatchSn
();
//数据组装
for
(
AlertCalledZhDto
alertCalledZhDto
:
list
)
{
StringBuffer
st
=
new
StringBuffer
();
String
time
=
DateUtil
.
formatDate
(
alertCalledZhDto
.
getCallTime
(),
"yyyy-MM-dd HH:mm:ss"
);
st
.
append
(
"【"
).
append
(
alertCalledZhDto
.
getAlertType
()).
append
(
"】"
).
append
(
" "
).
append
(
time
).
append
(
" "
).
append
(
alertCalledZhDto
.
getAddress
());
return
ResponseHelper
.
buildResponse
(
seismometeorologyDtoDao
.
findCarStateByWatchSn
());
SeismometeorologyDto
sto
=
new
SeismometeorologyDto
(
alertCalledZhDto
.
getSequenceNbr
(),
"1"
,
"警情通知"
,
null
,
alertCalledZhDto
.
getCallTime
().
getTime
(),
null
,
st
.
toString
())
;
li
.
add
(
sto
);
}
return
ResponseHelper
.
buildResponse
(
li
);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
695466e1
...
...
@@ -14,6 +14,7 @@ import java.util.stream.Collectors;
import
javax.annotation.Resource
;
import
com.yeejoin.amos.boot.module.common.api.dto.*
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -26,17 +27,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.constants.CommonConstant
;
import
com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson
;
import
com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.FormValue
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto
;
import
com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn
;
import
com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance
;
import
com.yeejoin.amos.boot.module.common.api.entity.OrgUsr
;
...
...
@@ -713,6 +703,31 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return
personResult
;
}
@Override
public
List
<
CompanyDto
>
listContractDto
(
Integer
pageNum
,
Integer
pageSize
,
RequestData
requestData
)
{
if
(
null
==
pageNum
||
null
==
pageSize
)
{
pageNum
=
1
;
pageSize
=
Integer
.
MAX_VALUE
;
}
else
{
pageNum
=
(
pageNum
-
1
)
*
pageSize
;
}
return
orgUsrMapper
.
listContractDto
(
pageNum
,
pageSize
,
requestData
);
}
@Override
public
Integer
listContractDtoCount
(
RequestData
par
)
{
return
orgUsrMapper
.
listContractDtoCount
(
par
);
}
public
static
String
getOrgCodeStr
()
{
int
length
=
6
;
String
str
=
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @
695466e1
...
...
@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.module.common.api.dto.FormValue
;
import
com.yeejoin.amos.boot.module.common.api.dto.RequestData
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFormDto
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto
;
...
...
@@ -85,9 +86,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
*
* **/
@Override
public
List
<
AlertCalledZhDto
>
alertCalledListByAlertStatus
(
String
address
)
{
public
List
<
AlertCalledZhDto
>
alertCalledListByAlertStatus
(
RequestData
par
)
{
List
<
AlertCalledZhDto
>
list
=
alertCalledMapper
.
alertCalledListByAlertStatus
(
address
);
List
<
AlertCalledZhDto
>
list
=
alertCalledMapper
.
alertCalledListByAlertStatus
(
par
);
return
list
;
}
...
...
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