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
d9653864
Commit
d9653864
authored
Jul 04, 2022
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
任务有关bug调整
parent
594b2fec
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
159 additions
and
199 deletions
+159
-199
service/publicapi/src/main/java/com/founder/publicapi/controller/ZtypService/ZtypController.java
+117
-117
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
+1
-1
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
+7
-6
service/publicapi/src/main/resources/data/getRxhs.json
+17
-8
service/publicapi/src/main/resources/data/getSkbsjson
+0
-59
service/publicapi/src/main/resources/dataGaw/getRxhs.json
+17
-8
No files found.
service/publicapi/src/main/java/com/founder/publicapi/controller/ZtypService/ZtypController.java
View file @
d9653864
//
package com.founder.publicapi.controller.ZtypService;
//
//
import com.founder.commonutils.model.newPublicEntity.*;
//
import com.founder.commonutils.model.newPublicEntity.ztypEntity.*;
//
import com.founder.commonutils.util.JwtUser;
//
import com.founder.commonutils.util.KeyUtil;
//
import com.founder.publicapi.service.ZtypService;
//
import com.founder.servicebase.logs.OperLog;
//
import com.founder.servicebase.logs.OperationType;
//
import io.swagger.annotations.Api;
//
import io.swagger.annotations.ApiOperation;
//
import org.springframework.beans.factory.annotation.Autowired;
//
import org.springframework.web.bind.annotation.*;
//
//
import javax.servlet.http.HttpServletRequest;
//
import java.text.ParseException;
//
import java.util.ArrayList;
//
import java.util.HashMap;
//
import java.util.List;
//
import java.util.Map;
//
//
@Api(tags = "主题研判管理")
//
@RestController
//
@RequestMapping("/ztyp")
//
public class ZtypController {
//
@Autowired
//
private ZtypService ztypService;
//
//
@PostMapping("/selectDxzpAj")
//
@OperLog(message = "查询所有的电信网络诈骗的案件",operation = OperationType.QUERY)
//
@ApiOperation(value = "查询所有的电信网络诈骗的案件")
//
public R selectFraudCases(ZpajxxModel model) {
//
model.setPage((model.getPage() - 1) * model.getLimit());
//
model.setLimit(model.getLimit());
//
int total = ztypService.getZpajxxTotal(model);
//
List<ZpajxxEntity> list = null;
//
if(total>0){
//
list = ztypService.getZpajxx(model);
//
}
//
return R.ok().total(total).rows(list);
//
}
//
//
@PostMapping("/save")
//
public R saveNewFwbshYp(TbStZtypFwbsh fwbsh,HttpServletRequest request){
//
try {
//
String xxzjbh = KeyUtil.getUUIDKey("BSH");
//
fwbsh.setDjUser(JwtUser.getUser(request));
//
fwbsh.setXxzjbh(xxzjbh);
//
ztypService.saveNewFwbshYp(fwbsh);
//
return R.ok().data("xxzjbh", xxzjbh);
//
} catch (Exception e) {
//
e.printStackTrace();
//
return R.error(e.getMessage());
//
}
//
}
//
//
@PostMapping("/list")
//
public R listFwbshYp(TbStZtypFwbsh fwbsh,HttpServletRequest request){
//
try {
//
fwbsh.setXxdjryGmsfhm(JwtUser.getUser(request).getIdentitycard());
//
Map<String, Object> resultMap = ztypService.listFwbshYp(fwbsh);
//
return R.ok().data(resultMap);
//
} catch (Exception e) {
//
e.printStackTrace();
//
return R.error(e.getMessage());
//
}
//
}
//
//
@PostMapping("/update")
//
public R updateFwbshYp(TbStZtypFwbsh fwbsh,HttpServletRequest request){
//
try {
//
fwbsh.setUpUser(JwtUser.getUser(request));
//
ztypService.updateFwbshYp(fwbsh);
//
return R.ok().data("xxzjbh", fwbsh.getXxzjbh());
//
} catch (Exception e) {
//
e.printStackTrace();
//
return R.error(e.getMessage());
//
}
//
}
//
//
@PostMapping("/delete")
//
public R deleteFwbshYp(TbStZtypFwbsh fwbsh,HttpServletRequest request){
//
try {
//
fwbsh.setUpUser(JwtUser.getUser(request));
//
fwbsh.setXxscPdbz("1");
//
ztypService.updateFwbshYp(fwbsh);
//
return R.ok().data("xxzjbh", fwbsh.getXxzjbh());
//
} catch (Exception e) {
//
e.printStackTrace();
//
return R.error(e.getMessage());
//
}
//
}
//
//
@PostMapping("/queryAjypfx")
//
@ResponseBody
//
@ApiOperation(value = "案件团伙分析")
//
public R queryAjypfx(AjQueryParam requestParam) {
//
requestParam.setPage((requestParam.getPage()-1) * requestParam.getLimit());
//
requestParam.setLimit(requestParam.getLimit());
//
Integer count = ztypService.queryAjypfxCount(requestParam);
//
List<AjypFxPojo> records = new ArrayList<>();
//
if (count != null && count > 0) {
//
records = ztypService.queryAjypfxData(requestParam);
//
}
//
//
return R.ok().total(count).rows(records);
//
}
//
//
/*@PostMapping("/getThfxAccompliceBythId")
//
@ResponseBody
//
@ApiOperation(value = "案件团伙分析可视化接口")
//
public R getThfxAccompliceBythId(@RequestParam(value = "id") String thbh, @RequestParam(value = "fxwd") String fxwd,
//
@RequestParam(value = "commonRelationshipNum") String commonRelationshipNum) {
//
Map<String, Object> resultMap = ztypService.getThfxAccompliceBythId(thbh, fxwd,commonRelationshipNum);
//
return R.ok().data(resultMap);
//
}*/
package
com
.
founder
.
publicapi
.
controller
.
ZtypService
;
import
com.founder.commonutils.model.newPublicEntity.*
;
import
com.founder.commonutils.model.newPublicEntity.ztypEntity.*
;
import
com.founder.commonutils.util.JwtUser
;
import
com.founder.commonutils.util.KeyUtil
;
import
com.founder.publicapi.service.ZtypService
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
@Api
(
tags
=
"主题研判管理"
)
@RestController
@RequestMapping
(
"/ztyp"
)
public
class
ZtypController
{
@Autowired
private
ZtypService
ztypService
;
@PostMapping
(
"/selectDxzpAj"
)
@OperLog
(
message
=
"查询所有的电信网络诈骗的案件"
,
operation
=
OperationType
.
QUERY
)
@ApiOperation
(
value
=
"查询所有的电信网络诈骗的案件"
)
public
R
selectFraudCases
(
ZpajxxModel
model
)
{
model
.
setPage
((
model
.
getPage
()
-
1
)
*
model
.
getLimit
());
model
.
setLimit
(
model
.
getLimit
());
int
total
=
ztypService
.
getZpajxxTotal
(
model
);
List
<
ZpajxxEntity
>
list
=
null
;
if
(
total
>
0
){
list
=
ztypService
.
getZpajxx
(
model
);
}
return
R
.
ok
().
total
(
total
).
rows
(
list
);
}
@PostMapping
(
"/save"
)
public
R
saveNewFwbshYp
(
TbStZtypFwbsh
fwbsh
,
HttpServletRequest
request
){
try
{
String
xxzjbh
=
KeyUtil
.
getUUIDKey
(
"BSH"
);
fwbsh
.
setDjUser
(
JwtUser
.
getUser
(
request
));
fwbsh
.
setXxzjbh
(
xxzjbh
);
ztypService
.
saveNewFwbshYp
(
fwbsh
);
return
R
.
ok
().
data
(
"xxzjbh"
,
xxzjbh
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
error
(
e
.
getMessage
());
}
}
@PostMapping
(
"/list"
)
public
R
listFwbshYp
(
TbStZtypFwbsh
fwbsh
,
HttpServletRequest
request
){
try
{
fwbsh
.
setXxdjryGmsfhm
(
JwtUser
.
getUser
(
request
).
getIdentitycard
());
Map
<
String
,
Object
>
resultMap
=
ztypService
.
listFwbshYp
(
fwbsh
);
return
R
.
ok
().
data
(
resultMap
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
error
(
e
.
getMessage
());
}
}
@PostMapping
(
"/update"
)
public
R
updateFwbshYp
(
TbStZtypFwbsh
fwbsh
,
HttpServletRequest
request
){
try
{
fwbsh
.
setUpUser
(
JwtUser
.
getUser
(
request
));
ztypService
.
updateFwbshYp
(
fwbsh
);
return
R
.
ok
().
data
(
"xxzjbh"
,
fwbsh
.
getXxzjbh
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
error
(
e
.
getMessage
());
}
}
@PostMapping
(
"/delete"
)
public
R
deleteFwbshYp
(
TbStZtypFwbsh
fwbsh
,
HttpServletRequest
request
){
try
{
fwbsh
.
setUpUser
(
JwtUser
.
getUser
(
request
));
fwbsh
.
setXxscPdbz
(
"1"
);
ztypService
.
updateFwbshYp
(
fwbsh
);
return
R
.
ok
().
data
(
"xxzjbh"
,
fwbsh
.
getXxzjbh
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
error
(
e
.
getMessage
());
}
}
@PostMapping
(
"/queryAjypfx"
)
@ResponseBody
@ApiOperation
(
value
=
"案件团伙分析"
)
public
R
queryAjypfx
(
AjQueryParam
requestParam
)
{
requestParam
.
setPage
((
requestParam
.
getPage
()-
1
)
*
requestParam
.
getLimit
());
requestParam
.
setLimit
(
requestParam
.
getLimit
());
Integer
count
=
ztypService
.
queryAjypfxCount
(
requestParam
);
List
<
AjypFxPojo
>
records
=
new
ArrayList
<>();
if
(
count
!=
null
&&
count
>
0
)
{
records
=
ztypService
.
queryAjypfxData
(
requestParam
);
}
return
R
.
ok
().
total
(
count
).
rows
(
records
);
}
/*@PostMapping("/getThfxAccompliceBythId")
@ResponseBody
@ApiOperation(value = "案件团伙分析可视化接口")
public R getThfxAccompliceBythId(@RequestParam(value = "id") String thbh, @RequestParam(value = "fxwd") String fxwd,
@RequestParam(value = "commonRelationshipNum") String commonRelationshipNum) {
Map<String, Object> resultMap = ztypService.getThfxAccompliceBythId(thbh, fxwd,commonRelationshipNum);
return R.ok().data(resultMap);
}*/
// @PostMapping("/selectJtrwList")
// @ResponseBody
// @ApiOperation(value = "查询具体任务的list集合", notes = "查询具体任务的list集合")
...
...
@@ -214,4 +214,4 @@
// return R.error(e.getMessage());
// }
// }
//
}
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
View file @
d9653864
...
...
@@ -86,7 +86,7 @@ SELECT
a.fsrxm,
a.fssj,
a.isdeleted,
CASE WHEN
tasktype like CONCAT('skph_','%'
) then
CASE WHEN
(tasktype like CONCAT('skph_','%')or tasktype like CONCAT('skbs','%')
) then
(SELECT count(distinct(t.objectValue)) FROM sk_regionals_result t WHERE t.taskId = a.taskId)
ELSE
( SELECT count(*) FROM sk_regionals_result t WHERE t.taskId = a.taskId)end AS resultCount
...
...
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
View file @
d9653864
...
...
@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResult
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll
;
import
com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl
;
import
com.founder.commonutils.model.vo.param.RegionalsParam
;
import
com.founder.commonutils.model.vo.param.SkRegionalsResultAllParam
;
import
com.founder.commonutils.model.vo.param.SkRegionalsResultSaveParam
;
import
com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll
;
import
com.founder.commonutils.model.vo.param.*
;
import
com.founder.commonutils.util.DateUtil
;
import
com.founder.commonutils.util.JsonUtils
;
import
com.founder.publicapi.mapper.mysqlMapper.SkRegionalsResultMapper
;
...
...
@@ -474,8 +471,12 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
skRegionalsResultSaveParam
.
setObjectvalue
(
p
.
getDeviceId
());
// 标识号
skRegionalsResultSaveParam
.
setTime
(
createRandomDate
(
LocalDateTime
.
parse
(
sf
.
format
(
p
.
getStartTime
()),
formatter
),
LocalDateTime
.
parse
(
sf
.
format
(
p
.
getEndTime
()),
formatter
)));
// 时间在开始时间和结束时间期间取一个
skRegionalsResultSaveParam
.
setAddress
(
"进入区域"
);
skRegionalsResultSaveParam
.
setX
(
p
.
getX
());
skRegionalsResultSaveParam
.
setY
(
p
.
getY
());
if
(
null
!=
p
.
getGeometry
()){
List
<
Point
>
geometrys
=
JSONArray
.
parseArray
(
p
.
getGeometry
()).
toJavaList
(
Point
.
class
);
p
.
setGeometrys
(
geometrys
);
}
skRegionalsResultSaveParam
.
setX
(
p
.
getGeometrys
().
get
(
0
).
getX
());
skRegionalsResultSaveParam
.
setY
(
p
.
getGeometrys
().
get
(
0
).
getY
());
listResult
.
add
(
skRegionalsResultSaveParam
);
});
return
listResult
;
...
...
service/publicapi/src/main/resources/data/getRxhs.json
View file @
d9653864
...
...
@@ -8,7 +8,8 @@
"farimg"
:
"http://47.92.48.137:1008/images/3.jpg"
,
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"devicename"
:
"长沙市-长沙泰和商务酒店RXTH001"
,
"address"
:
"长沙市-长沙泰和商务酒店"
"address"
:
"长沙市-长沙泰和商务酒店"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -19,7 +20,8 @@
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"deviceid"
:
"RXZXX0001"
,
"devicename"
:
"长沙市-智信行RXZXX0001"
,
"address"
:
"长沙市-智信行"
"address"
:
"长沙市-智信行"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -30,7 +32,8 @@
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"deviceid"
:
"RXZT001"
,
"devicename"
:
"长沙市-正天西RXZT001"
,
"address"
:
"长沙市-正天西"
"address"
:
"长沙市-正天西"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -41,7 +44,8 @@
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -52,7 +56,8 @@
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -63,7 +68,8 @@
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -74,7 +80,8 @@
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -85,6 +92,7 @@
"img"
:
"http://47.92.48.137:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
}
]
\ No newline at end of file
service/publicapi/src/main/resources/data/getSkbsjson
deleted
100644 → 0
View file @
594b2fec
[
{
"objectvalue": "18754956412",
"x": "110.628076",
"y": "19.925187",
"count": "3",
"bsobjectvaluetype":"03",
"address": "长沙市达尔登路1"
},
{
"objectvalue": "18754956412",
"x": "106.553860",
"y": "29.557100",
"count": "3",
"bsobjectvaluetype":"03",
"address": "长沙市达尔登路2"
},
{
"objectvalue": "18754956412",
"x": "110.628076",
"y": "19.925187",
"count": "3",
"bsobjectvaluetype":"03",
"address": "长沙市达尔登路1"
},
{
"objectvalue": "蒙AKH824",
"x": "106.20576",
"y": "29.657100",
"count": "4",
"bsobjectvaluetype":"01",
"address": "长沙市达尔登路4"
},
{
"objectvalue": "蒙AKH824",
"x": "110.628076",
"y": "19.925187",
"count": "4",
"bsobjectvaluetype":"01",
"address": "长沙市达尔登路1"
},
{
"objectvalue": "蒙AKH824",
"x": "110.628076",
"y": "19.925187",
"count": "4",
"bsobjectvaluetype":"01",
"address": "长沙市达尔登路1"
},
{
"objectvalue": "蒙AKH824",
"x": "113.99195",
"y": "22.838194",
"bsobjectvaluetype":"01",
"count": "4",
"address": "长沙市达尔登路5"
}
]
\ No newline at end of file
service/publicapi/src/main/resources/dataGaw/getRxhs.json
View file @
d9653864
...
...
@@ -8,7 +8,8 @@
"farimg"
:
"http://65.26.2.173:1008/images/3.jpg"
,
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"devicename"
:
"长沙市-长沙泰和商务酒店RXTH001"
,
"address"
:
"长沙市-长沙泰和商务酒店"
"address"
:
"长沙市-长沙泰和商务酒店"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -19,7 +20,8 @@
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"deviceid"
:
"RXZXX0001"
,
"devicename"
:
"长沙市-智信行RXZXX0001"
,
"address"
:
"长沙市-智信行"
"address"
:
"长沙市-智信行"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -30,7 +32,8 @@
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"deviceid"
:
"RXZT001"
,
"devicename"
:
"长沙市-正天西RXZT001"
,
"address"
:
"长沙市-正天西"
"address"
:
"长沙市-正天西"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -41,7 +44,8 @@
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -52,7 +56,8 @@
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -63,7 +68,8 @@
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -74,7 +80,8 @@
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
},
{
"objectvalue"
:
"430003199101026617"
,
...
...
@@ -85,6 +92,7 @@
"img"
:
"http://65.26.2.173:1008/images/4.jpg"
,
"deviceid"
:
"RXFRQ001"
,
"devicename"
:
"长沙市-芙蓉区政府RXFRQ001"
,
"address"
:
"长沙市-芙蓉区政府"
"address"
:
"长沙市-芙蓉区政府"
,
"count"
:
8
}
]
\ No newline at end of file
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