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
0a43d10f
Commit
0a43d10f
authored
Dec 10, 2021
by
helinlin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/developer' into developer
parents
a7e5603e
587fc256
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
277 additions
and
95 deletions
+277
-95
DataAuth.java
...om/yeejoin/amos/boot/biz/common/annotations/DataAuth.java
+25
-0
PermissionInterceptor.java
...s/boot/biz/common/interceptors/PermissionInterceptor.java
+0
-0
CommonUtils.java
...a/com/yeejoin/amos/boot/biz/common/utils/CommonUtils.java
+43
-0
MyBatisPlusConfig.java
...a/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java
+6
-0
OrgUsrMapper.xml
...ule-common-api/src/main/resources/mapper/OrgUsrMapper.xml
+3
-0
AlertCalledZhDto.java
...eejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java
+1
-1
AlertCalledMapper.xml
...e-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
+1
-1
LatentDangerLevelEnum.java
...amos/latentdanger/common/enums/LatentDangerLevelEnum.java
+16
-4
LatentDangerReformTypeEnum.java
...latentdanger/common/enums/LatentDangerReformTypeEnum.java
+16
-4
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+2
-1
AlertCalledServiceImpl.java
...t/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
+5
-5
AlertSubmittedServiceImpl.java
...odule/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
+28
-9
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+14
-2
LatentDangerController.java
...entdanger/business/controller/LatentDangerController.java
+0
-7
LatentDangerMapper.java
.../latentdanger/business/dao/mapper/LatentDangerMapper.java
+2
-0
JcsFeignClient.java
...join/amos/latentdanger/business/feign/JcsFeignClient.java
+9
-0
LatentDangerServiceImpl.java
...danger/business/service/impl/LatentDangerServiceImpl.java
+0
-0
EnumFillAop.java
...a/com/yeejoin/amos/latentdanger/core/aop/EnumFillAop.java
+2
-4
InputItemController.java
.../supervision/business/controller/InputItemController.java
+3
-6
PlanController.java
.../amos/supervision/business/controller/PlanController.java
+5
-4
PlanTaskController.java
...s/supervision/business/controller/PlanTaskController.java
+2
-0
CheckReportMapper.java
...os/supervision/business/dao/mapper/CheckReportMapper.java
+2
-0
InputItemMapper.java
...amos/supervision/business/dao/mapper/InputItemMapper.java
+3
-0
PlanMapper.java
...join/amos/supervision/business/dao/mapper/PlanMapper.java
+3
-0
PlanTaskMapper.java
.../amos/supervision/business/dao/mapper/PlanTaskMapper.java
+3
-0
LatentDangerPatrolItemParam.java
...pervision/business/param/LatentDangerPatrolItemParam.java
+0
-3
PlanInfoPageParam.java
...in/amos/supervision/business/param/PlanInfoPageParam.java
+13
-0
HiddenDangerServiceImpl.java
...vision/business/service/impl/HiddenDangerServiceImpl.java
+18
-3
PlanServiceImpl.java
...os/supervision/business/service/impl/PlanServiceImpl.java
+9
-0
PlanTaskServiceImpl.java
...upervision/business/service/impl/PlanTaskServiceImpl.java
+11
-0
InputItemParamUtil.java
...in/amos/supervision/business/util/InputItemParamUtil.java
+0
-1
application.properties
...em-latentdanger/src/main/resources/application.properties
+3
-2
LatentDangerMapper.xml
...anger/src/main/resources/db/mapper/LatentDangerMapper.xml
+6
-4
application-dev.properties
...supervision/src/main/resources/application-dev.properties
+4
-3
CheckReportMapper.xml
...vision/src/main/resources/db/mapper/CheckReportMapper.xml
+0
-3
dbTemplate_plan.xml
...ervision/src/main/resources/db/mapper/dbTemplate_plan.xml
+14
-15
dbTemplate_plan_task.xml
...ion/src/main/resources/db/mapper/dbTemplate_plan_task.xml
+4
-12
pom.xml
pom.xml
+1
-1
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotations/DataAuth.java
0 → 100644
View file @
0a43d10f
package
com
.
yeejoin
.
amos
.
boot
.
biz
.
common
.
annotations
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
/**
* @author DELL
*
* 注解在mapper方法上
*/
@Target
(
ElementType
.
METHOD
)
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Documented
public
@interface
DataAuth
{
/**
* 菜单组件
* @return
*/
String
interfacePath
()
default
""
;
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java
0 → 100644
View file @
0a43d10f
This diff is collapsed.
Click to expand it.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/CommonUtils.java
0 → 100644
View file @
0a43d10f
package
com
.
yeejoin
.
amos
.
boot
.
biz
.
common
.
utils
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
import
java.util.Objects
;
import
java.util.function.BiConsumer
;
public
class
CommonUtils
{
/**
* 带索引foreach
*
* @param <T>
* @param startIndex 开始遍历的索引
* @param elements 集合
* @param action
*/
public
static
<
T
>
void
forEach
(
int
startIndex
,
Iterable
<?
extends
T
>
elements
,
BiConsumer
<
Integer
,
?
super
T
>
action
)
{
Objects
.
requireNonNull
(
elements
);
Objects
.
requireNonNull
(
action
);
if
(
startIndex
<
0
)
{
startIndex
=
0
;
}
int
index
=
0
;
for
(
T
element
:
elements
)
{
index
++;
if
(
index
<=
startIndex
)
{
continue
;
}
action
.
accept
(
index
-
1
,
element
);
}
}
public
static
Object
getFiledValueByName
(
String
filedName
,
Object
o
)
throws
InvocationTargetException
,
IllegalAccessException
,
NoSuchMethodException
{
String
firstLetter
=
filedName
.
substring
(
0
,
1
).
toUpperCase
();
String
getterName
=
"get"
+
firstLetter
+
filedName
.
substring
(
1
);
Method
method
;
method
=
o
.
getClass
().
getMethod
(
getterName
,
new
Class
[]{});
Object
value
=
method
.
invoke
(
o
,
new
Object
[]{});
return
value
;
}
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java
View file @
0a43d10f
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.biz.config;
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.biz.config;
import
com.baomidou.mybatisplus.core.config.GlobalConfig
;
import
com.baomidou.mybatisplus.core.config.GlobalConfig
;
import
com.baomidou.mybatisplus.core.toolkit.Sequence
;
import
com.baomidou.mybatisplus.core.toolkit.Sequence
;
import
com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
...
@@ -26,4 +27,9 @@ public class MyBatisPlusConfig {
...
@@ -26,4 +27,9 @@ public class MyBatisPlusConfig {
public
Sequence
sequence
(){
public
Sequence
sequence
(){
return
new
Sequence
();
return
new
Sequence
();
}
}
@Bean
public
PermissionInterceptor
permissionInterceptor
()
{
return
new
PermissionInterceptor
();
}
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @
0a43d10f
...
@@ -69,6 +69,9 @@
...
@@ -69,6 +69,9 @@
<if
test=
"map.bizOrgCode != null and map.bizOrgCode != '-1'"
>
<if
test=
"map.bizOrgCode != null and map.bizOrgCode != '-1'"
>
AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
</if>
</if>
<if
test=
"map.amosOrgId != null and map.amosOrgId != '-1'"
>
AND u.amos_org_id like concat(#{map.amosOrgId}, '%')
</if>
GROUP BY
GROUP BY
u.sequence_nbr ,
u.sequence_nbr ,
u.biz_org_name ,
u.biz_org_name ,
...
...
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 @
0a43d10f
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jcs
.
api
.
dto
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jcs
.
api
.
dto
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -18,7 +19,6 @@ import java.util.Date;
...
@@ -18,7 +19,6 @@ import java.util.Date;
@ApiModel
(
value
=
"AlertCalledZhDto"
,
description
=
" 指挥警情接警记录"
)
@ApiModel
(
value
=
"AlertCalledZhDto"
,
description
=
" 指挥警情接警记录"
)
public
class
AlertCalledZhDto
{
public
class
AlertCalledZhDto
{
@ApiModelProperty
(
value
=
"主键ID"
)
@ApiModelProperty
(
value
=
"主键ID"
)
protected
Long
sequenceNbr
;
protected
Long
sequenceNbr
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @
0a43d10f
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
and a.alert_type_code = #{par.alertTypeCode}
and a.alert_type_code = #{par.alertTypeCode}
</if>
</if>
<if
test=
'par.alertId
=
=null'
>
<if
test=
'par.alertId
!
=null'
>
and a.sequence_nbr =#{par.alertId}
and a.sequence_nbr =#{par.alertId}
</if>
</if>
<if
test=
'par.whether24!=false'
>
<if
test=
'par.whether24!=false'
>
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerLevelEnum.java
View file @
0a43d10f
...
@@ -25,9 +25,21 @@ public enum LatentDangerLevelEnum {
...
@@ -25,9 +25,21 @@ public enum LatentDangerLevelEnum {
重大隐患
(
"重大隐患"
,
"2"
,
"2"
,
3
);
重大隐患
(
"重大隐患"
,
"2"
,
"2"
,
3
);
/**
/**
* 巡检枚举缓存
*/
public
static
Map
<
String
,
LatentDangerLevelEnum
>
patrolDangerLevelEnumMap
=
new
HashMap
<>();
static
{
LatentDangerLevelEnum
[]
initEnum
=
LatentDangerLevelEnum
.
values
();
for
(
LatentDangerLevelEnum
_enum
:
initEnum
)
{
patrolDangerLevelEnumMap
.
put
(
_enum
.
getCode
(),
_enum
);
}
}
/**
* 枚举缓存
* 枚举缓存
*/
*/
public
static
Map
<
String
,
LatentDangerLevelEnum
>
e
numMap
=
new
HashMap
<>();
public
static
Map
<
String
,
LatentDangerLevelEnum
>
supervisionDangerLevelE
numMap
=
new
HashMap
<>();
public
static
final
String
dictCode
=
"_DANGER_LEVEL"
;
public
static
final
String
dictCode
=
"_DANGER_LEVEL"
;
...
@@ -76,7 +88,7 @@ public enum LatentDangerLevelEnum {
...
@@ -76,7 +88,7 @@ public enum LatentDangerLevelEnum {
}
}
public
static
LatentDangerLevelEnum
getEnumByOrder
(
Integer
order
)
{
public
static
LatentDangerLevelEnum
getEnumByOrder
(
Integer
order
)
{
for
(
LatentDangerLevelEnum
l
:
e
numMap
.
values
())
{
for
(
LatentDangerLevelEnum
l
:
supervisionDangerLevelE
numMap
.
values
())
{
if
(
order
.
equals
(
l
.
getOrder
()))
{
if
(
order
.
equals
(
l
.
getOrder
()))
{
return
l
;
return
l
;
}
}
...
@@ -91,7 +103,7 @@ public enum LatentDangerLevelEnum {
...
@@ -91,7 +103,7 @@ public enum LatentDangerLevelEnum {
*/
*/
public
static
LatentDangerLevelEnum
getEnumByCode
(
String
code
)
{
public
static
LatentDangerLevelEnum
getEnumByCode
(
String
code
)
{
// 这里可以做一些修改 比如若从 enumMap 中没有取得 则加载配置动态添加
// 这里可以做一些修改 比如若从 enumMap 中没有取得 则加载配置动态添加
return
e
numMap
.
get
(
code
);
return
supervisionDangerLevelE
numMap
.
get
(
code
);
}
}
public
static
LatentDangerLevelEnum
addEnumDynamic
(
String
enumName
,
String
name
,
String
code
,
public
static
LatentDangerLevelEnum
addEnumDynamic
(
String
enumName
,
String
name
,
String
code
,
...
@@ -100,7 +112,7 @@ public enum LatentDangerLevelEnum {
...
@@ -100,7 +112,7 @@ public enum LatentDangerLevelEnum {
new
Class
[]{
String
.
class
,
String
.
class
,
String
.
class
,
Integer
.
class
},
new
Object
[]{
name
,
code
,
new
Class
[]{
String
.
class
,
String
.
class
,
String
.
class
,
Integer
.
class
},
new
Object
[]{
name
,
code
,
riskSourceDangerLevelCode
,
order
});
riskSourceDangerLevelCode
,
order
});
if
(!
ValidationUtil
.
isEmpty
(
dangerLevelEnum
))
{
if
(!
ValidationUtil
.
isEmpty
(
dangerLevelEnum
))
{
e
numMap
.
put
(
code
,
dangerLevelEnum
);
supervisionDangerLevelE
numMap
.
put
(
code
,
dangerLevelEnum
);
}
}
return
dangerLevelEnum
;
return
dangerLevelEnum
;
}
}
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerReformTypeEnum.java
View file @
0a43d10f
...
@@ -36,9 +36,21 @@ public enum LatentDangerReformTypeEnum {
...
@@ -36,9 +36,21 @@ public enum LatentDangerReformTypeEnum {
private
String
code
;
private
String
code
;
/**
/**
* 枚举缓存
*
巡检
枚举缓存
*/
*/
public
static
Map
<
String
,
LatentDangerReformTypeEnum
>
enumMap
=
new
HashMap
<>();
public
static
Map
<
String
,
LatentDangerReformTypeEnum
>
patrolReformTypeEnumMap
=
new
HashMap
<>();
static
{
LatentDangerReformTypeEnum
[]
initEnum
=
LatentDangerReformTypeEnum
.
values
();
for
(
LatentDangerReformTypeEnum
_enum
:
initEnum
)
{
patrolReformTypeEnumMap
.
put
(
_enum
.
getCode
(),
_enum
);
}
}
/**
* 防火监督枚举缓存
*/
public
static
Map
<
String
,
LatentDangerReformTypeEnum
>
supervisionReformTypeEnumMap
=
new
HashMap
<>();
public
static
final
String
dictCode
=
"_GOVERNANCE"
;
public
static
final
String
dictCode
=
"_GOVERNANCE"
;
...
@@ -70,14 +82,14 @@ public enum LatentDangerReformTypeEnum {
...
@@ -70,14 +82,14 @@ public enum LatentDangerReformTypeEnum {
*/
*/
public
static
LatentDangerReformTypeEnum
getEnumByCode
(
String
code
)
{
public
static
LatentDangerReformTypeEnum
getEnumByCode
(
String
code
)
{
// 这里可以做一些修改 比如若从 enumMap 中没有取得 则加载配置动态添加
// 这里可以做一些修改 比如若从 enumMap 中没有取得 则加载配置动态添加
return
e
numMap
.
get
(
code
);
return
supervisionReformTypeE
numMap
.
get
(
code
);
}
}
public
static
LatentDangerReformTypeEnum
addEnumDynamic
(
String
enumName
,
String
name
,
String
code
)
{
public
static
LatentDangerReformTypeEnum
addEnumDynamic
(
String
enumName
,
String
name
,
String
code
)
{
LatentDangerReformTypeEnum
dangerReformTypeEnum
=
DynamicEnumUtil
.
addEnum
(
LatentDangerReformTypeEnum
.
class
,
enumName
,
LatentDangerReformTypeEnum
dangerReformTypeEnum
=
DynamicEnumUtil
.
addEnum
(
LatentDangerReformTypeEnum
.
class
,
enumName
,
new
Class
[]{
String
.
class
,
String
.
class
},
new
Object
[]{
name
,
code
});
new
Class
[]{
String
.
class
,
String
.
class
},
new
Object
[]{
name
,
code
});
if
(!
ValidationUtil
.
isEmpty
(
dangerReformTypeEnum
))
{
if
(!
ValidationUtil
.
isEmpty
(
dangerReformTypeEnum
))
{
e
numMap
.
put
(
code
,
dangerReformTypeEnum
);
supervisionReformTypeE
numMap
.
put
(
code
,
dangerReformTypeEnum
);
}
}
return
dangerReformTypeEnum
;
return
dangerReformTypeEnum
;
}
}
...
...
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 @
0a43d10f
...
@@ -411,7 +411,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
...
@@ -411,7 +411,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
req
.
remove
(
"pageSize"
);
req
.
remove
(
"pageSize"
);
req
.
remove
(
"pageNum"
);
req
.
remove
(
"pageNum"
);
req
.
remove
(
"parentId"
);
req
.
remove
(
"parentId"
);
req
.
remove
(
"amosOrgId"
);
map
.
put
(
"fieldsValue"
,
req
);
map
.
put
(
"fieldsValue"
,
req
);
map
.
put
(
"fields"
,
alertFormServiceImpl
.
queryListByFormId
(
OrgPersonEnum
.
人员
.
getCode
()));
map
.
put
(
"fields"
,
alertFormServiceImpl
.
queryListByFormId
(
OrgPersonEnum
.
人员
.
getCode
()));
pageBean
.
setTotal
(
this
.
baseMapper
.
selectPersonListCount
(
map
));
pageBean
.
setTotal
(
this
.
baseMapper
.
selectPersonListCount
(
map
));
...
...
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 @
0a43d10f
...
@@ -9,6 +9,7 @@ import java.util.Set;
...
@@ -9,6 +9,7 @@ import java.util.Set;
import
java.util.function.Function
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
...
@@ -384,7 +385,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
...
@@ -384,7 +385,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
// 保存动态表单数据
// 保存动态表单数据
iAlertFormValueService
.
saveBatch
(
alertFormValuelist
);
iAlertFormValueService
.
saveBatch
(
alertFormValuelist
);
emqKeeper
.
getMqttClient
().
publish
(
topic1
,
"1"
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
tru
e
);
emqKeeper
.
getMqttClient
().
publish
(
topic1
,
"1"
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
fals
e
);
}
else
{
}
else
{
// 警情报送
// 警情报送
// ****************************************************待确认开发
// ****************************************************待确认开发
...
@@ -409,15 +410,15 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
...
@@ -409,15 +410,15 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
ruleAlertCalledService
.
fireAlertCalledRule
(
alertCalledObjsDto
,
AlertBusinessTypeEnum
.
警情初报
.
getCode
(),
ruleAlertCalledService
.
fireAlertCalledRule
(
alertCalledObjsDto
,
AlertBusinessTypeEnum
.
警情初报
.
getCode
(),
null
,
null
,
null
);
null
,
null
,
null
);
// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
emqKeeper
.
getMqttClient
().
publish
(
topic
,
"0"
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
tru
e
);
emqKeeper
.
getMqttClient
().
publish
(
topic
,
"0"
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
fals
e
);
//tuisongxinjingqing
//tuisongxinjingqing
RequestData
par
=
new
RequestData
();
RequestData
par
=
new
RequestData
();
par
.
setAlertId
(
alertCalled
.
getSequenceNbr
());
par
.
setAlertId
(
alertCalled
.
getSequenceNbr
());
List
<
AlertCalledZhDto
>
list
=
this
.
alertCalledListByAlertStatus
(
null
,
null
,
par
);
List
<
AlertCalledZhDto
>
list
=
this
.
alertCalledListByAlertStatus
(
null
,
null
,
par
);
String
json
=
list
!=
null
&&
list
.
size
()>
0
?
JSONObject
.
toJSONString
(
list
.
get
(
0
)):
""
;
String
json
=
list
!=
null
&&
list
.
size
()>
0
?
JSONObject
.
toJSONString
(
list
.
get
(
0
)
,
SerializerFeature
.
PrettyFormat
,
SerializerFeature
.
WriteMapNullValue
):
""
;
emqKeeper
.
getMqttClient
().
publish
(
topicData
,
json
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
tru
e
);
emqKeeper
.
getMqttClient
().
publish
(
topicData
,
json
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
fals
e
);
/**
/**
* 同步保存ES
* 同步保存ES
...
@@ -431,7 +432,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
...
@@ -431,7 +432,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
throw
new
RuntimeException
(
"报送失败,系统异常!"
);
throw
new
RuntimeException
(
"报送失败,系统异常!"
);
}
}
}
}
/**
/**
* 根据id 修改警情 type:警情相关 操作类型 0警情续报 1非警情确认 2 警情结案
* 根据id 修改警情 type:警情相关 操作类型 0警情续报 1非警情确认 2 警情结案
*/
*/
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @
0a43d10f
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONException
;
import
com.alibaba.fastjson.JSONException
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.deepoove.poi.XWPFTemplate
;
import
com.deepoove.poi.XWPFTemplate
;
...
@@ -515,15 +516,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
...
@@ -515,15 +516,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertCalledAction
.
sendAlertCalleCmd
(
sCode
,
mobiles
,
smsParams
);
alertCalledAction
.
sendAlertCalleCmd
(
sCode
,
mobiles
,
smsParams
);
}
}
//警情結案推送
if
(
alertWay
.
equals
(
AlertBusinessTypeEnum
.
警情结案
.
getCode
()))
{
RequestData
par
=
new
RequestData
();
par
.
setAlertId
(
alertCalled
.
getSequenceNbr
());
List
<
AlertCalledZhDto
>
list
=
alertCalledService
.
alertCalledListByAlertStatus
(
null
,
null
,
par
);
String
json
=
list
!=
null
&&
list
.
size
()>
0
?
JSONObject
.
toJSONString
(
list
.
get
(
0
)):
""
;
emqKeeper
.
getMqttClient
().
publish
(
topicJa
,
json
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
true
);
}
...
@@ -538,7 +531,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
...
@@ -538,7 +531,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
*/
*/
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
Map
<
String
,
String
>
saveAlertSubmitted
(
AlertSubmittedDto
alertSubmittedDto
,
String
userName
)
{
public
Map
<
String
,
String
>
saveAlertSubmitted
(
AlertSubmittedDto
alertSubmittedDto
,
String
userName
)
{
Long
alertSubmittedId
=
alertSubmittedDto
.
getSequenceNbr
();
try
{
Long
alertSubmittedId
=
alertSubmittedDto
.
getSequenceNbr
();
String
alertWay
=
""
;
String
alertWay
=
""
;
Map
<
String
,
String
>
map
=
new
HashMap
<>();
Map
<
String
,
String
>
map
=
new
HashMap
<>();
Set
<
String
>
mobiles
=
new
HashSet
<>();
Set
<
String
>
mobiles
=
new
HashSet
<>();
...
@@ -665,6 +658,12 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
...
@@ -665,6 +658,12 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
}
}
if
(
AlertBusinessTypeEnum
.
警情结案
.
getCode
().
equals
(
alertSubmittedDto
.
getBusinessTypeCode
())
if
(
AlertBusinessTypeEnum
.
警情结案
.
getCode
().
equals
(
alertSubmittedDto
.
getBusinessTypeCode
())
||
AlertBusinessTypeEnum
.
非警情确认
.
getCode
().
equals
(
alertSubmittedDto
.
getBusinessTypeCode
()))
{
||
AlertBusinessTypeEnum
.
非警情确认
.
getCode
().
equals
(
alertSubmittedDto
.
getBusinessTypeCode
()))
{
// 查询本次警情调派的车辆
// 查询本次警情调派的车辆
...
@@ -689,6 +688,22 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
...
@@ -689,6 +688,22 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
// powerTransferCompanyResourcesService.update(new UpdateWrapper<PowerTransferCompanyResources>().eq("resources_id", transferCarIdList).set("status", FireCarStatusEnum.返队.getCode()));
// powerTransferCompanyResourcesService.update(new UpdateWrapper<PowerTransferCompanyResources>().eq("resources_id", transferCarIdList).set("status", FireCarStatusEnum.返队.getCode()));
}
}
//警情結案推送
if
(
AlertBusinessTypeEnum
.
警情结案
.
getCode
().
equals
(
alertSubmittedDto
.
getBusinessTypeCode
()))
{
//tuisongxinjingqing
RequestData
par
=
new
RequestData
();
par
.
setAlertId
(
alertSubmittedDto
.
getAlertCalledId
());
List
<
AlertCalledZhDto
>
list4
=
alertCalledService
.
alertCalledListByAlertStatus
(
null
,
null
,
par
);
String
json
=
list4
!=
null
&&
list4
.
size
()>
0
?
JSONObject
.
toJSONString
(
list4
.
get
(
0
),
SerializerFeature
.
PrettyFormat
,
SerializerFeature
.
WriteMapNullValue
):
""
;
emqKeeper
.
getMqttClient
().
publish
(
topicJa
,
json
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
false
);
}
// 4.发送任务消息
// 4.发送任务消息
// 4.1组织短信内容 废弃
// 4.1组织短信内容 废弃
...
@@ -704,6 +719,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
...
@@ -704,6 +719,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
map
.
put
(
"alertWay"
,
alertWay
);
map
.
put
(
"alertWay"
,
alertWay
);
map
.
put
(
"mobiles"
,
StringUtils
.
join
(
mobiles
,
","
));
map
.
put
(
"mobiles"
,
StringUtils
.
join
(
mobiles
,
","
));
return
map
;
return
map
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
throw
new
RuntimeException
(
"报送失败,系统异常!"
);
}
}
}
public
void
generateMob
(
AlertCalled
alertCalled
)
throws
ParseException
,
FileNotFoundException
{
public
void
generateMob
(
AlertCalled
alertCalled
)
throws
ParseException
,
FileNotFoundException
{
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @
0a43d10f
...
@@ -4,6 +4,7 @@ import java.util.*;
...
@@ -4,6 +4,7 @@ import java.util.*;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.*
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.*
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
@@ -110,6 +111,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
...
@@ -110,6 +111,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
@Autowired
@Autowired
ControllerServiceImpl
controllerServiceImpl
;
ControllerServiceImpl
controllerServiceImpl
;
@Autowired
private
AircraftServiceImpl
aircraftServiceImpl
;
@Override
@Override
public
PowerTransferSimpleDto
getPowerTransferList
(
Long
alertCalledId
)
{
public
PowerTransferSimpleDto
getPowerTransferList
(
Long
alertCalledId
)
{
List
<
PowerTransferCompanyResourcesDto
>
powerTransferList
=
this
.
baseMapper
.
getPowerTransferList
(
alertCalledId
);
List
<
PowerTransferCompanyResourcesDto
>
powerTransferList
=
this
.
baseMapper
.
getPowerTransferList
(
alertCalledId
);
...
@@ -162,7 +166,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
...
@@ -162,7 +166,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
// 发送调派通知
// 发送调派通知
// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
emqKeeper
.
getMqttClient
().
publish
(
topic
,
"0"
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
tru
e
);
emqKeeper
.
getMqttClient
().
publish
(
topic
,
"0"
.
getBytes
(),
RuleConfig
.
DEFAULT_QOS
,
fals
e
);
}
catch
(
MqttException
e
)
{
}
catch
(
MqttException
e
)
{
throw
new
RuntimeException
();
throw
new
RuntimeException
();
}
}
...
@@ -406,12 +410,20 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
...
@@ -406,12 +410,20 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
if
(
null
!=
alertCalled
)
{
if
(
null
!=
alertCalled
)
{
replaceContent
=
RuleAlertCalledService
.
init
(
alertCalledRo
,
alertCalledObjsDto
);
replaceContent
=
RuleAlertCalledService
.
init
(
alertCalledRo
,
alertCalledObjsDto
);
}
}
List
<
AlertFormValue
>
alertFormValue
=
alertCalledObjsDto
.
getAlertFormValue
();
String
responseLevel
=
""
;
List
<
AlertFormValue
>
list1
=
alertFormValue
.
stream
().
filter
(
formValue
->
formValue
.
getFieldCode
().
equals
(
"responseLevel"
)
).
collect
(
Collectors
.
toList
());;
if
(
list1
.
size
()
>
0
)
{
responseLevel
=
list1
.
get
(
0
).
getFieldValue
();
}
definitions
.
put
(
"rescueGrid"
,
alertCalled
.
getAddress
());
definitions
.
put
(
"rescueGrid"
,
alertCalled
.
getAddress
());
definitions
.
put
(
"type"
,
alertCalled
.
getAlertType
());
definitions
.
put
(
"type"
,
alertCalled
.
getAlertType
());
definitions
.
put
(
"contactUser"
,
alertCalled
.
getContactUser
());
definitions
.
put
(
"contactUser"
,
alertCalled
.
getContactUser
());
definitions
.
put
(
"contactPhone"
,
alertCalled
.
getContactPhone
());
definitions
.
put
(
"contactPhone"
,
alertCalled
.
getContactPhone
());
definitions
.
put
(
"type"
,
alertCalled
.
getAlertType
());
definitions
.
put
(
"replaceContent"
,
replaceContent
);
definitions
.
put
(
"replaceContent"
,
replaceContent
);
definitions
.
put
(
"responseLevel"
,
responseLevel
);
definitions
.
put
(
"callTime"
,
definitions
.
put
(
"callTime"
,
DateUtils
.
convertDateToString
(
alertCalled
.
getCallTime
(),
DateUtils
.
DATE_TIME_PATTERN
));
DateUtils
.
convertDateToString
(
alertCalled
.
getCallTime
(),
DateUtils
.
DATE_TIME_PATTERN
));
for
(
PowerTransferCompanyDto
powerTransferCompanyDto
:
powerTransferCompanyDotList
)
{
for
(
PowerTransferCompanyDto
powerTransferCompanyDto
:
powerTransferCompanyDotList
)
{
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java
View file @
0a43d10f
...
@@ -19,7 +19,6 @@ import com.yeejoin.amos.latentdanger.business.util.CommonResponseUtil;
...
@@ -19,7 +19,6 @@ import com.yeejoin.amos.latentdanger.business.util.CommonResponseUtil;
import
com.yeejoin.amos.latentdanger.business.util.FileHelper
;
import
com.yeejoin.amos.latentdanger.business.util.FileHelper
;
import
com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo
;
import
com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo
;
import
com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo
;
import
com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo
;
import
com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum
;
import
com.yeejoin.amos.latentdanger.core.common.response.DangerListResponse
;
import
com.yeejoin.amos.latentdanger.core.common.response.DangerListResponse
;
import
com.yeejoin.amos.latentdanger.dao.entity.LatentDanger
;
import
com.yeejoin.amos.latentdanger.dao.entity.LatentDanger
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -241,9 +240,6 @@ public class LatentDangerController extends BaseController {
...
@@ -241,9 +240,6 @@ public class LatentDangerController extends BaseController {
@PostMapping
(
value
=
"/page/list"
)
@PostMapping
(
value
=
"/page/list"
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
public
ResponseModel
listDanger
(
@ApiParam
(
value
=
"查询条件"
,
required
=
true
)
@RequestBody
PageParam
pageParam
)
throws
Exception
{
public
ResponseModel
listDanger
(
@ApiParam
(
value
=
"查询条件"
,
required
=
true
)
@RequestBody
PageParam
pageParam
)
throws
Exception
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
loginOrgCode
=
getOrgCode
(
reginParams
);
pageParam
.
put
(
"orgCode"
,
loginOrgCode
);
IPage
<
LatentDanger
>
result
=
iLatentDangerService
.
pageListDanger
(
pageParam
);
IPage
<
LatentDanger
>
result
=
iLatentDangerService
.
pageListDanger
(
pageParam
);
return
ResponseHelper
.
buildResponse
(
result
);
return
ResponseHelper
.
buildResponse
(
result
);
}
}
...
@@ -343,9 +339,6 @@ public class LatentDangerController extends BaseController {
...
@@ -343,9 +339,6 @@ public class LatentDangerController extends BaseController {
@PostMapping
(
value
=
"/supervision/page/reviewList"
)
@PostMapping
(
value
=
"/supervision/page/reviewList"
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
public
ResponseModel
reviewListDanger
(
@ApiParam
(
value
=
"查询条件"
,
required
=
true
)
@RequestBody
PageParam
pageParam
)
throws
Exception
{
public
ResponseModel
reviewListDanger
(
@ApiParam
(
value
=
"查询条件"
,
required
=
true
)
@RequestBody
PageParam
pageParam
)
throws
Exception
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
loginOrgCode
=
getOrgCode
(
reginParams
);
pageParam
.
put
(
"orgCode"
,
loginOrgCode
);
IPage
<
LatentDanger
>
result
=
iLatentDangerService
.
reviewListDanger
(
pageParam
);
IPage
<
LatentDanger
>
result
=
iLatentDangerService
.
reviewListDanger
(
pageParam
);
return
ResponseHelper
.
buildResponse
(
result
);
return
ResponseHelper
.
buildResponse
(
result
);
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dao/mapper/LatentDangerMapper.java
View file @
0a43d10f
...
@@ -3,6 +3,7 @@ package com.yeejoin.amos.latentdanger.business.dao.mapper;
...
@@ -3,6 +3,7 @@ package com.yeejoin.amos.latentdanger.business.dao.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.annotations.DataAuth
;
import
com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo
;
import
com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo
;
import
com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerNoticeBo
;
import
com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerNoticeBo
;
import
com.yeejoin.amos.latentdanger.business.param.LatentDangerListParam
;
import
com.yeejoin.amos.latentdanger.business.param.LatentDangerListParam
;
...
@@ -79,6 +80,7 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
...
@@ -79,6 +80,7 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
* @param paramMap
* @param paramMap
* @return
* @return
*/
*/
@DataAuth
(
interfacePath
=
"latent/danger/page/list"
)
IPage
<
LatentDanger
>
selectPageByParam
(
@Param
(
"page"
)
Page
<
LatentDanger
>
page
,
@Param
(
"paramMap"
)
Map
<
String
,
Object
>
paramMap
);
IPage
<
LatentDanger
>
selectPageByParam
(
@Param
(
"page"
)
Page
<
LatentDanger
>
page
,
@Param
(
"paramMap"
)
Map
<
String
,
Object
>
paramMap
);
Integer
selectUnFinishedCount
(
@Param
(
"dangerState1"
)
List
<
String
>
dangerState1
,
@Param
(
"dangerState2"
)
List
<
String
>
dangerState2
);
Integer
selectUnFinishedCount
(
@Param
(
"dangerState1"
)
List
<
String
>
dangerState1
,
@Param
(
"dangerState2"
)
List
<
String
>
dangerState2
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/feign/JcsFeignClient.java
View file @
0a43d10f
package
com
.
yeejoin
.
amos
.
latentdanger
.
business
.
feign
;
package
com
.
yeejoin
.
amos
.
latentdanger
.
business
.
feign
;
import
com.yeejoin.amos.boot.module.common.api.feign.MultipartSupportConfig
;
import
com.yeejoin.amos.boot.module.common.api.feign.MultipartSupportConfig
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
...
@@ -23,4 +25,11 @@ public interface JcsFeignClient {
...
@@ -23,4 +25,11 @@ public interface JcsFeignClient {
**/
**/
@RequestMapping
(
value
=
"/org-usr/amos/{orgUserId}"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/org-usr/amos/{orgUserId}"
,
method
=
RequestMethod
.
GET
)
ResponseModel
<
AgencyUserModel
>
getAmosIdByUserId
(
@PathVariable
String
orgUserId
);
ResponseModel
<
AgencyUserModel
>
getAmosIdByUserId
(
@PathVariable
String
orgUserId
);
/**
* 查询用户单位信息
* @return ResponseModel<ReginParams.PersonIdentity>
*/
@GetMapping
(
value
=
"/org-usr/getLoginUserDetails"
)
FeignClientResult
getJcsUser
();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @
0a43d10f
This diff is collapsed.
Click to expand it.
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/aop/EnumFillAop.java
View file @
0a43d10f
...
@@ -3,7 +3,6 @@ package com.yeejoin.amos.latentdanger.core.aop;
...
@@ -3,7 +3,6 @@ package com.yeejoin.amos.latentdanger.core.aop;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.feign.systemctl.Systemctl
;
import
com.yeejoin.amos.feign.systemctl.Systemctl
;
import
com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel
;
import
com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel
;
import
com.yeejoin.amos.latentdanger.business.constants.Constants
;
import
com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum
;
import
com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum
;
import
com.yeejoin.amos.latentdanger.common.enums.LatentDangerReformTypeEnum
;
import
com.yeejoin.amos.latentdanger.common.enums.LatentDangerReformTypeEnum
;
import
org.aspectj.lang.JoinPoint
;
import
org.aspectj.lang.JoinPoint
;
...
@@ -17,7 +16,6 @@ import org.springframework.web.context.request.RequestContextHolder;
...
@@ -17,7 +16,6 @@ import org.springframework.web.context.request.RequestContextHolder;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -43,14 +41,14 @@ public class EnumFillAop {
...
@@ -43,14 +41,14 @@ public class EnumFillAop {
ServletRequestAttributes
attributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
ServletRequestAttributes
attributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
// 获取隐患等级枚举
// 获取隐患等级枚举
synchronized
(
this
)
{
synchronized
(
this
)
{
if
(
ValidationUtil
.
isEmpty
(
LatentDangerLevelEnum
.
e
numMap
))
{
if
(
ValidationUtil
.
isEmpty
(
LatentDangerLevelEnum
.
supervisionDangerLevelE
numMap
))
{
List
<
DictionarieValueModel
>
dicResult
=
List
<
DictionarieValueModel
>
dicResult
=
Systemctl
.
dictionarieClient
.
dictValues
(
bizType
+
LatentDangerLevelEnum
.
dictCode
).
getResult
();
Systemctl
.
dictionarieClient
.
dictValues
(
bizType
+
LatentDangerLevelEnum
.
dictCode
).
getResult
();
dicResult
.
forEach
(
dic
->
LatentDangerLevelEnum
.
addEnumDynamic
(
dic
.
getDictDataDesc
(),
dic
.
getDictDataValue
(),
dic
.
getDictDataKey
(),
dicResult
.
forEach
(
dic
->
LatentDangerLevelEnum
.
addEnumDynamic
(
dic
.
getDictDataDesc
(),
dic
.
getDictDataValue
(),
dic
.
getDictDataKey
(),
""
,
dic
.
getOrderNum
()));
""
,
dic
.
getOrderNum
()));
}
}
// 获取治理方式枚举
// 获取治理方式枚举
if
(
ValidationUtil
.
isEmpty
(
LatentDangerReformTypeEnum
.
e
numMap
))
{
if
(
ValidationUtil
.
isEmpty
(
LatentDangerReformTypeEnum
.
supervisionReformTypeE
numMap
))
{
List
<
DictionarieValueModel
>
dicResult
=
List
<
DictionarieValueModel
>
dicResult
=
Systemctl
.
dictionarieClient
.
dictValues
(
bizType
+
LatentDangerReformTypeEnum
.
dictCode
).
getResult
();
Systemctl
.
dictionarieClient
.
dictValues
(
bizType
+
LatentDangerReformTypeEnum
.
dictCode
).
getResult
();
dicResult
.
forEach
(
dic
->
LatentDangerReformTypeEnum
.
addEnumDynamic
(
dic
.
getDictDataDesc
(),
dic
.
getDictDataValue
(),
dic
.
getDictDataKey
()));
dicResult
.
forEach
(
dic
->
LatentDangerReformTypeEnum
.
addEnumDynamic
(
dic
.
getDictDataDesc
(),
dic
.
getDictDataValue
(),
dic
.
getDictDataKey
()));
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/InputItemController.java
View file @
0a43d10f
...
@@ -219,12 +219,9 @@ public class InputItemController extends AbstractBaseController {
...
@@ -219,12 +219,9 @@ public class InputItemController extends AbstractBaseController {
@ApiOperation
(
value
=
"分页查询检查项"
,
notes
=
"分页查询检查项"
)
@ApiOperation
(
value
=
"分页查询检查项"
,
notes
=
"分页查询检查项"
)
@RequestMapping
(
value
=
"/queryItemByPage"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/queryItemByPage"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
POST
)
public
CommonResponse
queryItemByPage
(
public
CommonResponse
queryItemByPage
(
@ApiParam
(
value
=
"组合查询条件"
,
required
=
false
,
defaultValue
=
"[]"
)
@RequestBody
(
required
=
false
)
List
<
CommonRequest
>
queryRequests
,
@ApiParam
(
value
=
"组合查询条件"
,
defaultValue
=
"[]"
)
@RequestBody
(
required
=
false
)
List
<
CommonRequest
>
queryRequests
,
@ApiParam
(
value
=
"分页参数"
,
required
=
false
,
defaultValue
=
"current=0&pageSize=10或pageNumber0&pageSize=10"
)
CommonPageable
pageable
)
{
@ApiParam
(
value
=
"分页参数"
,
defaultValue
=
"current=0&pageSize=10或pageNumber0&pageSize=10"
)
CommonPageable
pageable
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
HashMap
<
String
,
Object
>
paramMap
=
new
HashMap
<>();
String
loginOrgCode
=
getOrgCode
(
reginParams
);
HashMap
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"orgCode"
,
loginOrgCode
);
InputItemPageParam
criterias
=
InputItemParamUtil
.
fillInputItemPageParam
(
queryRequests
,
pageable
,
paramMap
);
InputItemPageParam
criterias
=
InputItemParamUtil
.
fillInputItemPageParam
(
queryRequests
,
pageable
,
paramMap
);
Page
<
InputItemVo
>
page
=
inputItemService
.
queryInputItemByPage
(
criterias
);
Page
<
InputItemVo
>
page
=
inputItemService
.
queryInputItemByPage
(
criterias
);
return
CommonResponseUtil
.
success
(
page
);
return
CommonResponseUtil
.
success
(
page
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanController.java
View file @
0a43d10f
...
@@ -52,13 +52,14 @@ public class PlanController extends AbstractBaseController {
...
@@ -52,13 +52,14 @@ public class PlanController extends AbstractBaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"巡检计划查询"
,
notes
=
"巡检计划查询"
)
@ApiOperation
(
value
=
"巡检计划查询"
,
notes
=
"巡检计划查询"
)
@RequestMapping
(
value
=
"/list"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/list"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
POST
)
@PersonIdentify
public
CommonResponse
qryCheckInfoPage
(
@ApiParam
(
value
=
"查询条件"
,
required
=
false
)
@RequestBody
(
required
=
false
)
List
<
CommonRequest
>
queryRequests
,
public
CommonResponse
qryCheckInfoPage
(
@ApiParam
(
value
=
"查询条件"
,
required
=
false
)
@RequestBody
(
required
=
false
)
List
<
CommonRequest
>
queryRequests
,
@ApiParam
(
value
=
"分页参数"
,
required
=
true
)
CommonPageable
commonPageable
)
{
@ApiParam
(
value
=
"分页参数"
,
required
=
true
)
CommonPageable
commonPageable
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
//
ReginParams reginParams = getSelectedOrgInfo();
String
loginOrgCode
=
getOrgCode
(
reginParams
);
//
String loginOrgCode = getOrgCode(reginParams);
HashMap
<
String
,
Object
>
paramMap
=
buildMybatisCriterias
(
loginOrgCode
,
null
);
//
HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, null);
// buildRequestCxt();
// buildRequestCxt();
PlanInfoPageParam
param
=
PlanPageParamUtil
.
fillPlanInfoParam
(
queryRequests
,
commonPageable
,
paramMap
);
PlanInfoPageParam
param
=
PlanPageParamUtil
.
fillPlanInfoParam
(
queryRequests
,
commonPageable
,
new
HashMap
<>()
);
Page
<
HashMap
<
String
,
Object
>>
list
=
planService
.
getPlanInfo
(
param
);
Page
<
HashMap
<
String
,
Object
>>
list
=
planService
.
getPlanInfo
(
param
);
return
CommonResponseUtil
.
success
(
list
);
return
CommonResponseUtil
.
success
(
list
);
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanTaskController.java
View file @
0a43d10f
...
@@ -15,6 +15,7 @@ import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
...
@@ -15,6 +15,7 @@ import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
import
com.yeejoin.amos.supervision.business.vo.PlanTaskVo
;
import
com.yeejoin.amos.supervision.business.vo.PlanTaskVo
;
import
com.yeejoin.amos.supervision.business.vo.PointInputItemVo
;
import
com.yeejoin.amos.supervision.business.vo.PointInputItemVo
;
import
com.yeejoin.amos.supervision.common.enums.*
;
import
com.yeejoin.amos.supervision.common.enums.*
;
import
com.yeejoin.amos.supervision.core.framework.PersonIdentify
;
import
com.yeejoin.amos.supervision.exception.YeeException
;
import
com.yeejoin.amos.supervision.exception.YeeException
;
import
com.yeejoin.amos.supervision.feign.RemoteSecurityService
;
import
com.yeejoin.amos.supervision.feign.RemoteSecurityService
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -481,6 +482,7 @@ public class PlanTaskController extends AbstractBaseController {
...
@@ -481,6 +482,7 @@ public class PlanTaskController extends AbstractBaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"消防监督任务查询-mobile"
,
notes
=
"根据用户条件查询所有计划任务"
)
@ApiOperation
(
value
=
"消防监督任务查询-mobile"
,
notes
=
"根据用户条件查询所有计划任务"
)
@RequestMapping
(
value
=
"/queryPlanTask"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/queryPlanTask"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
@PersonIdentify
public
ResponseModel
qryLoginUserPlanTask
(
public
ResponseModel
qryLoginUserPlanTask
(
@ApiParam
(
value
=
"人员"
)
@RequestParam
(
value
=
"userId"
,
required
=
false
)
Long
userId
,
@ApiParam
(
value
=
"人员"
)
@RequestParam
(
value
=
"userId"
,
required
=
false
)
Long
userId
,
@ApiParam
(
value
=
"开始日期"
)
@RequestParam
(
value
=
"startTime"
,
required
=
false
)
String
startTime
,
@ApiParam
(
value
=
"开始日期"
)
@RequestParam
(
value
=
"startTime"
,
required
=
false
)
String
startTime
,
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/CheckReportMapper.java
View file @
0a43d10f
...
@@ -4,6 +4,7 @@ package com.yeejoin.amos.supervision.business.dao.mapper;
...
@@ -4,6 +4,7 @@ package com.yeejoin.amos.supervision.business.dao.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.annotations.DataAuth
;
import
com.yeejoin.amos.supervision.business.dto.CheckReportMapperDto
;
import
com.yeejoin.amos.supervision.business.dto.CheckReportMapperDto
;
import
com.yeejoin.amos.supervision.core.common.dto.CheckReportCompanyDto
;
import
com.yeejoin.amos.supervision.core.common.dto.CheckReportCompanyDto
;
import
com.yeejoin.amos.supervision.core.common.dto.CheckReportDto
;
import
com.yeejoin.amos.supervision.core.common.dto.CheckReportDto
;
...
@@ -21,6 +22,7 @@ public interface CheckReportMapper extends BaseMapper<CheckReport> {
...
@@ -21,6 +22,7 @@ public interface CheckReportMapper extends BaseMapper<CheckReport> {
*/
*/
CheckReportMapperDto
queryByPlanTaskId
(
long
id
);
CheckReportMapperDto
queryByPlanTaskId
(
long
id
);
@DataAuth
(
interfacePath
=
"supervision/check/report/page"
)
IPage
<
CheckReportDto
>
selectPageList
(
Page
page
,
@Param
(
"queryParam"
)
CheckReportParamDto
queryParam
);
IPage
<
CheckReportDto
>
selectPageList
(
Page
page
,
@Param
(
"queryParam"
)
CheckReportParamDto
queryParam
);
CheckReportDto
selectDetailById
(
@Param
(
"checkReportId"
)
Long
id
);
CheckReportDto
selectDetailById
(
@Param
(
"checkReportId"
)
Long
id
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/InputItemMapper.java
View file @
0a43d10f
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
dao
.
mapper
;
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
dao
.
mapper
;
import
com.yeejoin.amos.boot.biz.common.annotations.DataAuth
;
import
com.yeejoin.amos.supervision.business.param.InputItemPageParam
;
import
com.yeejoin.amos.supervision.business.param.InputItemPageParam
;
import
com.yeejoin.amos.supervision.business.vo.InputItemVo
;
import
com.yeejoin.amos.supervision.business.vo.InputItemVo
;
import
com.yeejoin.amos.supervision.business.vo.PointInputItemVo
;
import
com.yeejoin.amos.supervision.business.vo.PointInputItemVo
;
...
@@ -17,8 +18,10 @@ public interface InputItemMapper {
...
@@ -17,8 +18,10 @@ public interface InputItemMapper {
List
<
HashMap
<
String
,
Object
>>
countByCatalogId
(
HashMap
<
String
,
Object
>
paramMap
);
List
<
HashMap
<
String
,
Object
>>
countByCatalogId
(
HashMap
<
String
,
Object
>
paramMap
);
@DataAuth
(
interfacePath
=
"api/inputItem/queryItemByPage"
)
long
countInputItemInfoData
(
InputItemPageParam
param
);
long
countInputItemInfoData
(
InputItemPageParam
param
);
@DataAuth
(
interfacePath
=
"api/inputItem/queryItemByPage"
)
List
<
InputItemVo
>
getInputItemInfo
(
InputItemPageParam
param
);
List
<
InputItemVo
>
getInputItemInfo
(
InputItemPageParam
param
);
List
<
InputItemVo
>
getInputItemListByNames
(
@Param
(
"itemNames"
)
String
[]
items
,
@Param
(
"orgCode"
)
String
orgCode
);
List
<
InputItemVo
>
getInputItemListByNames
(
@Param
(
"itemNames"
)
String
[]
items
,
@Param
(
"orgCode"
)
String
orgCode
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanMapper.java
View file @
0a43d10f
...
@@ -3,6 +3,7 @@ package com.yeejoin.amos.supervision.business.dao.mapper;
...
@@ -3,6 +3,7 @@ package com.yeejoin.amos.supervision.business.dao.mapper;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
com.yeejoin.amos.boot.biz.common.annotations.DataAuth
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
com.yeejoin.amos.supervision.business.param.PlanInfoPageParam
;
import
com.yeejoin.amos.supervision.business.param.PlanInfoPageParam
;
...
@@ -26,12 +27,14 @@ public interface PlanMapper extends BaseMapper {
...
@@ -26,12 +27,14 @@ public interface PlanMapper extends BaseMapper {
* @param param
* @param param
* @return
* @return
*/
*/
@DataAuth
(
interfacePath
=
"supervision/api/plan/list"
)
long
countPlanInfoData
(
PlanInfoPageParam
param
);
long
countPlanInfoData
(
PlanInfoPageParam
param
);
/**
/**
* 按照查询巡检计划概要列表
* 按照查询巡检计划概要列表
* @param param
* @param param
* @return
* @return
*/
*/
@DataAuth
(
interfacePath
=
"supervision/api/plan/list"
)
List
<
HashMap
<
String
,
Object
>>
getPlanInfo
(
PlanInfoPageParam
param
);
List
<
HashMap
<
String
,
Object
>>
getPlanInfo
(
PlanInfoPageParam
param
);
/**
/**
* 按照查询巡检计划概不分页
* 按照查询巡检计划概不分页
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanTaskMapper.java
View file @
0a43d10f
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
dao
.
mapper
;
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
dao
.
mapper
;
import
com.yeejoin.amos.boot.biz.common.annotations.DataAuth
;
import
com.yeejoin.amos.supervision.business.entity.mybatis.CheckChkExListBo
;
import
com.yeejoin.amos.supervision.business.entity.mybatis.CheckChkExListBo
;
import
com.yeejoin.amos.supervision.business.entity.mybatis.PlanTaskPointInputItemBo
;
import
com.yeejoin.amos.supervision.business.entity.mybatis.PlanTaskPointInputItemBo
;
import
com.yeejoin.amos.supervision.business.entity.mybatis.PointCheckDetailBo
;
import
com.yeejoin.amos.supervision.business.entity.mybatis.PointCheckDetailBo
;
...
@@ -77,6 +78,7 @@ public interface PlanTaskMapper extends BaseMapper {
...
@@ -77,6 +78,7 @@ public interface PlanTaskMapper extends BaseMapper {
* @param params
* @param params
* @return
* @return
*/
*/
@DataAuth
(
interfacePath
=
"api/planTask/queryPlanTask"
)
List
<
HashMap
<
String
,
Object
>>
getPlanTasks
(
HashMap
<
String
,
Object
>
params
);
List
<
HashMap
<
String
,
Object
>>
getPlanTasks
(
HashMap
<
String
,
Object
>
params
);
/**
/**
...
@@ -153,6 +155,7 @@ public interface PlanTaskMapper extends BaseMapper {
...
@@ -153,6 +155,7 @@ public interface PlanTaskMapper extends BaseMapper {
*/
*/
List
<
CheckChkExListBo
>
getChkExList
(
CheckPtListPageParam
param
);
List
<
CheckChkExListBo
>
getChkExList
(
CheckPtListPageParam
param
);
@DataAuth
(
interfacePath
=
"api/planTask/queryPlanTask"
)
long
getPlanTasksCount
(
HashMap
<
String
,
Object
>
params
);
long
getPlanTasksCount
(
HashMap
<
String
,
Object
>
params
);
Map
<
String
,
Object
>
getPlanTaskStatisticsForApp
(
HashMap
<
String
,
Object
>
params
);
Map
<
String
,
Object
>
getPlanTaskStatisticsForApp
(
HashMap
<
String
,
Object
>
params
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/LatentDangerPatrolItemParam.java
View file @
0a43d10f
...
@@ -5,9 +5,6 @@ import lombok.Data;
...
@@ -5,9 +5,6 @@ import lombok.Data;
/**
/**
* @author keyong
* @author keyong
* @title: LatentDangerPatrolItemParam
* @title: LatentDangerPatrolItemParam
* <pre>
* @description: TODO
* </pre>
* @date 2021/1/26 14:48
* @date 2021/1/26 14:48
*/
*/
@Data
@Data
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/PlanInfoPageParam.java
View file @
0a43d10f
...
@@ -68,6 +68,11 @@ public class PlanInfoPageParam extends CommonPageable {
...
@@ -68,6 +68,11 @@ public class PlanInfoPageParam extends CommonPageable {
*/
*/
private
int
finishStatus
;
private
int
finishStatus
;
/**
* 登录用户id
*/
private
String
loginUserId
;
public
String
getOwnerId
()
{
public
String
getOwnerId
()
{
return
ownerId
;
return
ownerId
;
}
}
...
@@ -155,4 +160,12 @@ public class PlanInfoPageParam extends CommonPageable {
...
@@ -155,4 +160,12 @@ public class PlanInfoPageParam extends CommonPageable {
public
void
setFinishStatus
(
int
finishStatus
)
{
public
void
setFinishStatus
(
int
finishStatus
)
{
this
.
finishStatus
=
finishStatus
;
this
.
finishStatus
=
finishStatus
;
}
}
public
String
getLoginUserId
()
{
return
loginUserId
;
}
public
void
setLoginUserId
(
String
loginUserId
)
{
this
.
loginUserId
=
loginUserId
;
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java
View file @
0a43d10f
...
@@ -12,7 +12,11 @@ import com.yeejoin.amos.boot.biz.common.excel.DataSources;
...
@@ -12,7 +12,11 @@ import com.yeejoin.amos.boot.biz.common.excel.DataSources;
import
com.yeejoin.amos.boot.biz.common.excel.ExcelUtil
;
import
com.yeejoin.amos.boot.biz.common.excel.ExcelUtil
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper
;
import
com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper
;
import
com.yeejoin.amos.supervision.business.dao.repository.*
;
import
com.yeejoin.amos.supervision.business.dao.repository.ICheckInputDao
;
import
com.yeejoin.amos.supervision.business.dao.repository.ICheckShotDao
;
import
com.yeejoin.amos.supervision.business.dao.repository.IHiddenDangerDao
;
import
com.yeejoin.amos.supervision.business.dao.repository.IPlanDao
;
import
com.yeejoin.amos.supervision.business.dao.repository.IPointDao
;
import
com.yeejoin.amos.supervision.business.dto.HiddenDangerDto
;
import
com.yeejoin.amos.supervision.business.dto.HiddenDangerDto
;
import
com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDataDto
;
import
com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDataDto
;
import
com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto
;
import
com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto
;
...
@@ -23,7 +27,11 @@ import com.yeejoin.amos.supervision.common.enums.CheckTypeSuEnum;
...
@@ -23,7 +27,11 @@ import com.yeejoin.amos.supervision.common.enums.CheckTypeSuEnum;
import
com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum
;
import
com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum
;
import
com.yeejoin.amos.supervision.common.enums.DangerHandleTypeEnum
;
import
com.yeejoin.amos.supervision.common.enums.DangerHandleTypeEnum
;
import
com.yeejoin.amos.supervision.core.common.dto.DangerDto
;
import
com.yeejoin.amos.supervision.core.common.dto.DangerDto
;
import
com.yeejoin.amos.supervision.dao.entity.*
;
import
com.yeejoin.amos.supervision.dao.entity.CheckInput
;
import
com.yeejoin.amos.supervision.dao.entity.CheckShot
;
import
com.yeejoin.amos.supervision.dao.entity.HiddenDanger
;
import
com.yeejoin.amos.supervision.dao.entity.Plan
;
import
com.yeejoin.amos.supervision.dao.entity.Point
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
@@ -33,7 +41,12 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
...
@@ -33,7 +41,12 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import
org.typroject.tyboot.core.restful.exception.instance.DataNotFound
;
import
org.typroject.tyboot.core.restful.exception.instance.DataNotFound
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.*
;
import
java.util.Collections
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.function.Function
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -274,6 +287,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
...
@@ -274,6 +287,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
result
.
put
(
"accompanyingUserName"
,
plan
.
getLeadPeopleNames
());
result
.
put
(
"accompanyingUserName"
,
plan
.
getLeadPeopleNames
());
result
.
put
(
"checkUnitId"
,
plan
.
getCheckUnitId
());
result
.
put
(
"checkUnitId"
,
plan
.
getCheckUnitId
());
result
.
put
(
"checkUnitName"
,
plan
.
getCheckUnitName
());
result
.
put
(
"checkUnitName"
,
plan
.
getCheckUnitName
());
result
.
put
(
"leadPeopleId"
,
plan
.
getLeadPeopleIds
());
result
.
put
(
"leadPeopleName"
,
plan
.
getLeadPeopleNames
());
this
.
buildCheckInfo
(
result
,
hiddenDangerDto
.
getCheckInputId
());
this
.
buildCheckInfo
(
result
,
hiddenDangerDto
.
getCheckInputId
());
return
result
;
return
result
;
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java
View file @
0a43d10f
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.toolkit.Sequence
;
import
com.baomidou.mybatisplus.core.toolkit.Sequence
;
...
@@ -7,6 +8,8 @@ import com.google.common.base.Joiner;
...
@@ -7,6 +8,8 @@ import com.google.common.base.Joiner;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum
;
import
com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum
;
import
com.yeejoin.amos.boot.biz.common.service.IWorkflowExcuteService
;
import
com.yeejoin.amos.boot.biz.common.service.IWorkflowExcuteService
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService
;
import
com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.supervision.business.constants.XJConstant
;
import
com.yeejoin.amos.supervision.business.constants.XJConstant
;
...
@@ -99,8 +102,14 @@ public class PlanServiceImpl implements IPlanService {
...
@@ -99,8 +102,14 @@ public class PlanServiceImpl implements IPlanService {
@Autowired
@Autowired
private
IPlanAuditLogDao
planAuditLogDao
;
private
IPlanAuditLogDao
planAuditLogDao
;
@Autowired
RedisUtils
redisUtils
;
@Override
@Override
public
Page
<
HashMap
<
String
,
Object
>>
getPlanInfo
(
PlanInfoPageParam
param
)
{
public
Page
<
HashMap
<
String
,
Object
>>
getPlanInfo
(
PlanInfoPageParam
param
)
{
ReginParams
reginParam
=
JSON
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
()
,
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
param
.
setLoginUserId
(
reginParam
.
getPersonIdentity
().
getPersonSeq
());
long
total
=
planMapper
.
countPlanInfoData
(
param
);
long
total
=
planMapper
.
countPlanInfoData
(
param
);
Set
<
String
>
userIds
=
new
HashSet
<>();
Set
<
String
>
userIds
=
new
HashSet
<>();
List
<
HashMap
<
String
,
Object
>>
content
=
planMapper
.
getPlanInfo
(
param
);
List
<
HashMap
<
String
,
Object
>>
content
=
planMapper
.
getPlanInfo
(
param
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java
View file @
0a43d10f
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
supervision
.
business
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.beust.jcommander.internal.Sets
;
import
com.beust.jcommander.internal.Sets
;
import
com.google.common.base.Joiner
;
import
com.google.common.base.Joiner
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.DepartmentModel
;
import
com.yeejoin.amos.feign.privilege.model.DepartmentModel
;
import
com.yeejoin.amos.supervision.business.constants.XJConstant
;
import
com.yeejoin.amos.supervision.business.constants.XJConstant
;
...
@@ -54,6 +58,7 @@ import org.springframework.stereotype.Service;
...
@@ -54,6 +58,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
java.text.ParseException
;
import
java.text.ParseException
;
...
@@ -105,6 +110,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
...
@@ -105,6 +110,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired
@Autowired
private
RulePlanService
rulePlanService
;
private
RulePlanService
rulePlanService
;
@Autowired
RedisUtils
redisUtils
;
@Override
@Override
public
Page
<
HashMap
<
String
,
Object
>>
getPlanTaskInfo
(
PlanTaskPageParam
params
)
{
public
Page
<
HashMap
<
String
,
Object
>>
getPlanTaskInfo
(
PlanTaskPageParam
params
)
{
long
total
=
planTaskMapper
.
countPlanTask
(
params
);
long
total
=
planTaskMapper
.
countPlanTask
(
params
);
...
@@ -592,6 +600,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
...
@@ -592,6 +600,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Override
@Override
public
Page
<
HashMap
<
String
,
Object
>>
getPlanTasks
(
HashMap
<
String
,
Object
>
params
,
CommonPageable
pageParam
)
{
public
Page
<
HashMap
<
String
,
Object
>>
getPlanTasks
(
HashMap
<
String
,
Object
>
params
,
CommonPageable
pageParam
)
{
List
<
HashMap
<
String
,
Object
>>
content
=
Lists
.
newArrayList
();
List
<
HashMap
<
String
,
Object
>>
content
=
Lists
.
newArrayList
();
ReginParams
reginParam
=
JSON
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
()
,
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
params
.
put
(
"loginUserId"
,
reginParam
.
getPersonIdentity
().
getPersonSeq
());
long
total
=
planTaskMapper
.
getPlanTasksCount
(
params
);
long
total
=
planTaskMapper
.
getPlanTasksCount
(
params
);
if
(
total
==
0
)
{
if
(
total
==
0
)
{
return
new
PageImpl
<>(
content
,
pageParam
,
total
);
return
new
PageImpl
<>(
content
,
pageParam
,
total
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/InputItemParamUtil.java
View file @
0a43d10f
...
@@ -67,7 +67,6 @@ public class InputItemParamUtil {
...
@@ -67,7 +67,6 @@ public class InputItemParamUtil {
}
}
}
}
}
}
param
.
setOrgCode
(
perMap
.
get
(
"orgCode"
).
toString
());
if
(
commonPageable
!=
null
)
{
if
(
commonPageable
!=
null
)
{
param
.
setOffset
(
Integer
.
parseInt
(
String
.
valueOf
(
commonPageable
.
getOffset
())));
param
.
setOffset
(
Integer
.
parseInt
(
String
.
valueOf
(
commonPageable
.
getOffset
())));
param
.
setPageNumber
(
commonPageable
.
getPageNumber
());
param
.
setPageNumber
(
commonPageable
.
getPageNumber
());
...
...
amos-boot-system-latentdanger/src/main/resources/application.properties
View file @
0a43d10f
...
@@ -60,4 +60,5 @@ pagehelper.support-methods-arguments=true
...
@@ -60,4 +60,5 @@ pagehelper.support-methods-arguments=true
feign.httpclient.connection-timeout
=
5000
feign.httpclient.connection-timeout
=
5000
video.fegin.name
=
video
video.fegin.name
=
video
latentDanger.feign.name
=
AMOS-LATENT-DANGER
latentDanger.feign.name
=
AMOS-LATENT-DANGER
\ No newline at end of file
Knowledgebase.fegin.name
=
AMOS-API-KNOWLEDGEBASE
\ No newline at end of file
amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml
View file @
0a43d10f
...
@@ -963,10 +963,6 @@
...
@@ -963,10 +963,6 @@
<where>
<where>
deleted = 0
deleted = 0
<foreach
collection=
"paramMap"
index=
"key"
item=
"value"
>
<foreach
collection=
"paramMap"
index=
"key"
item=
"value"
>
<if
test=
"key == 'orgCode' and value != null and value != ''"
>
and (a.org_code like concat(#{value}, "*%") or a.org_code like concat(#{value}, "-%") or
a.org_code = #{value})
</if>
<if
test=
"key == 'bizType' and value != null and value != ''"
>
<if
test=
"key == 'bizType' and value != null and value != ''"
>
and a.biz_type = #{value}
and a.biz_type = #{value}
</if>
</if>
...
@@ -1021,6 +1017,12 @@
...
@@ -1021,6 +1017,12 @@
<if
test=
"key == 'endDeadline' and value != null and value != ''"
>
<if
test=
"key == 'endDeadline' and value != null and value != ''"
>
and a.reform_limit_date
<![CDATA[ <= ]]>
#{value}
and a.reform_limit_date
<![CDATA[ <= ]]>
#{value}
</if>
</if>
<if
test=
"key == 'leadPeopleId' and value != null and value != ''"
>
and ( 1=1 or a.biz_info->'$.leadPeopleId' = #{value})
</if>
<if
test=
"key == 'reformLeaderId' and value != null and value != ''"
>
and ( 1=1 or a.reform_json->'$.reformLeaderId' = #{value})
</if>
</foreach>
</foreach>
</where>
</where>
<if
test=
"paramMap.order != null and paramMap.order == 1"
>
<if
test=
"paramMap.order != null and paramMap.order == 1"
>
...
...
amos-boot-system-supervision/src/main/resources/application-dev.properties
View file @
0a43d10f
...
@@ -46,9 +46,9 @@ linux.img.path = /
...
@@ -46,9 +46,9 @@ linux.img.path = /
## emqx
## emqx
emqx.clean-session
=
true
emqx.clean-session
=
true
emqx.client-id
=
${spring.application.name}-${random.int[1024,65536]}-1
emqx.client-id
=
${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker
=
tcp://172.16.1
1.33
:1883
emqx.broker
=
tcp://172.16.1
0.85
:1883
emqx.user-name
=
admin
emqx.user-name
=
super
emqx.password
=
public
emqx.password
=
a123456
emqx.max-inflight
=
1000
emqx.max-inflight
=
1000
file.url
=
http://39.98.45.134:9000/
file.url
=
http://39.98.45.134:9000/
\ No newline at end of file
amos-boot-system-supervision/src/main/resources/db/mapper/CheckReportMapper.xml
View file @
0a43d10f
...
@@ -55,9 +55,6 @@
...
@@ -55,9 +55,6 @@
<if
test=
"queryParam != null and queryParam.checkUser != null and queryParam.checkUser != ''"
>
<if
test=
"queryParam != null and queryParam.checkUser != null and queryParam.checkUser != ''"
>
and cr.check_user like concat('%', #{queryParam.checkUser}, '%')
and cr.check_user like concat('%', #{queryParam.checkUser}, '%')
</if>
</if>
<if
test=
"queryParam != null and queryParam.orgCode != null and queryParam.orgCode != ''"
>
and cr.org_code like concat(#{queryParam.orgCode}, '%')
</if>
</where>
</where>
order by cr.create_date desc
order by cr.create_date desc
</select>
</select>
...
...
amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan.xml
View file @
0a43d10f
...
@@ -118,25 +118,24 @@
...
@@ -118,25 +118,24 @@
p_route b
p_route b
WHERE
WHERE
a.route_Id = b.id and a.is_delete = 0
a.route_Id = b.id and a.is_delete = 0
<if
test=
"planName!=null"
>
and a.name like concat(concat("%",#{planName}),"%")
</if>
<if
test=
"planName!=null"
>
and a.name like concat(concat("%",#{planName}),"%")
</if>
<if
test=
"checkTypeId!=null and checkTypeId != '' "
>
and a.check_type_id = #{checkTypeId}
</if>
<if
test=
"checkTypeId!=null and checkTypeId != '' "
>
and a.check_type_id = #{checkTypeId}
</if>
<if
test=
"leadPerson!=null and leadPerson != '' "
>
and a.lead_people_ids = #{leadPerson}
</if>
<if
test=
"leadPerson!=null and leadPerson != '' "
>
and a.lead_people_ids = #{leadPerson}
</if>
<if
test=
"routeId!=null"
>
and a.route_Id = #{routeId}
</if>
<if
test=
"routeId!=null"
>
and a.route_Id = #{routeId}
</if>
<if
test=
"remark!=null"
>
and a.remark1 like concat(concat("%",#{remark}),"%")
</if>
<if
test=
"remark!=null"
>
and a.remark1 like concat(concat("%",#{remark}),"%")
</if>
<if
test=
"userId!=null"
>
and FIND_IN_SET(#{userId},a.user_id)
</if>
<if
test=
"userId!=null"
>
and FIND_IN_SET(#{userId},a.user_id)
</if>
<if
test=
"orgCode!=null"
>
and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat
<!-- <if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat-->
(#{orgCode},"-%") or a.org_Code= #{orgCode})
</if
>
<!-- (#{orgCode},"-%") or a.org_Code= #{orgCode})</if>--
>
<if
test=
"ownerId!=null"
>
and b.owner_id = #{ownerId}
</if>
<if
test=
"ownerId!=null"
>
and b.owner_id = #{ownerId}
</if>
<if
test=
"planStatus!=null and planStatus != '' "
>
and a.`status` = #{planStatus}
</if>
<if
test=
"planStatus!=null and planStatus != '' "
>
and a.`status` = #{planStatus}
</if>
</select>
</select>
<!--巡检计划查询 -->
<!--巡检计划查询 -->
<select
id=
"getPlanInfo"
resultType=
"java.util.HashMap"
>
<select
id=
"getPlanInfo"
resultType=
"java.util.HashMap"
>
SELECT
SELECT
a.id,a.name ,
a.id,a.name ,
IFNULL(a.plan_begin,""
) planBegin,
IFNULL(a.plan_begin,''
) planBegin,
a.`status`,
a.`status`,
IFNULL(a.plan_end,"") planEnd,
IFNULL(a.plan_end,'') planEnd,
a.plan_end planEnd,
a.plan_type planType,
a.plan_type planType,
b.name routeName,
b.name routeName,
a.route_id routeId,
a.route_id routeId,
...
@@ -174,8 +173,8 @@
...
@@ -174,8 +173,8 @@
<if
test=
"routeId!=null"
>
and a.route_Id = #{routeId}
</if>
<if
test=
"routeId!=null"
>
and a.route_Id = #{routeId}
</if>
<if
test=
"remark!=null"
>
and a.remark1 like concat(concat("%",#{remark}),"%")
</if>
<if
test=
"remark!=null"
>
and a.remark1 like concat(concat("%",#{remark}),"%")
</if>
<if
test=
"userId!=null"
>
and FIND_IN_SET(#{userId},a.user_id)
</if>
<if
test=
"userId!=null"
>
and FIND_IN_SET(#{userId},a.user_id)
</if>
<
if
test=
"orgCode!=null"
>
and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat
<
!-- <if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat-->
(#{orgCode},"-%")or a.org_Code= #{orgCode})
</if
>
<!-- (#{orgCode},"-%")or a.org_Code= #{orgCode})</if>--
>
<if
test=
"ownerId!=null"
>
and b.owner_id = #{ownerId}
</if>
<if
test=
"ownerId!=null"
>
and b.owner_id = #{ownerId}
</if>
<if
test=
"planStatus!=null and planStatus != '' "
>
and a.`status` = #{planStatus}
</if>
<if
test=
"planStatus!=null and planStatus != '' "
>
and a.`status` = #{planStatus}
</if>
order by a.id desc
order by a.id desc
...
...
amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @
0a43d10f
...
@@ -187,24 +187,16 @@
...
@@ -187,24 +187,16 @@
(SELECT
(SELECT
pt.id planTaskId,
pt.id planTaskId,
pt.org_code orgCode,
pt.org_code orgCode,
pt.org_code,
p.name taskName,
p.name taskName,
p.check_type_name checkTypeName,
p.check_type_name checkTypeName,
P.check_type_id checkTypeId,
P.check_type_id checkTypeId,
p.id planId,
p.id planId,
pt.status,
pt.status,
pt.user_id userId,
pt.user_id userId,
date_format(
date_format(pt.begin_time, '%Y-%m-%d %H:%i:%s') beginTime,
pt.begin_time,
date_format(pt.end_time, '%Y-%m-%d %H:%i:%s') endTime,
'%Y-%m-%d %H:%i:%s'
date_format(pt.check_date,'%Y-%m-%d %H:%i:%s') checkDate,
) beginTime,
date_format(
pt.end_time,
'%Y-%m-%d %H:%i:%s'
) endTime,
date_format(
pt.check_date,
'%Y-%m-%d %H:%i:%s'
) checkDate,
pt.point_num as taskPlanNum,
pt.point_num as taskPlanNum,
pt.finish_num finishNum,
pt.finish_num finishNum,
(pt.point_num - pt.finish_num) as waitNum,
(pt.point_num - pt.finish_num) as waitNum,
...
...
pom.xml
View file @
0a43d10f
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<springcloud.version>
Hoxton.SR8
</springcloud.version>
<springcloud.version>
Hoxton.SR8
</springcloud.version>
<maven-jar-plugin.version>
3.1.1
</maven-jar-plugin.version>
<maven-jar-plugin.version>
3.1.1
</maven-jar-plugin.version>
<tyboot-version>
1.1.20
</tyboot-version>
<tyboot-version>
1.1.20
</tyboot-version>
<amos.version>
1.6.
5
-SNAPSHOT
</amos.version>
<amos.version>
1.6.
6
-SNAPSHOT
</amos.version>
<itext.version>
7.1.1
</itext.version>
<itext.version>
7.1.1
</itext.version>
</properties>
</properties>
...
...
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