Skip to content

M
map-parent
Commit 27da8326 by yangyang
Options

任务结果新家远照、地址、设备名称、人像回溯任务结果生成提交

parent 27a0d877
Showing with 114 additions and 43 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResult.java
...@@ -63,10 +63,14 @@ public class SkRegionalsResult extends Model<SkRegionalsResult> { ...@@ -63,10 +63,14 @@ public class SkRegionalsResult extends Model<SkRegionalsResult> {
*/ */
private String y; private String y;
/** /**
* 照片 * 照片(近照)
*/ */
private String img; private String img;
/** /**
* 照片(远照)
*/
private String farimg;
/**
* 过车时间 * 过车时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
...@@ -75,8 +79,14 @@ public class SkRegionalsResult extends Model<SkRegionalsResult> { ...@@ -75,8 +79,14 @@ public class SkRegionalsResult extends Model<SkRegionalsResult> {
* 设备ID * 设备ID
*/ */
private String deviceid; private String deviceid;
/**
* 设备名称
*/
private String devicename;
/**
* 地址
*/
private String address;
/** /**
* 徘徊数量 * 徘徊数量
*/ */
......
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultAll.java
...@@ -30,7 +30,9 @@ public class SkRegionalsResultAll implements Serializable { ...@@ -30,7 +30,9 @@ public class SkRegionalsResultAll implements Serializable {
private String phone;// 电话 private String phone;// 电话
private String hjdqhdz;// 户籍地 private String hjdqhdz;// 户籍地
private String csrq;// 出生日期 private String csrq;// 出生日期
private byte[] img;// 本人照片二进制 private String img;// 本人照片
private byte[] imgResult;// 本人照片二进制 private String nearimg;// 近照
private String farimg;// 远照
private String region;// 比中区域 private String region;// 比中区域
private String address;// 地址
} }
\ No newline at end of file
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsResultSaveParam.java
...@@ -70,10 +70,18 @@ public class SkRegionalsResultSaveParam { ...@@ -70,10 +70,18 @@ public class SkRegionalsResultSaveParam {
*/ */
private Integer count; private Integer count;
/** /**
* 照片 * 照片(近照)
*/ */
private String img; private String img;
/** /**
* 照片(远照)
*/
private String farimg;
/**
* 地址
*/
private String address;
/**
* 登记时间 * 登记时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
...@@ -122,6 +122,10 @@ public class SkRegionalsResultController extends ApiController implements ExcelC ...@@ -122,6 +122,10 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
// 获取任务结果 阿里云读取json线上读取接口 // 获取任务结果 阿里云读取json线上读取接口
jsonArray = JsonUtils.readJsonFromClassPath("data/getJzhs.json", JSONArray.class); jsonArray = JsonUtils.readJsonFromClassPath("data/getJzhs.json", JSONArray.class);
break;//基站回溯 break;//基站回溯
case "skhs_rx":
// 获取任务结果 阿里云读取json线上读取接口
jsonArray = JsonUtils.readJsonFromClassPath("data/getRxhs.json", JSONArray.class);
break;//人像回溯
case "qypz_car": case "qypz_car":
// 获取任务结果 阿里云读取json线上读取接口 // 获取任务结果 阿里云读取json线上读取接口
listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType); listResult = skRegionalsResultService.MoreAreaInfoThread(params,taskType);
...@@ -298,7 +302,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC ...@@ -298,7 +302,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
@ApiOperation(value = "获取任务结果数据") @ApiOperation(value = "获取任务结果数据")
@PostMapping("/queryRegionalsTasksResults") @PostMapping("/queryRegionalsTasksResults")
@OperLog(message = "获取任务结果数据", operation = OperationType.QUERY) //@OperLog(message = "获取任务结果数据", operation = OperationType.QUERY)
public MapRestResult selecteRegionalsTasksResults(@RequestBody SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll) { public MapRestResult selecteRegionalsTasksResults(@RequestBody SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll) {
List<SkRegionalsResultAll> listResult = new ArrayList<>(); List<SkRegionalsResultAll> listResult = new ArrayList<>();
Integer total = 0; Integer total = 0;
...@@ -425,7 +429,8 @@ public class SkRegionalsResultController extends ApiController implements ExcelC ...@@ -425,7 +429,8 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
skRegionalsDetail.setAttribution(PhoneUtil.getGeo(p.getObjectvalue(),"86"));// 归属地 skRegionalsDetail.setAttribution(PhoneUtil.getGeo(p.getObjectvalue(),"86"));// 归属地
} }
boolean savesDetail = skRegionalsDetailService.save(skRegionalsDetail); boolean savesDetail = skRegionalsDetailService.save(skRegionalsDetail);
if(savesDetail){// 翻译成功通过身份证拿到人员基本信息 if(savesDetail){// 翻译成功通过身份证拿到人员基本信息 人像回溯、徘徊、碰撞不用翻译对应人
if(!"skhs_rx".equals(p.getObjecttype())&&!"qypz_rx".equals(p.getObjecttype())||!"skph_rx".equals(p.getObjecttype())){
// 先查看身份证对应人信息是否已存在 // 先查看身份证对应人信息是否已存在
SkRegionalsPerson skRegionalsPerson=new SkRegionalsPerson(); SkRegionalsPerson skRegionalsPerson=new SkRegionalsPerson();
skRegionalsPerson.setSfzhm("460003198912096617");// 证件号码 skRegionalsPerson.setSfzhm("460003198912096617");// 证件号码
...@@ -441,6 +446,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC ...@@ -441,6 +446,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
} }
} }
} }
}
sucesslist.add(p); sucesslist.add(p);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml
...@@ -11,10 +11,12 @@ ...@@ -11,10 +11,12 @@
r.x AS X, r.x AS X,
r.y AS Y, r.y AS Y,
r.region as region, r.region as region,
r.img as imgResult, r.img as nearimg,
r.farimg as farimg,
DATE_FORMAT(r.djsj,'%Y-%m-%d %H:%i:%S') as time, DATE_FORMAT(r.djsj,'%Y-%m-%d %H:%i:%S') as time,
r.deviceid as deviceId, r.deviceid as deviceId,
(select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName, r.deviceName as deviceName,
r.address as address,
p.xm as xm, p.xm as xm,
p.mz as mz, p.mz as mz,
p.img as img, p.img as img,
...@@ -50,7 +52,10 @@ ...@@ -50,7 +52,10 @@
r.x AS X, r.x AS X,
r.y AS Y, r.y AS Y,
r.region as region, r.region as region,
r.img as imgResult, r.img as nearimg,
r.farimg as farimg,
r.deviceName as deviceName,
r.address as address,
DATE_FORMAT(r.djsj,'%Y-%m-%d %H:%i:%S') as time, DATE_FORMAT(r.djsj,'%Y-%m-%d %H:%i:%S') as time,
r.deviceid as deviceId, r.deviceid as deviceId,
(select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName, (select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName,
......
service/publicapi/src/main/resources/bootstrap-dev.properties 0 → 100644
#??????
server.port=1003
#????json??????????
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
#???????????
logging.level.root=INFO
#mybatis???
#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
#mysql?????????
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.xzxtdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.xzxtdb.username=root
spring.datasource.xzxtdb.password=gkptCcYy123
#oracle?????????(?????)
spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.qgdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.qgdb.username=root
spring.datasource.qgdb.password=gkptCcYy123
#xml???
mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es?????????
management.health.elasticsearch.enabled=false
#??????
ssdw=460000000000
#server.tomcat.basedir: /tmp/tomcat
\ No newline at end of file
service/publicapi/src/main/resources/bootstrap-prod.properties 0 → 100644
#����˿�
server.port=1003
#����json��ȫ��ʱ���ʽ
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
#������־����
logging.level.root=INFO
#mybatis��־
#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
#mysql���ݿ�����
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.xzxtdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.xzxtdb.username=root
spring.datasource.xzxtdb.password=gkptCcYy123
#oracle���ݿ�����(ȫ����)
spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.qgdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.qgdb.username=root
spring.datasource.qgdb.password=gkptCcYy123
#xmlɨ��
mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es�������ر�
management.health.elasticsearch.enabled=false
#������λ
ssdw=460000000000
#server.tomcat.basedir: /tmp/tomcat
\ No newline at end of file
service/publicapi/src/main/resources/bootstrap.properties
#����˿� spring.profiles.active=dev
server.port=1003 server.port=1003
#����json��ȫ��ʱ���ʽ
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
#������־����
logging.level.root=INFO
#mybatis��־
#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
#mysql���ݿ����� logging.level.root=INFO
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver \ No newline at end of file
spring.datasource.xzxtdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.xzxtdb.username=root
spring.datasource.xzxtdb.password=gkptCcYy123
#oracle���ݿ�����(ȫ����)
spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.qgdb.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.qgdb.username=root
spring.datasource.qgdb.password=gkptCcYy123
#xmlɨ��
mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es�������ر�
management.health.elasticsearch.enabled=false
#������λ
ssdw=460000000000
#server.tomcat.basedir: /tmp/tomcat
\ No newline at end of file
service/publicapi/src/main/resources/data/getClhs.json
This source diff could not be displayed because it is too large. You can view the blob instead.
service/publicapi/src/main/resources/data/getJzhs.json
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
"y": "19.925187", "y": "19.925187",
"time": "2022-03-01 10:57:08", "time": "2022-03-01 10:57:08",
"deviceid": "54000001031321014658", "deviceid": "54000001031321014658",
"devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340" "devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340",
"address": "重庆市达尔登路1"
}, },
{ {
"objectvalue": "15754879533", "objectvalue": "15754879533",
...@@ -13,8 +14,8 @@ ...@@ -13,8 +14,8 @@
"y": "19.925187", "y": "19.925187",
"time": "2022-03-01 11:50:08", "time": "2022-03-01 11:50:08",
"deviceid": "54000001031321014658", "deviceid": "54000001031321014658",
"deviceid": "54000001031321014658", "devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340",
"devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340" "address": "重庆市达尔登路2"
}, },
{ {
"objectvalue": "15754879533", "objectvalue": "15754879533",
...@@ -22,8 +23,8 @@ ...@@ -22,8 +23,8 @@
"y": "19.925187", "y": "19.925187",
"time": "2022-03-01 12:30:00", "time": "2022-03-01 12:30:00",
"deviceid": "54000001031321014658", "deviceid": "54000001031321014658",
"deviceid": "54000001031321014658", "devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340",
"devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340" "address": "重庆市达尔登路3"
}, },
{ {
"objectvalue": "15754879533", "objectvalue": "15754879533",
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
"y": "19.925187", "y": "19.925187",
"time": "2022-03-01 13:30:00", "time": "2022-03-01 13:30:00",
"deviceid": "54000001031321014658", "deviceid": "54000001031321014658",
"deviceid": "54000001031321014658", "devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340",
"devicename": "HSQMB-ZN1412A交包头大街与达尔登路路口2D8340" "address": "重庆市达尔登路3"
} }
] ]
\ No newline at end of file
service/publicapi/src/main/resources/data/getRxhs.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment