Skip to content

M
map-parent
Commit bf8c301f by 宋珺琪
Options

修改算例返回格式

parent 2ac9cf8b
Showing with 106 additions and 147 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Linkspropertice.java 0 → 100644
package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
import lombok.Data;
import java.io.Serializable;
@Data
public class Linkspropertice implements Serializable {
private String time;
private String source;
private String target;
private String label;
}
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/kshlinks.java
......@@ -14,5 +14,5 @@ public class kshlinks implements Serializable {
private String label;
private kshlinks properties;
private Linkspropertice properties;
}
service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java
......@@ -77,20 +77,21 @@ public class KshSlServiceController {
nodes.add(mergeDTOgjd);
sumup.add(asjbh);
//links
kshlinks ks= new kshlinks();
kshlinks kshlink = new kshlinks();
kshlink.setSource(objectValue);
kshlink.setTarget(asjbh);
kshlink.setLabel("人案");
ks.setSource(objectValue);
ks.setTarget(asjbh);
ks.setLabel("人案");
ks.setProperties(kshlink);
re.add(ks);
Linkspropertice linkspropertice = new Linkspropertice();
linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(asjbh);
linkspropertice.setLabel("人案");
kshlink.setProperties(linkspropertice);
re.add(kshlink);
}
//组装 nodes
HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
/* HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
mergeDTO.setId(objectValue);
mergeDTO.setLabel("证件号码:"+objectValue);
Kshpropertice kshpropertice = new Kshpropertice();
......@@ -99,10 +100,10 @@ public class KshSlServiceController {
kshpropertice.setImgType("idcard");
kshpropertice.setBoderColor(null);
mergeDTO.setProperties(kshpropertice);
nodes.add(mergeDTO);
nodes.add(mergeDTO);*/
kshdata.setNodes(nodes);
kshdata.setLinks(re);
sumup.add(objectValue);
// sumup.add(objectValue);
dataSumup.setList(sumup);
dataSumup.setName("人案关联");
result.setKshData(kshdata);
......@@ -122,7 +123,6 @@ public class KshSlServiceController {
List<kshlinks> re =new ArrayList<>();
// 案查人 遍历 这个案件底下有多少人
for (TbXwZbfzxyr sfz : AfindR) {
kshlinks ks= new kshlinks();
String zjhm = sfz.getZhfzxyrCyzjZjhm();
// nodes
HnTbStRygxDTO mergeDTOgjd = new HnTbStRygxDTO();
......@@ -141,15 +141,17 @@ public class KshSlServiceController {
kshlink.setSource(objectValue);
kshlink.setTarget(zjhm);
kshlink.setLabel("人案");
ks.setSource(objectValue);
ks.setTarget(zjhm);
ks.setLabel("人案");
ks.setProperties(kshlink);
re.add(ks);
Linkspropertice linkspropertice = new Linkspropertice();
linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(zjhm);
linkspropertice.setLabel("人案");
kshlink.setProperties(linkspropertice);
re.add(kshlink);
}
//组装 nodes
HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
/* HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
mergeDTO.setId(objectValue);
mergeDTO.setLabel("案事件编号:"+objectValue);
Kshpropertice kshpropertice = new Kshpropertice();
......@@ -158,10 +160,10 @@ public class KshSlServiceController {
kshpropertice.setImgType("aj");
kshpropertice.setBoderColor(null);
mergeDTO.setProperties(kshpropertice);
nodes.add(mergeDTO);
nodes.add(mergeDTO);*/
kshdata.setNodes(nodes);
kshdata.setLinks(re);
sumup.add(objectValue);
// sumup.add(objectValue);
dataSumup.setList(sumup);
dataSumup.setName("人案关联");
result1.setKshData(kshdata);
......@@ -181,16 +183,6 @@ public class KshSlServiceController {
QueryWrapper<TbXwZbfzxyr> wrapper = new QueryWrapper<>();
wrapper.select("asjbh").eq("zhfzxyr_cyzj_zjhm",objectValue);
List<TbXwZbfzxyr> sfzfindasj = zbFzxyrDataMapper.selectList(wrapper);
//遍历asjbh 去根据asjbh去查人
/* QueryWrapper<TbXwZbfzxyr> wrapper1 = new QueryWrapper<>();
wrapper1.and(wra -> {
for(TbXwZbfzxyr tbXwZbfzxyr : sfzfindasj){
wra.or().select("zhfzxyr_cyzj_zjhm")
.eq("asjbh",tbXwZbfzxyr.getAsjbh());
}
return wra;
});
List<TbXwZbfzxyr> RfindA = zbFzxyrDataMapper.selectList(wrapper1);*/
Hnkshresult result = new Hnkshresult();
kshdata kshdata = new kshdata();
dataSumup dataSumup = new dataSumup();
......@@ -204,34 +196,38 @@ public class KshSlServiceController {
List<TbXwZbfzxyr> AfindR = zbFzxyrDataMapper.selectList(wrapper1);
// 案查人 遍历 这个案件底下有多少人
for (TbXwZbfzxyr sfz : AfindR) {
kshlinks ks= new kshlinks();
String zjhm = sfz.getZhfzxyrCyzjZjhm();
// nodes
HnTbStRygxDTO mergeDTOgjd = new HnTbStRygxDTO();
mergeDTOgjd.setId(zjhm);
mergeDTOgjd.setLabel(zjhm);
Kshpropertice kshpropertice = new Kshpropertice();
kshpropertice.setId(zjhm);
kshpropertice.setLabel(zjhm);
kshpropertice.setImgType("idcard");
kshpropertice.setBoderColor(null);
mergeDTOgjd.setProperties(kshpropertice);
nodes.add(mergeDTOgjd);
sumup.add(zjhm);
//links
kshlinks kshlink = new kshlinks();
kshlink.setSource(asjbh);
kshlink.setTarget(zjhm);
kshlink.setLabel("人案人");
ks.setSource(asjbh);
ks.setTarget(zjhm);
ks.setLabel("人案人");
ks.setProperties(kshlink);
re.add(ks);
if (!zjhm.equals(objectValue)){
// nodes
HnTbStRygxDTO mergeDTOgjd = new HnTbStRygxDTO();
mergeDTOgjd.setId(zjhm);
mergeDTOgjd.setLabel(zjhm);
Kshpropertice kshpropertice = new Kshpropertice();
kshpropertice.setId(zjhm);
kshpropertice.setLabel(zjhm);
kshpropertice.setImgType("idcard");
kshpropertice.setBoderColor(null);
mergeDTOgjd.setProperties(kshpropertice);
nodes.add(mergeDTOgjd);
sumup.add(zjhm);
//links
kshlinks kshlink = new kshlinks();
kshlink.setSource(asjbh);
kshlink.setTarget(zjhm);
kshlink.setLabel("人案人");
Linkspropertice linkspropertice = new Linkspropertice();
linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setSource(asjbh);
linkspropertice.setTarget(zjhm);
linkspropertice.setLabel("人案人");
kshlink.setProperties(linkspropertice);
re.add(kshlink);
}
}
//组装 nodes
HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
/* HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
mergeDTO.setId(asjbh);
mergeDTO.setLabel("案事件编号:"+asjbh);
Kshpropertice kshpropertice = new Kshpropertice();
......@@ -240,10 +236,10 @@ public class KshSlServiceController {
kshpropertice.setImgType("aj");
kshpropertice.setBoderColor(null);
mergeDTO.setProperties(kshpropertice);
nodes.add(mergeDTO);
nodes.add(mergeDTO);*/
kshdata.setNodes(nodes);
kshdata.setLinks(re);
sumup.add(asjbh);
// sumup.add(asjbh);
dataSumup.setList(sumup);
dataSumup.setName("同案关联");
result.setKshData(kshdata);
......
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
......@@ -407,11 +407,13 @@ public class HnTbStRygxController {
kshlink.setSource(name);
kshlink.setTarget(sfzh);
kshlink.setLabel(value);
ks.setSource(name);
ks.setTarget(sfzh);
ks.setLabel(value);
ks.setProperties(kshlink);
re.add(ks);
Linkspropertice linkspropertice = new Linkspropertice();
linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setSource(name);
linkspropertice.setTarget(sfzh);
linkspropertice.setLabel(value);
kshlink.setProperties(linkspropertice);
re.add(kshlink);
}
}
//组装 nodes
......
service/publicapi/src/main/resources/data/getCzgl.json
......@@ -2,15 +2,6 @@
"kshdata": {
"nodes": [
{
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"properties": {
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"imgType": "idcard"
}
},
{
"id": "蒙AKH824",
"label": "蒙AKH824",
"properties": {
......@@ -26,6 +17,7 @@
"target": "蒙AKH824",
"label": "车主",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "车主",
"source": "430123196510265891",
"target": "蒙AKH824"
......@@ -36,7 +28,6 @@
"dataSumup": {
"name": "车主关联",
"list": [
"430123196510265891",
"蒙AKH824"
]
}
......
service/publicapi/src/main/resources/data/getCzgl2.json
......@@ -2,15 +2,6 @@
"kshdata": {
"nodes": [
{
"id": "蒙AKH824",
"label": "车牌号:蒙AKH824",
"properties": {
"id": "蒙AKH824",
"label": "车牌号:蒙AKH824",
"imgType": "cph"
}
},
{
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"properties": {
......@@ -26,6 +17,7 @@
"target": "430123196510265891",
"label": "车主",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "车主",
"source": "蒙AKH824",
"target": "430123196510265891"
......@@ -36,8 +28,7 @@
"dataSumup": {
"name": "车主关联",
"list": [
"430123196510265891",
"蒙AKH824"
"430123196510265891"
]
}
}
\ No newline at end of file
service/publicapi/src/main/resources/data/getJzgl.json
......@@ -2,15 +2,6 @@
"kshdata": {
"nodes": [
{
"id": "18545251333",
"label": "手机号:18545251333",
"properties": {
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"imgType": "sjh"
}
},
{
"id": "430123196510265891",
"label": "430123196510265891",
"properties": {
......@@ -26,6 +17,7 @@
"target": "430123196510265891",
"label": "机主",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "机主",
"source": "18545251333",
"target": "430123196510265891"
......@@ -36,8 +28,7 @@
"dataSumup": {
"name": "机主关联",
"list": [
"430123196510265891",
"18545251333"
"430123196510265891"
]
}
}
\ No newline at end of file
service/publicapi/src/main/resources/data/getJzgl2.json
......@@ -2,15 +2,6 @@
"kshdata": {
"nodes": [
{
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"properties": {
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"imgType": "idcard"
}
},
{
"id": "18545251333",
"label": "18545251333",
"properties": {
......@@ -26,6 +17,7 @@
"target": "18545251333",
"label": "机主",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "机主",
"source": "430123196510265891",
"target": "18545251333"
......@@ -36,7 +28,6 @@
"dataSumup": {
"name": "机主关联",
"list": [
"430123196510265891",
"18545251333"
]
}
......
service/publicapi/src/main/resources/data/getSmgl.json
......@@ -2,21 +2,12 @@
"kshdata": {
"nodes": [
{
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"properties": {
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"imgType": "idcard"
}
},
{
"id": "BGSC001",
"label": "BGSC001",
"properties": {
"id": "BGSC001",
"label": "BGSC001",
"imgType": "other"
"imgType": "imsi"
}
},
{
......@@ -25,7 +16,7 @@
"properties": {
"id": "KFS001",
"label": "KFS001",
"imgType": "other"
"imgType": "imei"
}
},
{
......@@ -53,6 +44,7 @@
"target": "BGSC001",
"label": "IMSI",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "IMSI",
"source": "430123196510265891",
"target": "BGSC001"
......@@ -63,6 +55,7 @@
"target": "KFS001",
"label": "IMEI",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "IMEI",
"source": "430123196510265891",
"target": "KFS001"
......@@ -73,6 +66,7 @@
"target": "18545251333",
"label": "手机号",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "手机号",
"source": "430123196510265891",
"target": "18545251333"
......@@ -83,6 +77,7 @@
"target": "长沙市第一医院",
"label": "MAC",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "MAC",
"source": "430123196510265891",
"target": "长沙市第一医院"
......@@ -93,7 +88,6 @@
"dataSumup": {
"name": "四码关联",
"list": [
"430123196510265891",
"BGSC001",
"KFS001",
"18545251333",
......
service/publicapi/src/main/resources/data/getSmgl2.json
......@@ -2,21 +2,12 @@
"kshdata": {
"nodes": [
{
"id": "18545251333",
"label": "手机号:18545251333",
"properties": {
"id": "18545251333",
"label": "手机号:18545251333",
"imgType": "sjk"
}
},
{
"id": "BGSC001",
"label": "BGSC001",
"properties": {
"id": "BGSC001",
"label": "BGSC001",
"imgType": "other"
"imgType": "imsi"
}
},
{
......@@ -25,7 +16,7 @@
"properties": {
"id": "KFS001",
"label": "KFS001",
"imgType": "other"
"imgType": "imei"
}
},
{
......@@ -44,6 +35,7 @@
"target": "BGSC001",
"label": "IMSI",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "IMSI",
"source": "18545251333",
"target": "BGSC001"
......@@ -54,6 +46,7 @@
"target": "KFS001",
"label": "IMEI",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "IMEI",
"source": "18545251333",
"target": "KFS001"
......@@ -64,6 +57,7 @@
"target": "长沙市第一医院",
"label": "MAC",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "MAC",
"source": "18545251333",
"target": "长沙市第一医院"
......@@ -76,7 +70,6 @@
"list": [
"BGSC001",
"KFS001",
"18545251333",
"长沙市第一医院"
]
}
......
service/publicapi/src/main/resources/data/getThgl.json
......@@ -2,37 +2,28 @@
"kshdata": {
"nodes": [
{
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"properties": {
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"imgType": "idcard"
}
},
{
"id": "证件号码:430123196510265892",
"id": "430123196510265892",
"label": "证件号码:430123196510265892",
"properties": {
"id": "证件号码:430123196510265892",
"id": "430123196510265892",
"label": "证件号码:430123196510265892",
"imgType": "idcard"
}
},
{
"id": "证件号码:430123196510265893",
"id": "430123196510265893",
"label": "证件号码:430123196510265893",
"properties": {
"id": "证件号码:430123196510265893",
"id": "430123196510265893",
"label": "证件号码:430123196510265893",
"imgType": "idcard"
}
},
{
"id": "证件号码:430123196510265894",
"id": "430123196510265894",
"label": "证件号码:430123196510265894",
"properties": {
"id": "证件号码:430123196510265894",
"id": "430123196510265894",
"label": "证件号码:430123196510265894",
"imgType": "idcard"
}
......@@ -44,6 +35,7 @@
"target": "证件号码:430123196510265892",
"label": "配偶关系",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "配偶关系",
"source": "430123196510265891",
"target": "证件号码:430123196510265892"
......@@ -54,6 +46,7 @@
"target": "证件号码:430123196510265893",
"label": "子女关系",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "子女关系",
"source": "430123196510265891",
"target": "证件号码:430123196510265893"
......@@ -64,6 +57,7 @@
"target": "证件号码:430123196510265894",
"label": "父母关系",
"properties": {
"time": "2022-09-16 09:59:11",
"label": "父母关系",
"source": "430123196510265891",
"target": "证件号码:430123196510265894"
......@@ -74,12 +68,9 @@
"dataSumup": {
"name": "同户关联",
"list": [
"430123196510265891",
"15754879533",
"蒙AKH824",
"6216625552447663148522",
"A4690035100002025050074",
"A4301025100002022020012"
"430123196510265892",
"430123196510265893",
"430123196510265894"
]
}
}
\ No newline at end of file
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