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
28e7dd90
Commit
28e7dd90
authored
Nov 15, 2023
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bz-关键词添加标签定时、小案类别替换、时间处理
parent
2cdd9413
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
42 deletions
+34
-42
common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/TbStAsj.java
+9
-6
common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/TbXwAsjbzKeyword.java
+3
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/WarningController.java
+1
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/ypglController/AsjBqTimController.java
+0
-0
service/publicapi/src/main/java/com/founder/publicapi/controller/ypglController/AsjbzController.java
+14
-27
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbXwAsjbzKeywordMapper.xml
+2
-2
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/YpglAsjMapper.xml
+5
-5
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/TbStAsj.java
View file @
28e7dd90
...
...
@@ -18,13 +18,16 @@ public class TbStAsj implements Serializable {
private
String
jsasjXxzjbh
;
private
String
xxzjbh
;
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
String
kssj
;
private
String
jssj
;
/* @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date kssj;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
jssj
;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jssj;
*/
private
Double
kymyqz_wpsl
;
...
...
@@ -217,10 +220,10 @@ public class TbStAsj implements Serializable {
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
asjfssj
_a
sjfskssj
;
private
Date
asjfssj
A
sjfskssj
;
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
asjfssj
_a
sjfsjssj
;
private
Date
asjfssj
A
sjfsjssj
;
private
String
asjfssj_rsddm
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/ypglEntity/TbXwAsjbzKeyword.java
View file @
28e7dd90
package
com
.
founder
.
commonutils
.
model
.
ypglEntity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
lombok.Data
;
/**
...
...
@@ -12,7 +13,8 @@ public class TbXwAsjbzKeyword extends PageBean {
private
String
keyword
;
private
String
multiplexing_keyword
;
private
String
keywordName
;
private
String
xxdjry_xm
;
@TableField
(
"XXDJRY_XM"
)
private
String
xxdjryXm
;
private
String
xxdjry_gmsfhm
;
private
String
xxdjdw_gajgmc
;
private
String
xxdjdw_gajgjgdm
;
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SkWarningService/WarningController.java
View file @
28e7dd90
...
...
@@ -289,7 +289,7 @@ public class WarningController {
List
<
String
>
xlabmcList
=
new
ArrayList
<>();
for
(
String
s
:
split
)
{
System
.
out
.
println
(
s
.
trim
());
codeMap
.
put
(
"groupid"
,
"CODE_
XALB
"
);
codeMap
.
put
(
"groupid"
,
"CODE_
AJXZ
"
);
codeMap
.
put
(
"code"
,
s
.
trim
());
String
name
=
sysDictitemMapper
.
getNameByCode
(
codeMap
);
xlabmcList
.
add
(
name
);
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/ypglController/AsjBqTimController.java
0 → 100644
View file @
28e7dd90
This diff is collapsed.
Click to expand it.
service/publicapi/src/main/java/com/founder/publicapi/controller/ypglController/AsjbzController.java
View file @
28e7dd90
...
...
@@ -377,7 +377,7 @@ public class AsjbzController implements BasicProcessor {
TbStAsj
stAsj
=
new
TbStAsj
();
stAsj
.
setAjlbdm
(
tbStAsj
.
getAjlbdm
());
stAsj
.
setKssj
(
tbStAsj
.
getKssj
());
stAsj
.
set
K
ssj
(
tbStAsj
.
getJssj
());
stAsj
.
set
J
ssj
(
tbStAsj
.
getJssj
());
JSONObject
jsonObject
=
toAsjBq
(
stAsj
);
if
(
jsonObject
!=
null
){
map
.
put
(
"code"
,
200
);
...
...
@@ -416,17 +416,6 @@ public class AsjbzController implements BasicProcessor {
int
i1
=
YpglAsjService
.
updateStAsjbz
();
//删除表中所有数据
System
.
out
.
println
(
i1
);
/*
Properties p = new Properties();
String endTime = p.getProperty("endTime");
String startTime = p.getProperty("startTime");
System.out.println("开始时间=="+startTime);
System.out.println("结束时间=="+endTime);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
tbStAsj.setDjsj(dateFormat.parse(startTime));
tbStAsj.setDjsjEnd(dateFormat.parse(endTime));*/
TbXwAsjbzKeyword
tbXwAsjbzKeyword
=
new
TbXwAsjbzKeyword
();
// 案件类别代码模糊查询
...
...
@@ -441,6 +430,8 @@ public class AsjbzController implements BasicProcessor {
tbStAsj
.
setAjlbdm
(
ajlbdm
);
}
String
kssj
=
tbStAsj
.
getKssj
();
String
jssj
=
tbStAsj
.
getJssj
();
List
<
TbStAsj
>
asjListAll
=
YpglAsjService
.
findAsjxxList
(
tbStAsj
);
List
<
TbXwAsjbzKeyword
>
tbXwAsjbzKeywords
=
tbXwAsjbzKeywordService
.
selectTbXwAsjbzKeywordByCondition
(
tbXwAsjbzKeyword
);
...
...
@@ -473,7 +464,8 @@ public class AsjbzController implements BasicProcessor {
}
return
resultJSON
;
}
//标签研判线程定时任务
//训练定时任务
@Override
public
ProcessResult
process
(
TaskContext
context
)
throws
Exception
{
JSONObject
resultJSON
=
new
JSONObject
();
ExecutorService
executorService
=
Executors
.
newFixedThreadPool
(
1000
);
...
...
@@ -533,14 +525,14 @@ public class AsjbzController implements BasicProcessor {
}
resultJSON
.
put
(
"status"
,
"success"
);
resultJSON
.
put
(
"message"
,
"成功"
);
return
new
ProcessResult
(
true
,
"认定定时任务完成"
);
return
new
ProcessResult
(
true
,
"
训练
认定定时任务完成"
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
executorService
.
shutdown
();
resultJSON
.
put
(
"status"
,
"fail"
);
resultJSON
.
put
(
"message"
,
e
.
getMessage
());
return
new
ProcessResult
(
false
,
"认定定时任务失败"
);
return
new
ProcessResult
(
false
,
"
训练
认定定时任务失败"
);
}
}
...
...
@@ -803,14 +795,9 @@ public class AsjbzController implements BasicProcessor {
}
}*/
/**
* ^
* |
* |
* 定时任务
*/
/* // 全部案件2021至今
@Scheduled(cron = "0 0 2 * * ?")
// 全部案件2021至今
// @Scheduled(cron = "0 0 2 * * ?")
@RequestMapping
(
value
=
"/toRunAsjBq"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
})
@ResponseBody
// @OperLogThread(message = "犯罪特征标签线程")
...
...
@@ -867,7 +854,7 @@ public class AsjbzController implements BasicProcessor {
resultJSON
.
put
(
"message"
,
e
.
getMessage
());
}
return
resultJSON
;
}
*/
}
class
RunAsjList
extends
Thread
{
...
...
@@ -890,9 +877,9 @@ public class AsjbzController implements BasicProcessor {
for
(
int
i
=
0
;
i
<
asjxxListFy
.
size
();
i
++){
// 案发时间段标签
if
(
asjxxListFy
.
get
(
i
).
getAsjfssj
_asjfsjssj
()!=
null
&&
asjxxListFy
.
get
(
i
).
getAsjfssj_a
sjfskssj
()!=
null
){
Date
asjfssj_asjfskssj
=
asjxxListFy
.
get
(
i
).
getAsjfssj
_a
sjfskssj
();
Date
asjfssj_asjfsjssj
=
asjxxListFy
.
get
(
i
).
getAsjfssj
_a
sjfsjssj
();
if
(
asjxxListFy
.
get
(
i
).
getAsjfssj
Asjfsjssj
()!=
null
&&
asjxxListFy
.
get
(
i
).
getAsjfssjA
sjfskssj
()!=
null
){
Date
asjfssj_asjfskssj
=
asjxxListFy
.
get
(
i
).
getAsjfssj
A
sjfskssj
();
Date
asjfssj_asjfsjssj
=
asjxxListFy
.
get
(
i
).
getAsjfssj
A
sjfsjssj
();
int
day
=
(
int
)
((
asjfssj_asjfsjssj
.
getTime
()
-
asjfssj_asjfskssj
.
getTime
())
/
(
1000
*
3600
*
24
));
if
(
day
>
1
){
asjxxListFy
.
get
(
i
).
setZasj
(
"上午,下午,傍晚,夜间"
);
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbXwAsjbzKeywordMapper.xml
View file @
28e7dd90
...
...
@@ -10,8 +10,8 @@
<if
test=
"synonyms != null and synonyms != ''"
>
AND synonyms like "%"#{ synonyms , jdbcType=VARCHAR }"%"
</if>
<if
test=
"xxdjry
_xm != null and xxdjry_x
m != ''"
>
AND xxdjry_xm like "%"#{ xxdjry
_x
m , jdbcType=VARCHAR }"%"
<if
test=
"xxdjry
Xm != null and xxdjryX
m != ''"
>
AND xxdjry_xm like "%"#{ xxdjry
X
m , jdbcType=VARCHAR }"%"
</if>
<if
test=
"djsj != null"
>
and DATE(djsj) = #{djsj , jdbcType=VARCHAR }
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/YpglAsjMapper.xml
View file @
28e7dd90
...
...
@@ -67,14 +67,14 @@
<if
test=
"asjbh != null and asjbh != ''"
>
and a.asjbh = #{asjbh}
</if>
<if
test=
"asjfssj
_asjfskssj != null and asjfssj_a
sjfskssj != ''"
>
and a.
ASJFSSJ_ASJFSKSSJ
<![CDATA[ >= ]]>
#{asjfssj_a
sjfskssj}
<if
test=
"asjfssj
Asjfskssj != null and asjfssjA
sjfskssj != ''"
>
and a.
asjfssj_asjfskssj
<![CDATA[ >= ]]>
#{asjfssjA
sjfskssj}
</if>
<if
test=
"kssj != null"
>
and
a.asjfssj_asjfskssj
<![CDATA[ >= ]]>
#{kssj}
<if
test=
"kssj != null
and jssj != ''
"
>
and
DATE(a.asjfssj_asjfskssj)
<![CDATA[ >= ]]>
DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"jssj != null and jssj != ''"
>
and
a.ASJFSSJ_ASJFSKSSJ
<![CDATA[ <= ]]>
#{asjfssj_asjfsjssj}
and
DATE(a.asjfssj_asjfskssj)
<![CDATA[ <= ]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if
test=
"ajlbdm != null and ajlbdm != ''"
>
AND a.ajlbdm LIKE CONCAT(#{ajlbdm, jdbcType=VARCHAR}, '%')
...
...
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