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
06416969
Commit
06416969
authored
Apr 23, 2023
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据统计(五色)
parent
6976236c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
102 additions
and
3 deletions
+102
-3
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/WarningEntity/DataStatisticsParams.java
+3
-0
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/WarningEntity/WaringVo.java
+20
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/WarningController.java
+32
-3
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
+3
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/DataStatisticsMapperCqxz.java
+4
-0
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/DataStatisticsMapperCqxz.xml
+40
-0
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/DataStatisticsServiceImpl.java
+0
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/WarningEntity/DataStatisticsParams.java
View file @
06416969
...
@@ -41,5 +41,8 @@ public class DataStatisticsParams {
...
@@ -41,5 +41,8 @@ public class DataStatisticsParams {
private
String
tlms
;
private
String
tlms
;
//图例颜色
//图例颜色
private
String
tlys
;
private
String
tlys
;
//统计计算(选择环比或者同比)
private
String
tjjs
;
}
}
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/WarningEntity/WaringVo.java
View file @
06416969
...
@@ -161,4 +161,24 @@ public class WaringVo implements Serializable {
...
@@ -161,4 +161,24 @@ public class WaringVo implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
endTime
;
private
String
endTime
;
@TableField
(
exist
=
false
)
private
String
tlms1
;
@TableField
(
exist
=
false
)
private
String
tlys1
;
@TableField
(
exist
=
false
)
private
String
tlms2
;
@TableField
(
exist
=
false
)
private
String
tlys2
;
@TableField
(
exist
=
false
)
private
String
tlms3
;
@TableField
(
exist
=
false
)
private
String
tlys3
;
@TableField
(
exist
=
false
)
private
String
tlms4
;
@TableField
(
exist
=
false
)
private
String
tlys4
;
@TableField
(
exist
=
false
)
private
String
tlms5
;
@TableField
(
exist
=
false
)
private
String
tlys5
;
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/WarningController.java
View file @
06416969
...
@@ -25,8 +25,7 @@ import org.springframework.data.redis.core.RedisTemplate;
...
@@ -25,8 +25,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.*
;
import
java.util.*
;
import
java.util.regex.Matcher
;
import
java.util.stream.Collectors
;
import
java.util.regex.Pattern
;
@RestController
@RestController
...
@@ -322,13 +321,43 @@ public class WarningController {
...
@@ -322,13 +321,43 @@ public class WarningController {
skWarningRule
.
setLrsj
(
new
Date
());
skWarningRule
.
setLrsj
(
new
Date
());
skWarningRule
.
setGxsj
(
new
Date
());
skWarningRule
.
setGxsj
(
new
Date
());
skWarningRule
.
setIsdeleted
(
"0"
);
skWarningRule
.
setIsdeleted
(
"0"
);
ArrayList
<
String
>
ms
=
new
ArrayList
<>();
//描述和颜色
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlms1
())){
ms
.
add
(
waringVo
.
getTlms1
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlms2
())){
ms
.
add
(
waringVo
.
getTlms2
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlms3
())){
ms
.
add
(
waringVo
.
getTlms3
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlms4
())){
ms
.
add
(
waringVo
.
getTlms4
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlms5
())){
ms
.
add
(
waringVo
.
getTlms5
());
}
String
result
=
ms
.
stream
().
collect
(
Collectors
.
joining
(
","
));
skWarningRule
.
setTlms
(
result
);
ArrayList
<
String
>
ys
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlys1
())){
ys
.
add
(
waringVo
.
getTlys1
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlys2
())){
ys
.
add
(
waringVo
.
getTlys2
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlys3
())){
ys
.
add
(
waringVo
.
getTlys3
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlys4
())){
ys
.
add
(
waringVo
.
getTlys4
());
}
if
(
StringUtils
.
isNotEmpty
(
waringVo
.
getTlys5
())){
ys
.
add
(
waringVo
.
getTlys5
());
}
String
result1
=
ys
.
stream
().
collect
(
Collectors
.
joining
(
","
));
skWarningRule
.
setTlys
(
result1
);
int
insert1
=
warningRuleMapper
.
insert
(
skWarningRule
);
int
insert1
=
warningRuleMapper
.
insert
(
skWarningRule
);
return
new
MapRestResult
(
200
,
"ok"
,
null
);
return
new
MapRestResult
(
200
,
"ok"
,
null
);
}
}
@PostMapping
(
"DeletemxAndGz"
)
@PostMapping
(
"DeletemxAndGz"
)
@ApiOperation
(
value
=
"删除模型和规则"
)
@ApiOperation
(
value
=
"删除模型和规则"
)
@OperLog
(
message
=
"删除模型和规则"
,
operation
=
OperationType
.
QUERY
)
@OperLog
(
message
=
"删除模型和规则"
,
operation
=
OperationType
.
QUERY
)
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
View file @
06416969
...
@@ -322,6 +322,9 @@ public class HnTbStRygxController {
...
@@ -322,6 +322,9 @@ public class HnTbStRygxController {
}
}
//团伙信息集合
//团伙信息集合
List
<
Map
<
String
,
Object
>>
rythInfoList
=
(
List
<
Map
<
String
,
Object
>>)
redisTemplate
.
opsForValue
().
get
(
username
+
":"
+
taskId
+
":"
+
TEAM_KEY
+
teamNum
);
List
<
Map
<
String
,
Object
>>
rythInfoList
=
(
List
<
Map
<
String
,
Object
>>)
redisTemplate
.
opsForValue
().
get
(
username
+
":"
+
taskId
+
":"
+
TEAM_KEY
+
teamNum
);
if
(
rythInfoList
.
size
()==
0
){
return
new
MapRestResult
(
200
,
"暂无数据"
,
null
);
}
//指定团伙集合
//指定团伙集合
List
<
Map
<
String
,
Object
>>
rythInfoByIdList
=
new
ArrayList
<>();
List
<
Map
<
String
,
Object
>>
rythInfoByIdList
=
new
ArrayList
<>();
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/DataStatisticsMapperCqxz.java
View file @
06416969
...
@@ -12,6 +12,7 @@ public interface DataStatisticsMapperCqxz {
...
@@ -12,6 +12,7 @@ public interface DataStatisticsMapperCqxz {
Map
getYearMonthLaDount
(
DataStatisticsParams
params
);
Map
getYearMonthLaDount
(
DataStatisticsParams
params
);
//同比
List
<
Map
<
String
,
Object
>>
getXzqhLaCount
(
DataStatisticsParams
params
);
List
<
Map
<
String
,
Object
>>
getXzqhLaCount
(
DataStatisticsParams
params
);
List
<
SysDictitem
>
selectXzqhdmBycq
();
List
<
SysDictitem
>
selectXzqhdmBycq
();
...
@@ -22,4 +23,7 @@ public interface DataStatisticsMapperCqxz {
...
@@ -22,4 +23,7 @@ public interface DataStatisticsMapperCqxz {
//如果是父级 获取所有pid为父级代码的code
//如果是父级 获取所有pid为父级代码的code
List
<
String
>
getCodeList
(
String
code
,
String
type
);
List
<
String
>
getCodeList
(
String
code
,
String
type
);
//环比
List
<
Map
<
String
,
Object
>>
getQYLaCDount
(
DataStatisticsParams
params
);
}
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/DataStatisticsMapperCqxz.xml
View file @
06416969
...
@@ -92,4 +92,43 @@
...
@@ -92,4 +92,43 @@
</if>
</if>
</select>
</select>
<!--区域立案数-->
<select
id=
"getQYLaCDount"
resultType=
"java.util.Map"
parameterType=
"com.founder.commonutils.model.newPublicEntity.WarningEntity.DataStatisticsParams"
>
SELECT COUNT(*) AS "num",xzqhdm as "xzqhdm",(select name from sys_dictitem where groupID='CODE_XZQH' AND
CODE=xzqhdm and scbz = '0') as "xzqhMc"
FROM (
select a.ASJBH,LEFT(a.LADW_GAJGJGDM,6) as xzqhdm
from tb_st_asj a where a.xxsc_pdbz='0'
and ASJFSSJ_ASJFSKSSJ
<![CDATA[>=]]>
str_to_date(#{xaStartTime},'%Y-%m-%d %H:%i:%s')
and ASJFSSJ_ASJFSKSSJ
<![CDATA[<=]]>
str_to_date(#{xaEndTime},'%Y-%m-%d %H:%i:%s')
and larq
<![CDATA[>=]]>
str_to_date(#{startTime},'%Y-%m-%d %H:%i:%s')
and larq
<![CDATA[<=]]>
str_to_date(#{endTime},'%Y-%m-%d %H:%i:%s')
<if
test=
"xzqhdm!=null and xzqhdm!=''"
>
and LADW_GAJGJGDM LIKE #{xzqhdm} || '%'
</if>
<if
test=
"ajztdm!=null and ajztdm!=''"
>
and zcjddm in (${ajztdm})
</if>
<if
test=
"xzlb!=null and xzlb!=''"
>
and ZATZ_JYQK in (${xzlb})
</if>
<if
test=
"ajlbdm!=null and ajlbdm!=''"
>
and AJLBDM in (${ajlbdm})
</if>
) s
group by xzqhdm
</select>
<!-- 根据截取的代码模糊查询所有code-->
<select
id=
"getCodeList2"
resultType=
"java.lang.String"
>
select CODE from sys_dictitem
where scbz='0'
<if
test=
"type!=null and type!=''"
>
AND GROUPID = #{ type , jdbcType=VARCHAR }
</if>
<if
test=
"code!=null and code!=''"
>
AND CODE like concat( #{ code , jdbcType=VARCHAR },'%')
</if>
</select>
</mapper>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/DataStatisticsServiceImpl.java
View file @
06416969
This diff is collapsed.
Click to expand it.
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