Commit 53acf321 by 宋珺琪

可视化返回结果修改 添加glgxData

parent 599f552f
......@@ -3,6 +3,7 @@ package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class Linkspropertice implements Serializable {
......@@ -13,4 +14,6 @@ public class Linkspropertice implements Serializable {
private String target;
private String label;
private List<GlgxData> glgxData;
}
package com.founder.publicapi.controller.KshService;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
......@@ -79,29 +78,27 @@ public class KshSlServiceController {
kshlink.setTarget(asjbh);
kshlink.setLabel("人案");
Linkspropertice linkspropertice = new Linkspropertice();
// linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setTime(abh.getZhrq());
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(asjbh);
linkspropertice.setLabel("人案");
GlgxData glgxData = new GlgxData();
List<GlgxData> list = new ArrayList<>();
glgxData.setBsh(objectValue);
glgxData.setBshlx("idcard");
glgxData.setGlbsh(asjbh);
glgxData.setGlbshlx("aj");
glgxData.setSjly("科信");
glgxData.setGlgx("人案");
glgxData.setGlsj(abh.getZhrq());
list.add(glgxData);
linkspropertice.setGlgxData(list);
kshlink.setProperties(linkspropertice);
re.add(kshlink);
}
//组装 nodes
/* HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
mergeDTO.setId(objectValue);
mergeDTO.setLabel("证件号码:"+objectValue);
Kshpropertice kshpropertice = new Kshpropertice();
kshpropertice.setId(objectValue);
kshpropertice.setLabel("证件号码:"+objectValue);
kshpropertice.setImgType("idcard");
kshpropertice.setBoderColor(null);
mergeDTO.setProperties(kshpropertice);
nodes.add(mergeDTO);*/
kshdata.setNodes(nodes);
kshdata.setLinks(re);
// sumup.add(objectValue);
dataSumup.setList(sumup);
dataSumup.setName("人案关联");
result.setKshdata(kshdata);
......@@ -138,29 +135,26 @@ public class KshSlServiceController {
kshlink.setTarget(zjhm);
kshlink.setLabel("人案");
Linkspropertice linkspropertice = new Linkspropertice();
// linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setTime(sfz.getZhrq());
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(zjhm);
linkspropertice.setLabel("人案");
GlgxData glgxData = new GlgxData();
List<GlgxData> list = new ArrayList<>();
glgxData.setBsh(objectValue);
glgxData.setBshlx("aj");
glgxData.setGlbsh(zjhm);
glgxData.setGlbshlx("idcard");
glgxData.setSjly("科信");
glgxData.setGlgx("人案");
glgxData.setGlsj(sfz.getZhrq());
list.add(glgxData);
linkspropertice.setGlgxData(list);
kshlink.setProperties(linkspropertice);
re.add(kshlink);
}
//组装 nodes
/* HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
mergeDTO.setId(objectValue);
mergeDTO.setLabel("案事件编号:"+objectValue);
Kshpropertice kshpropertice = new Kshpropertice();
kshpropertice.setId(objectValue);
kshpropertice.setLabel("案事件编号:"+objectValue);
kshpropertice.setImgType("aj");
kshpropertice.setBoderColor(null);
mergeDTO.setProperties(kshpropertice);
nodes.add(mergeDTO);*/
kshdata.setNodes(nodes);
kshdata.setLinks(re);
// sumup.add(objectValue);
dataSumup.setList(sumup);
dataSumup.setName("人案关联");
result1.setKshdata(kshdata);
......@@ -226,31 +220,29 @@ public class KshSlServiceController {
kshlink.setTarget(zjhm);
kshlink.setLabel("人案人");
Linkspropertice linkspropertice = new Linkspropertice();
// linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setTime(sfz.getZhrq());
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(zjhm);
linkspropertice.setLabel("人案人");
GlgxData glgxData = new GlgxData();
List<GlgxData> list = new ArrayList<>();
glgxData.setBsh(objectValue);
glgxData.setBshlx("idcard");
glgxData.setGlbsh(zjhm);
glgxData.setGlbshlx("idcard");
glgxData.setSjly("科信");
glgxData.setGlgx("人案人");
glgxData.setGlsj(sfz.getZhrq());
list.add(glgxData);
linkspropertice.setGlgxData(list);
kshlink.setProperties(linkspropertice);
re.add(kshlink);
}
}
//组装 nodes
/* HnTbStRygxDTO mergeDTO = new HnTbStRygxDTO();
mergeDTO.setId(asjbh);
mergeDTO.setLabel("案事件编号:"+asjbh);
Kshpropertice kshpropertice = new Kshpropertice();
kshpropertice.setId(asjbh);
kshpropertice.setLabel("案事件编号:"+asjbh);
kshpropertice.setImgType("aj");
kshpropertice.setBoderColor(null);
mergeDTO.setProperties(kshpropertice);
nodes.add(mergeDTO);*/
}
kshdata.setNodes(nodes);
kshdata.setLinks(re);
// sumup.add(asjbh);
dataSumup.setList(sumup);
dataSumup.setName("同案关联");
result.setKshdata(kshdata);
......@@ -485,11 +477,20 @@ public class KshSlServiceController {
kshpropertice.setImgType("其他物证");
linkspropertice.setLabel("其他物证");
}
// kshlink.setLabel("ASJBH->WZXX");
linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(wzxx);
// linkspropertice.setLabel("ASJBH->WZXX");
GlgxData glgxData = new GlgxData();
List<GlgxData> list = new ArrayList<>();
glgxData.setBsh(objectValue);
glgxData.setBshlx("aj");
glgxData.setGlbsh(st1);
glgxData.setGlbshlx(kshpropertice.getImgType());
glgxData.setSjly("科信");
glgxData.setGlgx(linkspropertice.getLabel());
glgxData.setGlsj(linkspropertice.getTime());
list.add(glgxData);
linkspropertice.setGlgxData(list);
kshlink.setProperties(linkspropertice);
links.add(kshlink);
}
......@@ -547,11 +548,20 @@ public class KshSlServiceController {
kshlink.setLabel("其他物证");
linkspropertice.setLabel("其他物证");
}
// kshlink.setLabel("RYXX->WZXX");
linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(wzxx);
// linkspropertice.setLabel("RYXX->WZXX");
GlgxData glgxData = new GlgxData();
List<GlgxData> list = new ArrayList<>();
glgxData.setBsh(objectValue);
glgxData.setBshlx("idcard");
glgxData.setGlbsh(wzxx);
glgxData.setGlbshlx(kshpropertice.getImgType());
glgxData.setSjly("科信");
glgxData.setGlgx(linkspropertice.getLabel());
glgxData.setGlsj(linkspropertice.getTime());
list.add(glgxData);
linkspropertice.setGlgxData(list);
kshlink.setProperties(linkspropertice);
links.add(kshlink);
}
......@@ -608,11 +618,20 @@ public class KshSlServiceController {
kshlink.setLabel("人员信息");
linkspropertice.setLabel("人员信息");
}
// kshlink.setLabel("WZXX指向RYXX和ASJBH");
linkspropertice.setTime("2022-09-16 09:59:11");
linkspropertice.setSource(objectValue);
linkspropertice.setTarget(s);
// linkspropertice.setLabel("RYXX->WZXX");
GlgxData glgxData = new GlgxData();
List<GlgxData> list = new ArrayList<>();
glgxData.setBsh(objectValue);
glgxData.setBshlx(objectType);
glgxData.setGlbsh(s);
glgxData.setGlbshlx(kshpropertice.getImgType());
glgxData.setSjly("科信");
glgxData.setGlgx(linkspropertice.getLabel());
glgxData.setGlsj(linkspropertice.getTime());
list.add(glgxData);
linkspropertice.setGlgxData(list);
kshlink.setProperties(linkspropertice);
links.add(kshlink);
}
......
......@@ -17,6 +17,17 @@
"target": "蒙AKH824",
"label": "车主",
"properties": {
"glgxData": [
{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "蒙AKH824",
"glbshlx": "cph",
"sjly": "科信",
"glgx": "车主",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "车主",
"source": "430123196510265891",
......
......@@ -3,10 +3,10 @@
"nodes": [
{
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"label": "430123196510265891",
"properties": {
"id": "430123196510265891",
"label": "证件号码:430123196510265891",
"label": "430123196510265891",
"imgType": "idcard"
}
}
......@@ -17,6 +17,17 @@
"target": "430123196510265891",
"label": "车主",
"properties": {
"glgxData": [
{
"bsh": "蒙AKH824",
"bshlx": "cph",
"glbsh": "430123196510265891",
"glbshlx": "idcard",
"sjly": "科信",
"glgx": "车主",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "车主",
"source": "蒙AKH824",
......
......@@ -17,6 +17,17 @@
"target": "430123196510265891",
"label": "机主",
"properties": {
"glgxData": [
{
"bsh": "18545251333",
"bshlx": "sjh",
"glbsh": "430123196510265891",
"glbshlx": "idcard",
"sjly": "科信",
"glgx": "机主",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "机主",
"source": "18545251333",
......
......@@ -17,6 +17,17 @@
"target": "18545251333",
"label": "机主",
"properties": {
"glgxData": [
{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "18545251333",
"glbshlx": "sjk",
"sjly": "科信",
"glgx": "机主",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "机主",
"source": "430123196510265891",
......
......@@ -44,6 +44,15 @@
"target": "BGSC001",
"label": "IMSI",
"properties": {
"glgxData": [{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "BGSC001",
"glbshlx": "imsi",
"sjly":"科信",
"glgx": "IMSI",
"glsj": "2022-09-16 09:59:11"
}],
"time": "2022-09-16 09:59:11",
"label": "IMSI",
"source": "430123196510265891",
......@@ -55,6 +64,15 @@
"target": "KFS001",
"label": "IMEI",
"properties": {
"glgxData": [{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "KFS001",
"glbshlx": "imei",
"sjly":"科信",
"glgx": "IMEI",
"glsj": "2022-09-16 09:59:11"
}],
"time": "2022-09-16 09:59:11",
"label": "IMEI",
"source": "430123196510265891",
......@@ -66,6 +84,15 @@
"target": "18545251333",
"label": "手机号",
"properties": {
"glgxData":[ {
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "18545251333",
"glbshlx": "sjk",
"sjly":"科信",
"glgx": "手机号",
"glsj": "2022-09-16 09:59:11"
}],
"time": "2022-09-16 09:59:11",
"label": "手机号",
"source": "430123196510265891",
......@@ -77,6 +104,15 @@
"target": "长沙市第一医院",
"label": "MAC",
"properties": {
"glgxData": [{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "长沙市第一医院",
"glbshlx": "mac",
"sjly":"科信",
"glgx": "MAC",
"glsj": "2022-09-16 09:59:11"
}],
"time": "2022-09-16 09:59:11",
"label": "MAC",
"source": "430123196510265891",
......
......@@ -35,6 +35,17 @@
"target": "BGSC001",
"label": "IMSI",
"properties": {
"glgxData": [
{
"bsh": "18545251333",
"bshlx": "sjk",
"glbsh": "BGSC001",
"glbshlx": "imsi",
"sjly": "科信",
"glgx": "IMSI",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "IMSI",
"source": "18545251333",
......@@ -46,6 +57,17 @@
"target": "KFS001",
"label": "IMEI",
"properties": {
"glgxData": [
{
"bsh": "18545251333",
"bshlx": "sjk",
"glbsh": "KFS001",
"glbshlx": "imei",
"sjly": "科信",
"glgx": "IMEI",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "IMEI",
"source": "18545251333",
......@@ -57,6 +79,17 @@
"target": "长沙市第一医院",
"label": "MAC",
"properties": {
"glgxData": [
{
"bsh": "18545251333",
"bshlx": "sjh",
"glbsh": "长沙市第一医院",
"glbshlx": "mac",
"sjly": "科信",
"glgx": "MAC",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "MAC",
"source": "18545251333",
......
......@@ -35,6 +35,17 @@
"target": "430123196510265892",
"label": "配偶关系",
"properties": {
"glgxData": [
{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "430123196510265892",
"glbshlx": "idcard",
"sjly": "科信",
"glgx": "配偶关系",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "配偶关系",
"source": "430123196510265891",
......@@ -46,6 +57,17 @@
"target": "430123196510265893",
"label": "子女关系",
"properties": {
"glgxData": [
{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "430123196510265893",
"glbshlx": "idcard",
"sjly": "科信",
"glgx": "子女关系",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "子女关系",
"source": "430123196510265891",
......@@ -57,6 +79,17 @@
"target": "430123196510265894",
"label": "父母关系",
"properties": {
"glgxData": [
{
"bsh": "430123196510265891",
"bshlx": "idcard",
"glbsh": "430123196510265894",
"glbshlx": "idcard",
"sjly": "科信",
"glgx": "父母关系",
"glsj": "2022-09-16 09:59:11"
}
],
"time": "2022-09-16 09:59:11",
"label": "父母关系",
"source": "430123196510265891",
......
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