Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
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
常超
map-parent
Commits
cda0bf13
Commit
cda0bf13
authored
Jul 03, 2023
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预警模型调整
parent
2217fab3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
72 additions
and
16 deletions
+72
-16
service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/WarningController.java
+63
-7
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/DataStatisticsMapperCqxz.xml
+9
-9
No files found.
service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/WarningController.java
View file @
cda0bf13
...
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
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.founder.commonutils.model.newPublicEntity.CodeYymc.SkCodeYymc
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarning
;
import
com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarning
;
import
com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarningRule
;
import
com.founder.commonutils.model.newPublicEntity.WarningEntity.SkWarningRule
;
...
@@ -453,11 +452,70 @@ public class WarningController {
...
@@ -453,11 +452,70 @@ public class WarningController {
wrapper1
.
eq
(
"isdeleted"
,
"0"
);
wrapper1
.
eq
(
"isdeleted"
,
"0"
);
SkWarningRule
skWarningRule
=
warningRuleMapper
.
selectOne
(
wrapper1
);
SkWarningRule
skWarningRule
=
warningRuleMapper
.
selectOne
(
wrapper1
);
WaringVo
waringVo
=
new
WaringVo
();
WaringVo
waringVo
=
new
WaringVo
();
BeanUtils
.
copyProperties
(
s
,
waringVo
);
//获取class对象
Class
<?>
aClass
=
null
;
WaringVo
bean
=
null
;
//实例化对象
try
{
aClass
=
Class
.
forName
(
waringVo
.
getClass
().
getCanonicalName
());
bean
=
(
WaringVo
)
aClass
.
newInstance
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
// 动态set指定字段值 图例描述字段
if
(
StringUtils
.
isNotBlank
(
skWarningRule
.
getTlms
())){
if
(
skWarningRule
.
getTlms
().
contains
(
","
)){
String
tlms
[]
=
skWarningRule
.
getTlms
().
split
(
","
);
Integer
i
=
1
;
for
(
String
c
:
tlms
)
{
try
{
//遍历所有方法
PropertyDescriptor
descriptor
=
new
PropertyDescriptor
(
"tlms"
+
i
,
aClass
);
//得到set方法
Method
setMethod
=
descriptor
.
getWriteMethod
();
//执行set方法
setMethod
.
invoke
(
bean
,
c
);
i
++;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
else
{
bean
.
setTlms1
(
skWarningRule
.
getTlms
());
}
}
// 动态set指定字段值 图例描述字段
if
(
StringUtils
.
isNotBlank
(
skWarningRule
.
getTlys
())){
if
(
skWarningRule
.
getTlys
().
contains
(
","
)){
String
tlys
[]
=
skWarningRule
.
getTlys
().
split
(
"\\),"
);
Integer
i
=
1
;
for
(
String
c
:
tlys
)
{
try
{
//遍历所有方法
PropertyDescriptor
descriptor
=
new
PropertyDescriptor
(
"tlys"
+
i
,
aClass
);
//得到set方法
Method
setMethod
=
descriptor
.
getWriteMethod
();
//执行set方法
if
(
tlys
.
length
==
i
){
setMethod
.
invoke
(
bean
,
c
);
}
else
{
setMethod
.
invoke
(
bean
,
c
+
")"
);
}
i
++;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
else
{
bean
.
setTlys1
(
skWarningRule
.
getTlys
());
}
}
BeanUtils
.
copyProperties
(
s
,
bean
);
if
(
skWarningRule
!=
null
){
if
(
skWarningRule
!=
null
){
BeanUtils
.
copyProperties
(
skWarningRule
,
waringVo
);
BeanUtils
.
copyProperties
(
skWarningRule
,
bean
);
}
}
re
.
add
(
waringVo
);
re
.
add
(
bean
);
});
});
return
new
MapRestResult
(
200
,
"ok"
,
iPage
.
getTotal
(),
re
);
return
new
MapRestResult
(
200
,
"ok"
,
iPage
.
getTotal
(),
re
);
...
@@ -466,7 +524,7 @@ public class WarningController {
...
@@ -466,7 +524,7 @@ public class WarningController {
@PostMapping
(
"DetialBymxbh"
)
@PostMapping
(
"DetialBymxbh"
)
@ApiOperation
(
value
=
"模型和规则详情"
)
@ApiOperation
(
value
=
"模型和规则详情"
)
//
@OperLog(message = "模型和规则详情", operation = OperationType.QUERY)
@OperLog
(
message
=
"模型和规则详情"
,
operation
=
OperationType
.
QUERY
)
public
MapRestResult
DetialBymxbh
(
@RequestBody
WaringVo
waringVo
){
public
MapRestResult
DetialBymxbh
(
@RequestBody
WaringVo
waringVo
){
QueryWrapper
<
SkWarning
>
wrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
SkWarning
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
StringUtils
.
isNotEmpty
(
waringVo
.
getMxbh
()),
"mxbh"
,
waringVo
.
getMxbh
());
wrapper
.
eq
(
StringUtils
.
isNotEmpty
(
waringVo
.
getMxbh
()),
"mxbh"
,
waringVo
.
getMxbh
());
...
@@ -503,7 +561,6 @@ public class WarningController {
...
@@ -503,7 +561,6 @@ public class WarningController {
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
System
.
out
.
println
(
c
);
}
}
}
else
{
}
else
{
bean
.
setTlms1
(
skWarningRule
.
getTlms
());
bean
.
setTlms1
(
skWarningRule
.
getTlms
());
...
@@ -531,7 +588,6 @@ public class WarningController {
...
@@ -531,7 +588,6 @@ public class WarningController {
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
System
.
out
.
println
(
c
);
}
}
}
else
{
}
else
{
bean
.
setTlys1
(
skWarningRule
.
getTlys
());
bean
.
setTlys1
(
skWarningRule
.
getTlys
());
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/DataStatisticsMapperCqxz.xml
View file @
cda0bf13
...
@@ -67,14 +67,14 @@
...
@@ -67,14 +67,14 @@
SELECT COUNT(*) AS "num",xzqhdm as "xzqhdm",(select name from sys_dictitem where groupID='CODE_XZQH' AND
SELECT COUNT(*) AS "num",xzqhdm as "xzqhdm",(select name from sys_dictitem where groupID='CODE_XZQH' AND
CODE=xzqhdm and scbz = '0') as "xzqhMc"
CODE=xzqhdm and scbz = '0') as "xzqhMc"
FROM (
FROM (
select a.ASJBH,
substr(a.LADW_GAJGJGDM,0
,6) as xzqhdm
select a.ASJBH,
LEFT(a.LADW_GAJGJGDM
,6) as xzqhdm
from tb_st_asj a
inner
join tb_xw_zczj b on a.asjbh=b.asjbh where a.xxsc_pdbz='0'
from tb_st_asj a join tb_xw_zczj b on a.asjbh=b.asjbh where a.xxsc_pdbz='0'
and a.LARQ
<![CDATA[>=]]>
to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.LARQ
<![CDATA[>=]]>
str_
to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.LARQ
<![CDATA[<=]]>
to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and a.LARQ
<![CDATA[<=]]>
str_
to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ
<![CDATA[>=]]>
to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ
<![CDATA[>=]]>
str_
to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ
<![CDATA[<=]]>
to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and a.ASJFSSJ_ASJFSKSSJ
<![CDATA[<=]]>
str_
to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01
<![CDATA[>=]]>
to_date( #{startTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01
<![CDATA[>=]]>
str_
to_date( #{startTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01
<![CDATA[<=]]>
to_date(#{endTime},'%Y-%m-%d %H:%i:%s')
and b.ZCZJ_ZXSJ01
<![CDATA[<=]]>
str_
to_date(#{endTime},'%Y-%m-%d %H:%i:%s')
<if
test=
"xzqhdm!=null and xzqhdm!=''"
>
<if
test=
"xzqhdm!=null and xzqhdm!=''"
>
and LADW_GAJGJGDM LIKE concat(#{xzqhdm},'%')
and LADW_GAJGJGDM LIKE concat(#{xzqhdm},'%')
</if>
</if>
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
<if
test=
"ajlbdm!=null and ajlbdm!=''"
>
<if
test=
"ajlbdm!=null and ajlbdm!=''"
>
and AJLBDM in (${ajlbdm})
and AJLBDM in (${ajlbdm})
</if>
</if>
)
)
s
group by xzqhdm
group by xzqhdm
</select>
</select>
<select
id=
"selectXzqhdmBycq"
resultType=
"com.founder.commonutils.model.newPublicEntity.SysDictitem"
>
<select
id=
"selectXzqhdmBycq"
resultType=
"com.founder.commonutils.model.newPublicEntity.SysDictitem"
>
...
...
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