同步接口（重庆）

common/common_utils/src/main/java/com/founder/commonutils/model/asjEntity/CbajExport.java

+package com.founder.commonutils.model.asjEntity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CbajExport {
+
+    private String asjbh;
+
+    private String ajmc;
+
+    private String asjfssjAsjfskssj;
+
+    private List photo;
+
+    private List media;
+
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SaspEntity/PhotoOrMediaResult.java

+package com.founder.commonutils.model.newPublicEntity.SaspEntity;
+
+import lombok.Data;
+
+@Data
+public class PhotoOrMediaResult {
+    // 路径
+    private String fileUrl;
+    // 创建时间
+    private String time;
+    // 文件名
+    private String fileName;
+    // 经度
+    private String x;
+    // 纬度
+    private String y;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsTask.java

@@ -90,6 +90,12 @@ public class SkRegionalsTask extends Model<SkRegionalsTask> {
      */
     @TableField(exist = false)
     private String resultCount;
+
+    /**
+     * 导出时间格式转换备用字段
+     */
+    @TableField(exist = false)
+    private String byzd1;
     /**
      * 获取主键值
      *

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkServiceCache.java

@@ -81,4 +81,10 @@ public class SkServiceCache implements Serializable {
     @ApiModelProperty(value = "每页数")
     @TableField(exist = false)
     private int pageSize;
+
+    /**
+     * 导出时间格式转换备用字段
+     */
+    @TableField(exist = false)
+    private String byzd1;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/GlgxData.java

+package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
+
+import lombok.Data;
+
+@Data
+public class GlgxData {
+
+    private String bsh;
+    private String bshlx;
+    private String glbsh;
+    private String glbshlx;
+    private String sjly;
+    private String glgx;
+    private String glsj;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygxDTO.java

@@ -19,6 +19,8 @@ public class HnTbStRygxDTO implements Serializable  {
 
     private String id;
     private String label;
+    private int x;
+    private int y;
 
     private Kshpropertice properties;
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Linkspropertice.java

@@ -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,7 @@ public class Linkspropertice implements Serializable {
     private String target;
 
     private String label;
+
+    private List<GlgxData> glgxData;
+
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/kshEntity/KshServiceCache.java

@@ -68,4 +68,11 @@ public class KshServiceCache implements Serializable {
     @ApiModelProperty(value = "每页数")
     @TableField(exist = false)
     private int pageSize;
+
+
+    /**
+     * 导出时间格式转换备用字段
+     */
+    @TableField(exist = false)
+    private String byzd1;
 }

common/service_base/src/main/java/com/founder/servicebase/controller/KshServiceController.java

@@ -13,6 +13,7 @@ import com.founder.commonutils.model.newPublicEntity.kshEntity.KshServiceCache;
 import com.founder.commonutils.model.newPublicEntity.ztypEntity.KshServicePojo;
 import com.founder.commonutils.model.newPublicEntity.ztypEntity.KsjResultCheck;
 import com.founder.commonutils.model.newPublicEntity.ztypEntity.KsjResultPojo;
+import com.founder.commonutils.util.ExportExcelUtil;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.commonutils.util.StringUtil;
 import com.founder.servicebase.logs.OperLog;
@@ -29,7 +30,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -139,6 +142,41 @@ public class KshServiceController extends ApiController {
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
     }
 
+    @PostMapping("kshlbExport")
+    @ApiOperation(value = "算例可视化服务列表导出")
+    @OperLog(message = "可视化服务列表导出", operation = OperationType.QUERY)
+    public void kshlbExport(HttpServletResponse response, @RequestBody KshServicePojo kshServicePojo) throws Exception {
+        //分页
+        Page page = new Page(kshServicePojo.getPage(), kshServicePojo.getPageSize());
+        QueryWrapper queryWrapper = new QueryWrapper();
+
+        if (kshServicePojo.getSlname()!=null&& !kshServicePojo.getSlname().equals("")){
+            queryWrapper.like("slName",kshServicePojo.getSlname());
+        }
+        if (kshServicePojo.getSlms()!=null&& !kshServicePojo.getSlms().equals("")){
+            queryWrapper.like("slms",kshServicePojo.getSlms());
+        }
+        if (kshServicePojo.getUrl()!=null&& !kshServicePojo.getUrl().equals("")){
+            queryWrapper.like("url",kshServicePojo.getUrl());
+        }
+        LocalDateTime cjkssj = kshServicePojo.getCjkssj();
+        LocalDateTime cjjssj = kshServicePojo.getCjjssj();
+        if (ObjectUtil.isNotNull(cjkssj) && ObjectUtil.isNotNull(cjjssj)) {
+            queryWrapper.apply("cjsj between'" +  cjkssj.toString() + "' and '" + cjjssj.toString() +"'" );
+        } else if (ObjectUtil.isNotNull( cjkssj)) {
+            queryWrapper.apply("cjsj >= '" + cjkssj.toString() +"'" );
+        } else if (ObjectUtil.isNotNull(cjjssj)) {
+            queryWrapper.apply("cjsj <= '" + cjjssj.toString() +"'" );
+        }
+        queryWrapper.eq("isDeleted", "0");
+        queryWrapper.orderByDesc("cjsj");
+        IPage page1 = kshService.page(page, queryWrapper);
+
+        ExportExcelUtil<KshServicePojo> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"算力名称","算力描述","请求方式","请求路径","是否带时间参数","创建时间"};
+        String[] headersField = {"slname","slms","type","url","sfdsjcs","cjsj"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, page1.getRecords(), response,"可视化服务列表");
+    }
 
     @PostMapping("check")
     @ApiOperation(value = "可视化数据结构验证")
@@ -314,6 +352,34 @@ public class KshServiceController extends ApiController {
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
     }
 
+    @PostMapping("dwqbExport")
+    @ApiOperation(value = "多维情报线索分析列表导出")
+    @OperLog(message = "多维情报线索分析列表导出", operation = OperationType.QUERY)
+    public void dwqbExport(HttpServletResponse response, @RequestBody KshServiceCache kshServiceCache, HttpServletRequest request) throws Exception {
+        SysUser user = (SysUser)request.getAttribute("user");
+        //分页
+        Page page = new Page(kshServiceCache.getPage(), kshServiceCache.getPageSize());
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("zjhm", user.getIdentitycard());
+        queryWrapper.orderByDesc("cjsj");
+        IPage page1 = kshCacheService.page(page, queryWrapper);
+        List<KshServiceCache> listResult = page1.getRecords();
+        for (KshServiceCache serviceCache : listResult) {
+            //对任务时间进行格式修改
+            if (serviceCache.getCjsj()!=null ){
+                Date djsj = serviceCache.getCjsj();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+                String format = sdf.format(djsj);
+                serviceCache.setByzd1(format);
+            }
+        }
+
+        ExportExcelUtil<KshServiceCache> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"研判名称","标识号","标识号类型","研判时间","备注"};
+        String[] headersField = {"ypmc","bsh","bshtype","byzd1","bz"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, listResult, response,"多维情报线索分析列表导出");
+    }
+
     @PostMapping("updateKshCache")
     @ApiOperation(value = "多维情报_修改可视化服务信息")
     @OperLog(message = "多维情报_修改可视化服务信息", operation = OperationType.UPDATE)

common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceCacheController.java

+/*
 package com.founder.servicebase.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.founder.publicapi.service.TbStAsjService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.commonutils.model.asjEntity.TbStAsj;
 import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.SkServiceCache;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
+import com.founder.commonutils.util.ExportExcelUtil;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.servicebase.logs.OperLog;
 import com.founder.servicebase.logs.OperationType;
@@ -25,15 +29,20 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+*/
 /**
  * 时空服务列表表控制层
  *
  * @author yangyang
  * @since 2022-10-14
- */
+ *//*
+
 @RestController
 @RequestMapping("SkService")
 @Api(tags = "SK服务信息")
@@ -44,6 +53,8 @@ public class SkServiceCacheController extends ApiController {
     SysDictitemAllMapper sysDictitemAllMapper;
     @Autowired
     private SkDictionaryService skDictionaryService;
+    @Autowired
+    TbStAsjService tbStAsjService;
 
     @PostMapping("saveSkCache")
     @ApiOperation(value = "时空_新增可视化缓存记录")
@@ -109,6 +120,11 @@ public class SkServiceCacheController extends ApiController {
                         map.put(k,"所属分局");
                     }else if("2".equals(v)){
                         map.put(k,"所属派出所");
+                    }else if ("3".equals(v)){
+                        //根据案件编号去查对应案件的坐标
+                        TbStAsj xy = tbStAsjService.getXYByAsjbh(q.getObjectvalue());
+                        map.put(k,xy.getAsjfsddDqjd()+"\n"+xy.getAsjfsddDqwd());
+
                     }
                 }else if(k.equals("标签")){
                     List<String> bqs = (List<String>) v;
@@ -122,5 +138,69 @@ public class SkServiceCacheController extends ApiController {
         });
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
     }
+
+    @PostMapping("xslbExport")
+    @ApiOperation(value = "线索列表导出")
+    @OperLog(message = "线索列表导出", operation = OperationType.QUERY)
+    public void xslbExport(HttpServletResponse response, @RequestBody SkServiceCache skServiceCache, HttpServletRequest request) throws Exception {
+        SysUser user = (SysUser)request.getAttribute("user");
+        //分页
+        Page page = new Page(skServiceCache.getPage(), skServiceCache.getPageSize());
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("zjhm", user.getIdentitycard());
+        if (skServiceCache.getYpmc()!=null&& !"".equals(skServiceCache.getYpmc())){ // 研判名称
+            queryWrapper.like("ypmc",skServiceCache.getYpmc());
+        }
+        if (skServiceCache.getObjecttype()!=null&& !"".equals(skServiceCache.getObjecttype())){ // 研判类型
+            queryWrapper.like("objecttype",skServiceCache.getObjecttype());
+        }
+        //时间
+        if (skServiceCache.getYpsjkssj() != null) {
+            queryWrapper.ge("str_to_date(ypsj,'%Y-%m-%d %H:%i:%s')", skServiceCache.getYpsjkssj());
+        }
+        if (skServiceCache.getYpsjjssj() != null) {
+            queryWrapper.le("str_to_date(ypsj,'%Y-%m-%d %H:%i:%s')", skServiceCache.getYpsjjssj());
+        }
+        queryWrapper.orderByDesc("ypsj");
+        IPage page1 = skCacheService.page(page, queryWrapper);
+        List<SkServiceCache> listResult = page1.getRecords();
+        for (SkServiceCache serviceCache : listResult) {
+            //时间格式的修改
+            if (serviceCache.getYpsj()!=null ){
+                Date djsj = serviceCache.getYpsj();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+                String format = sdf.format(djsj);
+                serviceCache.setByzd1(format);
+            }
+        }
+        listResult.stream().forEach(q->{
+            Map<Object,Object> map = JSON.parseObject(q.getYptjStringJson(), Map.class);
+            map.forEach((k, v) -> {
+
+                // 代码翻译
+                if(k.equals("区域")){
+                    if("1".equals(v)){
+                        map.put(k,"所属分局");
+                    }else if("2".equals(v)){
+                        map.put(k,"所属派出所");
+                    }
+                }else if(k.equals("标签")){
+                    List<String> bqs = (List<String>) v;
+                    if (bqs!=null && bqs.size()>0){
+                        List<String> names = sysDictitemAllMapper.getNameByCodeBq(bqs);
+                        map.put(k,names);
+                    }
+                }else if(k.equals("轨迹类型")){
+                    map.put(k,skDictionaryService.findDmmcByDmAndDmlx((String) v,"GJ"));
+                }
+            });
+            q.setYptj(map);
+        });
+        ExportExcelUtil<SkServiceCache> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"研判名称","研判号码","研判时间","研判条件"};
+        String[] headersField = {"ypmc","objectvalue","byzd1","yptj"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, page1.getRecords(), response,"线索列表信息");
+    }
 }
 
+*/

common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java

@@ -116,7 +116,7 @@ public class SysUserController extends ApiController {
         queryWrapper.eq("SCBZ", 0);
         SysUser one = sysUserService.getOne(queryWrapper);
         if (one == null) {
-            return MapRestResult.build(500, "该用户不存在", null);
+            return MapRestResult.build(200, "该用户不存在", null);
         }
         // 拿到真实ip
         one.setIp(NetworkUtil.getIpAddr(request));

common/service_base/src/main/java/com/founder/servicebase/meassage/WebSocketServer.java

@@ -82,7 +82,11 @@ public class WebSocketServer {
     public static void SendMessage(Session session, String message) {
         try {
 //            session.getBasicRemote().sendText(String.format("%s (From Server，Session ID=%s)",message,session.getId()));
-            session.getBasicRemote().sendText(message);
+            for (Session session1 : SessionSet) {
+                if (session.equals(session1)){
+                    session.getBasicRemote().sendText(message);
+                }
+            }
         } catch (IOException e) {
             log.error("发送消息出错：{}", e.getMessage());
             e.printStackTrace();
@@ -95,10 +99,16 @@ public class WebSocketServer {
      * @throws IOException
      */
     public static void BroadCastInfo(String message) throws IOException {
-        for (Session session : SessionSet) {
-            if(session.isOpen()){
-                SendMessage(session, message);
+
+        try {
+            for (Session session : map.values()) {
+                log.info("服务端群发给客户端[{}]发送消息{}", session.getId(), message);
+                synchronized (session) {
+                    SendMessage(session,message);
+                }
             }
+        } catch (Exception e) {
+            log.error("服务端发送消息给客户端失败", e);
         }
     }
 

common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SkServiceApplyServiceImpl.java

@@ -7,6 +7,7 @@ import com.founder.commonutils.model.vo.param.SkServiceApplyParam;
 import com.founder.commonutils.model.vo.response.SkServiceApplyVO;
 import com.founder.servicebase.logs.mapper.mysqlMapper.SkServiceApplyMapper;
 import com.founder.servicebase.service.SkServiceApplyService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,13 @@ public class SkServiceApplyServiceImpl extends ServiceImpl<SkServiceApplyMapper,
         int count=baseMapper.count(skRegionalsDetailParam);
         skRegionalsDetailParam.setPage((skRegionalsDetailParam.getPage()-1)*skRegionalsDetailParam.getPageSize());
         List<SkServiceApplyVO> list=baseMapper.findAll(skRegionalsDetailParam);
+        if (list==null){
+            map.put("count",0);
+            map.put("list","");
+            return map;
+        }
+        //把数据为空的去掉
+        List<SkServiceApplyVO> collect = list.stream().filter(s -> StringUtils.isNotBlank(s.getFlag()) && StringUtils.isNotBlank(s.getServiceDeleted())).collect(Collectors.toList());
         // 拿出展示状态（服务申请），flag0代表不展示；服务删除标志serviceDeleted,将申请表Status置为3失效状态
         List<SkServiceApplyVO> listFilter = list.stream().filter(p->p.getFlag().equals("0")||p.getServiceDeleted().equals("1")).collect(Collectors.toList());
         listFilter.stream().forEach(p->{

service/publicapi/src/main/java/com/founder/publicapi/controller/ApprovalService/PzGlController.java

@@ -54,15 +54,24 @@ public class PzGlController {
         if (tbstApprovePzxx.getAjlb().equals("大数据建模")){
             String originalName = multipartFile.getOriginalFilename().toLowerCase(Locale.ROOT);
             tbstApprovePzxx.setWordName(originalName);
-            try {
+/*            try {
                 tbstApprovePzxx.setWordFile(multipartFile.getBytes());
             } catch (IOException e) {
                 e.printStackTrace();
-            }
+            }*/
             result = pzService.savePzxx(tbstApprovePzxx);
             //上传到服务器
             String username = tbstApprovePzxx.getCreateUserId();
             String jzmc = (String) result.get("data");
+            //判断文件类型
+            String s = multipartFile.getOriginalFilename().toLowerCase(Locale.ROOT);
+            if (!s.endsWith(".docx") && !s.endsWith(".doc")) {
+                result.put("status",201);
+                result.put("msg","上传失败，请选择doxc或doc文件");
+                result.put("data","");
+                result.put("count",0);
+                return result;
+            }
             saveInResources(multipartFile,username,jzmc);
         }else
         try {

service/publicapi/src/main/java/com/founder/publicapi/controller/ApprovalService/UserController.java

@@ -179,7 +179,7 @@ public class UserController {
         Map<String,Object> result = new HashMap<>();
         List<User> list = userService.getAllowAgentUsers(loginUserPoliceId,agentUserPoliceId,agentUserXm);
         result.put("msg","success");
-        result.put("status","200");
+        result.put("status",200);
         result.put("data",list);
         result.put("count",list.size());
         return result;

service/publicapi/src/main/java/com/founder/publicapi/controller/AsjService/AsjController.java

@@ -3,15 +3,14 @@ package com.founder.publicapi.controller.AsjService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
-import com.founder.commonutils.model.asjEntity.TbAsjJwdInfo;
-import com.founder.commonutils.model.asjEntity.TbStAsj;
-import com.founder.commonutils.model.asjEntity.TbStAsjResult;
+import com.founder.commonutils.model.asjEntity.*;
 import com.founder.commonutils.model.newPublicEntity.*;
 
 
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo;
 import com.founder.commonutils.model.vo.param.*;
+import com.founder.commonutils.util.ExportExcelUtil;
 import com.founder.commonutils.util.JsonUtils;
 import com.founder.publicapi.service.TbStAsjService;
 import com.founder.servicebase.logs.OperLog;
@@ -25,6 +24,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -56,6 +56,56 @@ public class AsjController {
         return MapRestResult.build(200,"成功获取案件信息",total,asjList);
     }
 
+    @OperLog(message = "串并案件导出",operation = OperationType.QUERY)
+    @ApiOperation(value = "串并案件导出")
+    @PostMapping("cbajExport")
+    public void cbajExport(HttpServletResponse response, @RequestBody TbStAsjParm tbStAsjParm) throws Exception {
+
+        List<TbStAsjResult> list = tbStAsjService.selectAsjxxList(tbStAsjParm);
+        ArrayList<CbajExport> re = new ArrayList<>();
+        JSONObject jsonObject = null;
+        for (TbStAsjResult tbStAsjResult : list) {
+            CbajExport cbajExport = new CbajExport();
+            cbajExport.setAsjbh(tbStAsjResult.getAsjbh());
+            cbajExport.setAjmc(tbStAsjResult.getAjmc());
+            cbajExport.setAsjfssjAsjfskssj(tbStAsjResult.getAsjfssjAsjfskssj());
+
+            List<PhotoOrMediaResult> videoByAsjbh = tbStAsjService.getVideoByAsjbh(tbStAsjResult.getAsjbh());
+            List<PhotoOrMediaResult> photoByAsjbh = tbStAsjService.getPhotoByAsjbh(tbStAsjResult.getAsjbh());
+
+            List videos = new ArrayList<>();
+            List photos = new ArrayList<>();
+
+            for (PhotoOrMediaResult video : videoByAsjbh) {
+                videos.add(video.getFileUrl());
+            }
+            for (PhotoOrMediaResult photo : photoByAsjbh) {
+                photos.add(photo.getFileUrl());
+            }
+            cbajExport.setPhoto(photos);
+            cbajExport.setMedia(videos);
+
+            re.add(cbajExport);
+        }
+        ExportExcelUtil<CbajExport> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"案件编号","案件名称","案发时间","照片","视频"};
+        String[] headersField = {"asjbh","ajmc","asjfssjAsjfskssj","photo","media"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, re, response,"串并案件信息");
+    }
+
+    @OperLog(message = "态势分析地图检索导出",operation = OperationType.QUERY)
+    @ApiOperation(value = "态势分析地图检索导出")
+    @PostMapping("tsfxExport")
+    public void tsfxExport(HttpServletResponse response,@RequestBody TbStAsjParm tbStAsjParm) throws Exception {
+
+        List<TbStAsjResult> list = tbStAsjService.selectAsjxxList(tbStAsjParm);
+        ExportExcelUtil<TbStAsjResult> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"案件编号","案件名称","案发时间","案发地址","坐标x","坐标y","案件类别","案件标签","简要案情"};
+        String[] headersField = {"asjbh","ajmc","asjfssjAsjfskssj","asjfsddDzmc","x","y","ajlbdmMc","zatzJyqkMc","jyaq"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, list, response,"态势分析地图检索");
+    }
+
+
     @OperLog(message = "点位校验_获取案件经纬度",operation = OperationType.QUERY)
     @ApiOperation(value = "点位校验_获取案件经纬度")
     @PostMapping("getJwdinfoByAsjbh")

service/publicapi/src/main/java/com/founder/publicapi/controller/Database/DatabaseController.java

@@ -47,35 +47,35 @@ public class DatabaseController {
             if (!StringUtil.isEmpty(type) && StringUtil.isEmpty(table) && type.equals("sk")){
                 //sk 列表
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like 'sk%' ORDER BY CREATE_TIME DESC");
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' and TABLE_NAME like 'sk%' ORDER BY CREATE_TIME DESC");
             }else if (!StringUtil.isEmpty(type) && StringUtil.isEmpty(table) && type.equals("ksh")){
                 //ksh 列表
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like 'ksh%' ORDER BY CREATE_TIME DESC ");
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' and TABLE_NAME like 'ksh%' ORDER BY CREATE_TIME DESC ");
             }else if (!StringUtil.isEmpty(type) && StringUtil.isEmpty(table) && type.equals("xz")){
                 //xz 列表
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and (TABLE_NAME not like 'sk%' and TABLE_NAME  not like 'ksh%') ORDER BY CREATE_TIME DESC ");
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' and (TABLE_NAME not like 'sk%' and TABLE_NAME  not like 'ksh%') ORDER BY CREATE_TIME DESC ");
             }else if (!StringUtil.isEmpty(type) && !StringUtil.isEmpty(table) && type.equals("sk")){
                 //sk 模糊
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%' and TABLE_NAME like 'sk%' ORDER BY CREATE_TIME DESC");
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%' and TABLE_NAME like 'sk%' ORDER BY CREATE_TIME DESC");
             }else if (!StringUtil.isEmpty(type) && !StringUtil.isEmpty(table) && type.equals("ksh")){
                 //ksh 模糊
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%'and TABLE_NAME like 'ksh%' ORDER BY CREATE_TIME DESC");
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%'and TABLE_NAME like 'ksh%' ORDER BY CREATE_TIME DESC");
             }else if (!StringUtil.isEmpty(type) && !StringUtil.isEmpty(table) && type.equals("xz")){
                 //xz 模糊
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%'and (TABLE_NAME not like 'sk%' and TABLE_NAME  not like 'ksh%' ORDER BY CREATE_TIME DESC)  ");
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%'and (TABLE_NAME not like 'sk%' and TABLE_NAME  not like 'ksh%' ORDER BY CREATE_TIME DESC)  ");
             } else if (StringUtil.isEmpty(type)&& StringUtil.isEmpty(table)){
                 //查询所有的
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' ORDER BY CREATE_TIME DESC ");//limit " + page + ","+pageSize+"
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' ORDER BY CREATE_TIME DESC ");//limit " + page + ","+pageSize+"
             }else if(StringUtil.isEmpty(type)&& !StringUtil.isEmpty(table)){
                 //  模糊查询
                 rs = stmt.executeQuery
-                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%' ORDER BY CREATE_TIME DESC");
+                        ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间',table_rows'数量' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%' ORDER BY CREATE_TIME DESC");
             }
             while (rs.next())
             {
@@ -83,6 +83,7 @@ public class DatabaseController {
                 map.put("TABLE_NAME",rs.getString("表名称"));
                 map.put("TABLE_COMMENT",rs.getString("表说明"));
                 map.put("CREATE_TIME",rs.getString("创建时间"));
+                map.put("TABLE_ROWS",rs.getString("数量"));
                 database.add(map);
             }
             int total = database.size();

service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java

@@ -84,6 +84,17 @@ public class KshSlServiceController {
                     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);
 
@@ -143,6 +154,17 @@ public class KshSlServiceController {
                     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);
                 }
@@ -231,6 +253,17 @@ public class KshSlServiceController {
                         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);
                     }
@@ -490,6 +523,17 @@ public class KshSlServiceController {
                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);
            }
@@ -552,6 +596,17 @@ public class KshSlServiceController {
                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);
            }
@@ -613,6 +668,17 @@ public class KshSlServiceController {
                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);
            }

service/publicapi/src/main/java/com/founder/publicapi/controller/ResourceManager/ResourceManagerController.java

@@ -78,7 +78,7 @@ public class ResourceManagerController {
             }else   return new MapRestResult(200,"上传失败",null);
 
         }else {
-            return new MapRestResult().error("请上传文件");
+            return new MapRestResult(200,"请上传文件",null);
         }
     }
 
@@ -173,8 +173,8 @@ public class ResourceManagerController {
 
 
     @GetMapping(value = "download")
-    @OperLog(message = "文件下载", operation = OperationType.QUERY)
-    @ApiOperation(value = "文件下载")
+    @OperLog(message = "下载文件", operation = OperationType.QUERY)
+    @ApiOperation(value = "下载文件")
     public void download (String id ,String fileType, String fileName,HttpServletResponse response) throws IOException {
 
         String path1 = RESOURCE_MANAGER_DOWNLOAD +id + fileType;

service/publicapi/src/main/java/com/founder/publicapi/controller/RyAndAj/RyAndAjController.java

@@ -10,6 +10,7 @@ import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.RyAndAjEntity.*;
 import com.founder.commonutils.model.newPublicEntity.SkTrail;
 import com.founder.commonutils.model.newPublicEntity.SysDictitem;
+import com.founder.commonutils.util.ExportExcelUtil;
 import com.founder.commonutils.util.StringUtil;
 import com.founder.publicapi.mapper.mysqlMapper.*;
 import com.founder.publicapi.service.AjService;
@@ -26,6 +27,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Field;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -148,6 +150,104 @@ public class RyAndAjController {
 
     }
 
+    @OperLog(message = "智图案件导出",operation = OperationType.QUERY)
+    @ApiOperation(value = "智图案件导出")
+    @PostMapping("ztajExport")
+    public void ztraExport(HttpServletResponse response, @RequestParam(name = "ajmc", required = false) String ajmc,
+                           @RequestParam(name = "cbdw", required = false) String cbdw,
+                           @RequestParam(name = "bhcx", required = false) String bhcx,
+                           @RequestParam(name = "afstartTime", required = false) String afstartTime,
+                           @RequestParam(name = "afendTime", required = false) String afendTime,
+                           @RequestParam(name = "zcjddm", required = false) String zcjddm,
+                           @RequestParam(name = "state", required = false) String state,
+                           @RequestParam(name = "cjstartTime", required = false) String cjstartTime,
+                           @RequestParam(name = "cjendTime", required = false) String cjendTime,
+                           @RequestParam(name = "zjhm", required = false) String zjhm,
+                           @RequestParam(name = "ajlbdm", required = false) String ajlbdm,
+                           @RequestParam(name = "currentPage", defaultValue = "1") Integer currentPage,
+                           @RequestParam(name = "pageSize", defaultValue = "5") Integer pageSize) throws Exception {
+        QueryWrapper<TbStJzyp> wrapper = new QueryWrapper<>();
+        wrapper.eq(!StringUtil.isEmpty(ajmc),"ajmc", ajmc);
+        wrapper.eq(!StringUtil.isEmpty(cbdw),"sldw_gajgmc", cbdw);
+        wrapper.eq(!StringUtil.isEmpty(bhcx),"asjbh", bhcx);
+        if (!StringUtil.isEmpty( afstartTime) && !StringUtil.isEmpty(afendTime)) {
+            wrapper.apply("asjfssj_asjfskssj between'" +  afstartTime.toString() + "' and '" + afendTime.toString() +"'" );
+        } else if (!StringUtil.isEmpty( afstartTime)) {
+            wrapper.apply("asjfssj_asjfskssj >= '" + afstartTime.toString() +"'" );
+        } else if (!StringUtil.isEmpty(afendTime)) {
+            wrapper.apply("asjfssj_asjfskssj <= '" + afendTime.toString() +"'" );
+        }
+        wrapper.eq(!StringUtil.isEmpty(zcjddm),"zcjddm", zcjddm);
+        wrapper.eq(!StringUtil.isEmpty(state),"state", state);
+        if (!StringUtil.isEmpty(cjstartTime) && !StringUtil.isEmpty(cjendTime)) {
+            wrapper.apply("cjsj between'" +  cjstartTime.toString() + "' and '" + cjendTime.toString() +"'" );
+        } else if (!StringUtil.isEmpty( cjstartTime)) {
+            wrapper.apply("cjsj >= '" + cjstartTime.toString() +"'" );
+        } else if (!StringUtil.isEmpty(cjendTime)) {
+            wrapper.apply("cjsj <= '" + cjendTime.toString() +"'" );
+        }
+        wrapper.eq(!StringUtil.isEmpty(ajlbdm),"ajlbdm", ajlbdm);
+        if (!StringUtil.isEmpty(zjhm)){
+            String s = ryService.selectAjbhBySfz(zjhm);
+            wrapper.eq(!StringUtil.isEmpty(s),"asjbh", s);
+        }
+        wrapper.last("ORDER BY  state !='1' ,asjfssj_asjfskssj DESC");
+        Page page = new Page(currentPage,pageSize);
+        IPage<TbStJzyp> iPage = ajService.page(page,wrapper);
+        List<TbStJzyp> records = iPage.getRecords();
+        List<TbStJzyp> resultList = new ArrayList<>();
+
+        for (TbStJzyp record :records) {
+            TbStJzyp stJzyp = new TbStJzyp();
+            stJzyp.setAjmc(record.getAjmc());
+            String zcjddm1 = record.getZcjddm();
+            if (zcjddm1.substring(0,2).equals("06")){
+                stJzyp.setZcjddm("已破案");
+            }else {
+                stJzyp.setZcjddm("未破案");
+            }
+            stJzyp.setState(record.getState());
+            stJzyp.setCounts(record.getCounts());
+            stJzyp.setAsjbh(record.getAsjbh());
+            stJzyp.setAjlbdmmc(record.getAjlbdmmc());
+            stJzyp.setAsjfssjAsjfskssj(record.getAsjfssjAsjfskssj());
+            stJzyp.setSldwGajgmc(record.getSldwGajgmc());
+            stJzyp.setCjsj(record.getCjsj());
+            resultList.add(stJzyp);
+        }
+        ExportExcelUtil<TbStJzyp> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"案件名称","破案状态","认定状态","研判结果","案件编号","案件类别","案发时间","承办单位","创建时间"};
+        String[] headersField = {"ajmc","zcjddm","state","counts","asjbh","ajlbdmmc","asjfssjAsjfskssj","sldwGajgmc","cjsj"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, resultList, response,"智图案件信息");
+    }
+
+    /**
+     * 智图人员信息
+     * @param asjbh 案事件编号
+     * @param currentPage
+     * @param pageSize
+     * @return
+     */
+    @OperLog(message = "智图人员导出",operation = OperationType.QUERY)
+    @ApiOperation(value = "智图人员导出")
+    @PostMapping("ztryExport")
+    public void ztryExport(HttpServletResponse response,@RequestParam(name = "asjbh") String asjbh,
+                           @RequestParam(name = "currentPage", defaultValue = "1") Integer currentPage,
+                           @RequestParam(name = "pageSize", defaultValue = "5") Integer pageSize) throws Exception {
+
+        //人员信息
+        QueryWrapper<TbStXftpNew> wrapper = new QueryWrapper<>();
+        wrapper.eq(!StringUtil.isEmpty(asjbh),"asjbh", asjbh);
+        Page page = new Page(currentPage,pageSize);
+        IPage<TbStXftpNew> iPage = ryService.page(page,wrapper);
+        List<TbStXftpNew> rylist = iPage.getRecords();
+
+        ExportExcelUtil<TbStXftpNew> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"身份证号","姓名","年龄","性别","户籍","手机(计)","人像","车牌","常驻时间","逃离时间","犯罪特征","犯罪违法数"};
+        String[] headersField = {"zjhm","xm","age","xb","hjd","usernum","rx","carnum","tlsc2","tlsj","rybq","wffzcount"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, rylist, response,"智图人员信息");
+    }
+
 
     /**
      * 案关联人员

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkPointlocationController.java

@@ -11,6 +11,7 @@ import com.founder.commonutils.model.vo.param.SkPointlocationParam;
 import com.founder.commonutils.model.vo.param.SkPointlocationParams;
 import com.founder.commonutils.model.vo.param.SkPointlocationParamsGeo;
 import com.founder.commonutils.util.DateUtil;
+import com.founder.commonutils.util.ExportExcelUtil;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.commonutils.model.newPublicEntity.SkPointlocation;
 import com.founder.servicebase.controller.ExcelControllerInterface;
@@ -28,6 +29,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -194,6 +196,65 @@ public class SkPointlocationController extends ApiController implements ExcelCon
     }
 
     /**
+     * 查询列表（分页）
+     */
+    @PostMapping("dwExport")
+    @ApiOperation(value = "点位信息获取导出")
+    @OperLog(message = "点位信息导出", operation = OperationType.QUERY)
+    public void dwExport(HttpServletResponse response, @RequestBody SkPointlocationParam skPointlocationParam) throws Exception {
+        //分页
+        Page page = new Page(skPointlocationParam.getPage(), skPointlocationParam.getPageSize());
+
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("isDeleted", "0");
+
+        if (skPointlocationParam.getLikeField() != null && !skPointlocationParam.getLikeField().equals("")) {
+            queryWrapper.eq("objectType", skPointlocationParam.getLikeField());
+        }
+        if (skPointlocationParam.getLikeValue() != null && !skPointlocationParam.getLikeValue().equals("")) {
+            queryWrapper.like("deviceName", skPointlocationParam.getLikeValue());
+        }
+
+        //时间
+        if (skPointlocationParam.getKssj() != null) {
+            queryWrapper.ge("str_to_date(date,'%Y-%m-%d %H:%i:%s')", skPointlocationParam.getKssj());
+        }
+        if (skPointlocationParam.getJssj() != null) {
+            queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", skPointlocationParam.getJssj());
+        }
+
+
+        List<Point> geoametrys = skPointlocationParam.getGeometrys();
+        if (geoametrys!=null){
+            if(geoametrys.size()>0) {
+                // 多个点位即为多边形
+                if (geoametrys.size()>1) {
+                    String geoametryStr = "";
+                    for (int i = 0; i < geoametrys.size(); i++) {
+                        if (i == geoametrys.size()-1) {
+                            geoametryStr += geoametrys.get(i).getX() + " " + geoametrys.get(i).getY();
+                        } else {
+                            geoametryStr += geoametrys.get(i).getX() + " " + geoametrys.get(i).getY() + ",";
+                        }
+                    }
+                    queryWrapper.apply("ST_CONTAINS(ST_GEOMFROMTEXT('POLYGON((" + geoametryStr + "))'), coordinates)");
+                } else if(StringUtils.isNotEmpty(skPointlocationParam.getRadius())){
+                    queryWrapper.apply("ST_Distance_Sphere(coordinates, POINT(" + geoametrys.get(0).getX()+","+ geoametrys.get(0).getY() + ")) < " + skPointlocationParam.getRadius());
+                }
+            }
+        }
+
+
+        IPage page1 = skPointlocationService.page(page, queryWrapper);
+        ExportExcelUtil<SkPointlocation> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"信息证件编号","设备名称","地址","经度","纬度"};
+        String[] headersField = {"xxzjbh","devicename","address","x","y"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, page1.getRecords(), response,"智图案件信息");
+//        return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
+
+    }
+
+    /**
      * 查询分组
      */
     @PostMapping("queryGroupby")

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsTaskController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.vo.param.*;
+import com.founder.commonutils.util.ExportExcelUtil;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsTask;
 import com.founder.servicebase.controller.ExcelControllerInterface;
@@ -23,8 +24,11 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.IntStream;
 
@@ -175,6 +179,43 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
 
     }
 
+    /**
+     * 任务列表导出
+     */
+    @PostMapping("rwlbExport")
+    @ApiOperation(value = "任务列表导出")
+    @OperLog(message = "任务列表导出", operation = OperationType.QUERY)
+    public void rwlbExport(HttpServletResponse response, @RequestBody SkRegionalsTaskParam skRegionalsDetailParam) throws Exception {
+        // 分页
+        skRegionalsDetailParam.setPage((skRegionalsDetailParam.getPage() - 1) * skRegionalsDetailParam.getPageSize());
+        List<SkRegionalsTask> list = skRegionalsTaskService.queryTaskInfoList(skRegionalsDetailParam);
+        for (SkRegionalsTask skRegionalsTask : list) {
+            //对任务时间进行格式修改
+            if (skRegionalsTask.getFssj()!=null ){
+                Date djsj = skRegionalsTask.getFssj();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+                String format = sdf.format(djsj);
+                skRegionalsTask.setByzd1(format);
+            }
+            if (skRegionalsTask.getState()!=null ){
+                if (skRegionalsTask.getState().equals("1")){
+                    skRegionalsTask.setState("已完成0%");
+                }else if (skRegionalsTask.getState().equals("2")){
+                    skRegionalsTask.setState("已完成60%");
+                }else if (skRegionalsTask.getState().equals("3")){
+                    skRegionalsTask.setState("已完成100%");
+                }else if (skRegionalsTask.getState().equals("4")){
+                    skRegionalsTask.setState("失败");
+                }
+
+            }
+        }
+        ExportExcelUtil<SkRegionalsTask> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"类型名称","任务名称","任务时间","发送人员","任务状态"};
+        String[] headersField = {"typename","taskname","byzd1","fsrxm","state"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, list, response,"任务列表信息");
+
+    }
     @Override
     public void setService(String bean) {
         if (skRegionalsTaskService == null) {

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceSqController.java

@@ -130,6 +130,9 @@ public class SkServiceSqController {
     @OperLog(message = "更新服务列表展示状态", operation = OperationType.UPDATE)
     public MapRestResult queryApply(String xxzjbh,String flag) {
         SkService skService=skServiceService.getById(xxzjbh);
+        if (skService==null) {
+            return new MapRestResult(200,"此xxzjbh不存在",null);
+        }
         skService.setFlag(flag);
         boolean updateById = skServiceService.updateById(skService);
         if (updateById) {

service/publicapi/src/main/java/com/founder/publicapi/controller/SkModelService/SkbsController.java

 package com.founder.publicapi.controller.SkModelService;
 
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.SkTrail;
 import com.founder.commonutils.model.newPublicEntity.TogetherEntity;
 import com.founder.servicebase.logs.OperLog;
@@ -33,14 +34,14 @@ public class SkbsController {
     @PostMapping("getSkbs")
     @OperLog(message = "轨迹分析_伴随分析",operation = OperationType.QUERY)
     @ApiOperation(value = "轨迹分析_伴随分析")
-    public List getSkbs(@RequestBody SkbsParam skbsParam){
+    public MapRestResult getSkbs(@RequestBody SkbsParam skbsParam){
         //获取需要伴随的轨迹
 //        List<SkTrail> list=getYToGjInfo(requestParams);
         //转换轨迹
         List gjlist=getYToGjInfo(skbsParam.getRequestParams(),skbsParam.getList());
         //进行伴随分析
         List resultList=getSkbsfx(skbsParam.getRequestParams(),gjlist);
-        return resultList;
+        return  new MapRestResult(200,"ok",resultList);
     }
 
     /**

service/publicapi/src/main/java/com/founder/publicapi/controller/SkServiceCacheController.java

+package com.founder.publicapi.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.commonutils.model.asjEntity.TbStAsj;
+import com.founder.commonutils.model.newPublicEntity.MapRestResult;
+import com.founder.commonutils.model.newPublicEntity.SkServiceCache;
+import com.founder.commonutils.model.newPublicEntity.SysUser;
+import com.founder.commonutils.util.ExportExcelUtil;
+import com.founder.commonutils.util.KeyUtil;
+import com.founder.publicapi.service.TbStAsjService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import com.founder.servicebase.mapper.mysqlMapper.SysDictitemAllMapper;
+import com.founder.servicebase.service.SkCacheService;
+import com.founder.servicebase.service.SkDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 时空服务列表表控制层
+ *
+ * @author yangyang
+ * @since 2022-10-14
+ */
+@RestController
+@RequestMapping("SkService")
+@Api(tags = "SK服务信息")
+public class SkServiceCacheController extends ApiController {
+    @Resource
+    private SkCacheService skCacheService;
+    @Resource
+    SysDictitemAllMapper sysDictitemAllMapper;
+    @Autowired
+    private SkDictionaryService skDictionaryService;
+    @Autowired
+    TbStAsjService tbStAsjService;
+
+    @PostMapping("saveSkCache")
+    @ApiOperation(value = "时空_新增可视化缓存记录")
+    @OperLog(message = "时空_新增可视化缓存记录", operation = OperationType.ADD)
+    public MapRestResult saveKsh(@RequestBody SkServiceCache skServiceCache, HttpServletRequest request) {
+        SysUser user = (SysUser)request.getAttribute("user");
+        skServiceCache.setXxzjbh(KeyUtil.getUUIDKey("SK"));
+        skServiceCache.setZjhm(user.getIdentitycard());
+        skServiceCache.setName(user.getTrueName());
+        skServiceCache.setYptjStringJson(JSONObject.toJSON(skServiceCache.getYptj()).toString());
+        boolean save = skCacheService.save(skServiceCache);
+        if (save) {
+            return new MapRestResult();
+        } else {
+            return new MapRestResult().error("保存失败");
+        }
+    }
+
+    @PostMapping("deleteSkCache")
+    @ApiOperation(value = "时空_删除缓存服务信息")
+    @OperLog(message = "时空_删除缓存服务信息", operation = OperationType.DELETE)
+    public MapRestResult deleteKshCacheById(String xxzjbh) {
+        int delete = skCacheService.deleteKshCacheById(xxzjbh);
+        if (delete>0) {
+            return new MapRestResult();
+        } else {
+            return new MapRestResult(200,"无此xxzjbh",null);
+        }
+    }
+
+    @PostMapping("querySkCache")
+    @ApiOperation(value = "时空_查询缓存服务列表信息")
+    @OperLog(message = "时空_查询缓存服务列表信息", operation = OperationType.QUERY)
+    public MapRestResult KshCache(@RequestBody SkServiceCache skServiceCache, HttpServletRequest request) {
+        SysUser user = (SysUser)request.getAttribute("user");
+        //分页
+        Page page = new Page(skServiceCache.getPage(), skServiceCache.getPageSize());
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("zjhm", user.getIdentitycard());
+        if (skServiceCache.getYpmc()!=null&& !"".equals(skServiceCache.getYpmc())){ // 研判名称
+            queryWrapper.like("ypmc",skServiceCache.getYpmc());
+        }
+        if (skServiceCache.getObjecttype()!=null&& !"".equals(skServiceCache.getObjecttype())){ // 研判类型
+            queryWrapper.like("objecttype",skServiceCache.getObjecttype());
+        }
+        //时间
+        if (skServiceCache.getYpsjkssj() != null) {
+            queryWrapper.ge("str_to_date(ypsj,'%Y-%m-%d %H:%i:%s')", skServiceCache.getYpsjkssj());
+        }
+        if (skServiceCache.getYpsjjssj() != null) {
+            queryWrapper.le("str_to_date(ypsj,'%Y-%m-%d %H:%i:%s')", skServiceCache.getYpsjjssj());
+        }
+        queryWrapper.orderByDesc("ypsj");
+        IPage page1 = skCacheService.page(page, queryWrapper);
+        List<SkServiceCache> listResult = page1.getRecords();
+        listResult.stream().forEach(q->{
+            Map<Object,Object> map = JSON.parseObject(q.getYptjStringJson(), Map.class);
+            map.forEach((k, v) -> {
+
+                // 代码翻译
+                if(k.equals("区域")){
+                    if("1".equals(v)){
+                        map.put(k,"所属分局");
+                    }else if("2".equals(v)){
+                        map.put(k,"所属派出所");
+                    }else if ("3".equals(v)){
+                        //根据案件编号去查对应案件的坐标
+                        TbStAsj xy = tbStAsjService.getXYByAsjbh(q.getObjectvalue());
+                        map.put(k,xy.getAsjfsddDqjd()+"\n"+xy.getAsjfsddDqwd());
+
+                    }
+                }else if(k.equals("标签")){
+                    List<String> bqs = (List<String>) v;
+                    List<String> names = sysDictitemAllMapper.getNameByCodeBq(bqs);
+                    map.put(k,names);
+                }else if(k.equals("轨迹类型")){
+                    map.put(k,skDictionaryService.findDmmcByDmAndDmlx((String) v,"GJ"));
+                }
+            });
+            q.setYptj(map);
+        });
+        return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
+    }
+
+    @PostMapping("xslbExport")
+    @ApiOperation(value = "线索列表导出")
+    @OperLog(message = "线索列表导出", operation = OperationType.QUERY)
+    public void xslbExport(HttpServletResponse response, @RequestBody SkServiceCache skServiceCache, HttpServletRequest request) throws Exception {
+        SysUser user = (SysUser)request.getAttribute("user");
+        //分页
+        Page page = new Page(skServiceCache.getPage(), skServiceCache.getPageSize());
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("zjhm", user.getIdentitycard());
+        if (skServiceCache.getYpmc()!=null&& !"".equals(skServiceCache.getYpmc())){ // 研判名称
+            queryWrapper.like("ypmc",skServiceCache.getYpmc());
+        }
+        if (skServiceCache.getObjecttype()!=null&& !"".equals(skServiceCache.getObjecttype())){ // 研判类型
+            queryWrapper.like("objecttype",skServiceCache.getObjecttype());
+        }
+        //时间
+        if (skServiceCache.getYpsjkssj() != null) {
+            queryWrapper.ge("str_to_date(ypsj,'%Y-%m-%d %H:%i:%s')", skServiceCache.getYpsjkssj());
+        }
+        if (skServiceCache.getYpsjjssj() != null) {
+            queryWrapper.le("str_to_date(ypsj,'%Y-%m-%d %H:%i:%s')", skServiceCache.getYpsjjssj());
+        }
+        queryWrapper.orderByDesc("ypsj");
+        IPage page1 = skCacheService.page(page, queryWrapper);
+        List<SkServiceCache> listResult = page1.getRecords();
+        for (SkServiceCache serviceCache : listResult) {
+            //时间格式的修改
+            if (serviceCache.getYpsj()!=null ){
+                Date djsj = serviceCache.getYpsj();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+                String format = sdf.format(djsj);
+                serviceCache.setByzd1(format);
+            }
+        }
+        listResult.stream().forEach(q->{
+            Map<Object,Object> map = JSON.parseObject(q.getYptjStringJson(), Map.class);
+            map.forEach((k, v) -> {
+
+                // 代码翻译
+                if(k.equals("区域")){
+                    if("1".equals(v)){
+                        map.put(k,"所属分局");
+                    }else if("2".equals(v)){
+                        map.put(k,"所属派出所");
+                    }
+                }else if(k.equals("标签")){
+                    List<String> bqs = (List<String>) v;
+                    if (bqs!=null && bqs.size()>0){
+                        List<String> names = sysDictitemAllMapper.getNameByCodeBq(bqs);
+                        map.put(k,names);
+                    }
+                }else if(k.equals("轨迹类型")){
+                    map.put(k,skDictionaryService.findDmmcByDmAndDmlx((String) v,"GJ"));
+                }
+            });
+            q.setYptj(map);
+        });
+        ExportExcelUtil<SkServiceCache> exportExcelUtil = new ExportExcelUtil<>();
+        String[] headersName = {"研判名称","研判号码","研判时间","研判条件"};
+        String[] headersField = {"ypmc","objectvalue","byzd1","yptj"};
+        exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, page1.getRecords(), response,"线索列表信息");
+    }
+}
+

service/publicapi/src/main/java/com/founder/publicapi/controller/SkypDesktop/SkypDesktopController.java

@@ -12,13 +12,16 @@ import com.founder.publicapi.mapper.mysqlMapper.SkMenuMapper;
 import com.founder.publicapi.mapper.mysqlMapper.SkScheduleMapper;
 import com.founder.servicebase.logs.OperLog;
 import com.founder.servicebase.logs.OperationType;
+import com.founder.servicebase.meassage.WebSocketServer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -305,4 +308,92 @@ public class SkypDesktopController {
         return formatter.format(date);
     }
 
+
+    /**
+     * 启动后一分钟启动，之后每一个小时开始一次
+     * 每天八点到十点 每半个小时 0 0/30 8-22 * * ?
+     * 每天的8点开始，2小时执行一次：0 0 8/2 * * ?
+     * 每个整点执行一次：0 0 0/1 * * ?
+     */
+    @Scheduled(initialDelay = 60000,fixedDelay = 1800000)
+    public void timing() throws ParseException {
+        System.out.println("-----------------------日程定时任务启动");
+        for (String s : WebSocketServer.map.keySet()) {
+            //获取所有正常的日程
+            QueryWrapper wrapper = new QueryWrapper<>();
+            wrapper.eq("state","2");
+            wrapper.eq("isDeleted","0");
+            wrapper.eq("zjhm",s);
+            List<SkSchedule> list = skScheduleMapper.selectList(wrapper);
+            startTask(list);
+        }
+
+    }
+
+    public void startTask(List<SkSchedule> list) throws ParseException {
+        if(list != null && list.size()>0){
+            for (SkSchedule skSchedule : list) {
+
+                //日程时间
+                String time = skSchedule.getTime();
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date Jzsj = simpleDateFormat.parse(time);
+
+                //当前时间
+                Date date = new Date();
+                //开始时间 在当前时间的基础上减一个小时
+                Calendar rightNow = Calendar.getInstance();
+                rightNow.setTime(date);
+                //rightNow.add(Calendar.DATE, -1);
+                rightNow.add(Calendar.HOUR, -1);
+                Date kssj=rightNow.getTime();
+                System.out.println(kssj);
+
+                //判断日程是否在当前时间的前一个小时内
+                Boolean flag = belongCalendar(Jzsj, kssj, date);
+                String userId = skSchedule.getZjhm();
+
+                if(flag){
+                    System.out.println("++++++++++++++++++++++日程定时1111");
+                    WebSocketServer.SendMessage(WebSocketServer. map. get (userId),"你的("+skSchedule.getBz()+")日程已经到了，请尽快处理");
+                    System.out.println("++++++++++++++++++++++日程定时结束");
+                }
+                //当前时间
+                Date date1 = new Date();
+                //开始时间 在当前时间的基础上减一个小时
+                Calendar rightNow1 = Calendar.getInstance();
+                rightNow1.setTime(date1);
+                //rightNow.add(Calendar.DATE, -1);
+                rightNow1.add(Calendar.HOUR, 1);
+                Date kssj1=rightNow1.getTime();
+//                判断日程是否在当前时间的后一个小时内
+                Boolean flag1 = belongCalendar(Jzsj, date,kssj1);
+                if(flag1){
+                    System.out.println("++++++++++++++++++++++日程定时1111");
+                    WebSocketServer.SendMessage(WebSocketServer. map. get (userId),"你的("+skSchedule.getBz()+")日程快到了，请尽快处理");
+                    System.out.println("++++++++++++++++++++++日程定时结束");
+                }
+            }
+        }
+    }
+
+    /**
+     * Description: 判断一个时间是否在一个时间段内 </br>
+     *
+     * @param nowTime 当前时间 </br>
+     * @param beginTime 开始时间 </br>
+     * @param endTime 结束时间 </br>
+     */
+    private boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
+        Calendar date = Calendar.getInstance();
+        date.setTime(nowTime);
+
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(beginTime);
+
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+
+        return date.after(begin) && date.before(end);
+    }
 }

service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java

@@ -535,7 +535,7 @@ public class HnTbStRygxController {
     public Result delFileByExcelId(String excelId) {
         HnTbStRygxRw excelInfo = hnKshRwService.getOne(new QueryWrapper<HnTbStRygxRw>().eq("excel_id", excelId));
         if (excelInfo == null) {
-            return Result.error().message("不存在该文件");
+            return Result.ok().message("不存在该文件");
         }
         String taskId = excelInfo.getParentId();
         String createName = excelInfo.getCreateName();
@@ -565,7 +565,7 @@ public class HnTbStRygxController {
     public Result delFileByTaskId(String taskId) {
         List<HnTbStRygxRw> rwList = hnKshRwService.list(new QueryWrapper<HnTbStRygxRw>().eq("RWID", taskId));
         if (rwList.isEmpty()) {
-            return Result.error().message("不存在该任务");
+            return Result.ok().message("不存在该任务");
         }
         //删除 ksh_st_rygx_rw表的Excel信息
         //1.删除任务

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStAsjMapper.java

@@ -8,6 +8,7 @@ import com.founder.commonutils.model.asjEntity.TbAsjJwdInfo;
 import com.founder.commonutils.model.asjEntity.TbStAsj;
 import com.founder.commonutils.model.asjEntity.TbStAsjResult;
 import com.founder.commonutils.model.newPublicEntity.RyAndAjEntity.BqXqByZjhmResult;
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.ZdcsResult;
 import com.founder.commonutils.model.newPublicEntity.ZdryResult;
 import com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo;
@@ -63,4 +64,8 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
     TbStAsj selectbqxxByasjbh(String asjbh);
 
     BqXqByZjhmResult selectbqxx(@Param(value = "zjhm") String zjhm, @Param(value = "type")String type,@Param(value = "bq") String bq);
+
+    List<PhotoOrMediaResult> getVideoByAsjbh(@Param("asjbh")String asjbh);
+
+    List<PhotoOrMediaResult> getPhotoByAsjbh(@Param("asjbh")String asjbh);
 }

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper">
     <select id="selectAsjxxByReceivingList"   parameterType="com.founder.commonutils.model.vo.param.TbStAsjParm"   resultType="com.founder.commonutils.model.asjEntity.TbStAsjResult">
         SELECT
-         T.ASJBH as asjbh
+        T.ASJBH as asjbh
         ,DATE_FORMAT(T.SLSJ,'%Y-%m-%d %H:%i:%S') as slsj
         ,T.SLDW_GAJGJGDM as sldwGajgjgdm
         ,T.SLDW_GAJGMC as sldwGajgmc
@@ -45,16 +45,140 @@
         ,asjbz.ajxlb AS ajxlb
         ,(select name from sys_dictitem where groupid='CODE_AJXLB' AND code = asjbz.ajxlb) AS ajxlbMc
         FROM  tb_st_asj T left join tb_st_asj_asjbz asjbz on T.asjbh = asjbz.asjbh
-        WHERE 1=1
-        <include refid="queryWhereByReceiving"/>
-        limit #{page},#{pageSize}
+        WHERE
+        <if test="startLng!=null and startLng!='' and endLng!=null and endLng!='' and startLat!=null and startLat!='' and endLat!=null and endLat!=''">
+            cast(T.ASJFSDD_DQJD as signed) BETWEEN cast(#{startLng,jdbcType=VARCHAR} as signed) AND cast(#{endLng,jdbcType=VARCHAR} as signed)
+            AND cast(T.ASJFSDD_DQWD as signed) BETWEEN cast(#{startLat,jdbcType=VARCHAR} as signed) AND cast(#{endLat,jdbcType=VARCHAR} as signed)
+        </if>
+        <if test="asjbh!= null and asjbh!=''">
+            AND T.ASJBH= #{ asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="ajmc!= null and ajmc!=''">
+            AND T.AJMC like concat('%', #{ajmc , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="jyaq!= null and jyaq!=''">
+            AND T.JYAQ LIKE concat('%', #{jyaq , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="larqStart!= null and larqStart!=''">
+            AND T.LARQ <![CDATA[>=]]> DATE_FORMAT(#{larqStart,jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="larqEnd!= null and larqEnd!=''">
+            AND T.LARQ <![CDATA[<]]> DATE_FORMAT(#{larqEnd,jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="afdXzqhdm!= null and afdXzqhdm!=''">
+            AND T.ASJFSDD_XZQHDM like concat(#{afdXzqhdm , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="zcjddm!= null and zcjddm!=''">
+            AND T.ZCJDDM= #{ zcjddm , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlbdm!= null and ajlbdm!=''">
+            AND T.AJLBDM like concat(#{ajlbdm , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="zatzJyqk!= null and zatzJyqk!=''">
+            AND T.ZATZ_JYQK =  #{zatzJyqk , jdbcType=VARCHAR }
+        </if>
+        <if test="ajxlb!= null and ajxlb!=''">
+            AND asjbz.ajxlb =  #{ajxlb , jdbcType=VARCHAR }
+        </if>
+        <if test="kssj!= null and kssj!=''">
+            AND T.ASJFSSJ_ASJFSKSSJ <![CDATA[>=]]> DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="jssj!= null and jssj!=''">
+            AND T.ASJFSSJ_ASJFSJSSJ <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="ssFjOrPcs!= null and ssFjOrPcs!=''">
+            <if test="ssFjOrPcs=='1'">
+                AND T.ladw_Gajgjgdm like concat(substr(T.ladw_Gajgjgdm,0,6), '%')
+            </if>
+            <if test="ssFjOrPcs=='2'">
+                AND T.ladw_Gajgjgdm like concat(substr(T.ladw_Gajgjgdm,0,8), '%')
+            </if>
+        </if>
+        <if test="gjc!= null and gjc.length>0">
+            and(
+            <foreach collection="gjc" item="item" index="index" separator=" or ">
+                T.jyaq like '%${item}%'
+            </foreach>
+            )
+        </if>
+
+        <if test="pabj_pdbz != null and pabj_pdbz == '0'">
+            and ZCJDDM not in ('0600','0700','0800')
+        </if>
+        <if test="ladwGajgjgdm!= null and ladwGajgjgdm!=''">
+            AND T.ladw_Gajgjgdm = #{ladwGajgjgdm , jdbcType=VARCHAR }
+        </if>
+        <if test="pageSize!=0">
+            limit #{page},#{pageSize}
+        </if>
     </select>
     <select id="selectAsjxxByReceivingListCount"   parameterType="com.founder.commonutils.model.vo.param.TbStAsjParm"  resultType="java.lang.Integer">
         SELECT
         count(*)
         FROM   tb_st_asj T left join tb_st_asj_asjbz asjbz on T.asjbh = asjbz.asjbh
-        WHERE 1=1
-        <include refid="queryWhereByReceiving"/>
+        WHERE
+        <if test="startLng!=null and startLng!='' and endLng!=null and endLng!='' and startLat!=null and startLat!='' and endLat!=null and endLat!=''">
+            cast(T.ASJFSDD_DQJD as signed) BETWEEN cast(#{startLng,jdbcType=VARCHAR} as signed) AND cast(#{endLng,jdbcType=VARCHAR} as signed)
+            AND cast(T.ASJFSDD_DQWD as signed) BETWEEN cast(#{startLat,jdbcType=VARCHAR} as signed) AND cast(#{endLat,jdbcType=VARCHAR} as signed)
+        </if>
+        <if test="asjbh!= null and asjbh!=''">
+            AND T.ASJBH= #{ asjbh , jdbcType=VARCHAR }
+        </if>
+        <if test="ajmc!= null and ajmc!=''">
+            AND T.AJMC like concat('%', #{ajmc , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="jyaq!= null and jyaq!=''">
+            AND T.JYAQ LIKE concat('%', #{jyaq , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="larqStart!= null and larqStart!=''">
+            AND T.LARQ <![CDATA[>=]]> DATE_FORMAT(#{larqStart,jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="larqEnd!= null and larqEnd!=''">
+            AND T.LARQ <![CDATA[<]]> DATE_FORMAT(#{larqEnd,jdbcType=VARCHAR},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="afdXzqhdm!= null and afdXzqhdm!=''">
+            AND T.ASJFSDD_XZQHDM like concat(#{afdXzqhdm , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="zcjddm!= null and zcjddm!=''">
+            AND T.ZCJDDM= #{ zcjddm , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlbdm!= null and ajlbdm!=''">
+            AND T.AJLBDM like concat(#{ajlbdm , jdbcType=VARCHAR }, '%')
+        </if>
+        <if test="zatzJyqk!= null and zatzJyqk!=''">
+            AND T.ZATZ_JYQK =  #{zatzJyqk , jdbcType=VARCHAR }
+        </if>
+        <if test="ajxlb!= null and ajxlb!=''">
+            AND asjbz.ajxlb =  #{ajxlb , jdbcType=VARCHAR }
+        </if>
+        <if test="kssj!= null and kssj!=''">
+            AND T.ASJFSSJ_ASJFSKSSJ <![CDATA[>=]]> DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="jssj!= null and jssj!=''">
+            AND T.ASJFSSJ_ASJFSJSSJ <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="ssFjOrPcs!= null and ssFjOrPcs!=''">
+            <if test="ssFjOrPcs=='1'">
+                AND T.ladw_Gajgjgdm like concat(substr(T.ladw_Gajgjgdm,0,6), '%')
+            </if>
+            <if test="ssFjOrPcs=='2'">
+                AND T.ladw_Gajgjgdm like concat(substr(T.ladw_Gajgjgdm,0,8), '%')
+            </if>
+        </if>
+        <if test="gjc!= null and gjc.length>0">
+            and(
+            <foreach collection="gjc" item="item" index="index" separator=" or ">
+                T.jyaq like '%${item}%'
+            </foreach>
+            )
+        </if>
+
+        <if test="pabj_pdbz != null and pabj_pdbz == '0'">
+            and ZCJDDM not in ('0600','0700','0800')
+        </if>
+        <if test="ladwGajgjgdm!= null and ladwGajgjgdm!=''">
+            AND T.ladw_Gajgjgdm = #{ladwGajgjgdm , jdbcType=VARCHAR }
+        </if>
     </select>
     <sql id="queryWhereByReceiving">
         <if test="asjbh!= null and asjbh!=''">
@@ -512,4 +636,20 @@
         </if>
 
     </select>
+    <select id="getVideoByAsjbh" parameterType="string"
+            resultType="com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult">
+        select file_pathafterupload as fileUrl,create_time as time,file_name as fileName from st_app_camera_media
+        where 1=1
+        <if test="asjbh!=null and asjbh!=''">
+            and   case_code = #{asjbh, jdbcType=VARCHAR}
+        </if>
+    </select>
+    <select id="getPhotoByAsjbh" parameterType="string"
+            resultType="com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult">
+        select imgurl as fileUrl,createtime as time,file_name as fileName from st_app_lawcase_objext_result
+        where 1=1
+        <if test="asjbh!=null and asjbh!=''">
+            and   case_code = #{asjbh, jdbcType=VARCHAR}
+        </if>
+    </select>
 </mapper>

service/publicapi/src/main/java/com/founder/publicapi/service/TbStAsjService.java

@@ -5,6 +5,7 @@ import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
 import com.founder.commonutils.model.asjEntity.TbAsjJwdInfo;
 import com.founder.commonutils.model.asjEntity.TbStAsj;
 import com.founder.commonutils.model.asjEntity.TbStAsjResult;
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.newPublicEntity.ZdryResult;
 import com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo;
@@ -47,4 +48,10 @@ public interface TbStAsjService extends IService<TbStAsj> {
     int toQueryJwdinfoTotalCount(TbAsjJwdinfo tbAsjJwdinfo, SysUser user);
 
     List<Map<String,Object>> toQueryJwdinfoTj(TbAsjJwdinfo tbAsjJwdinfo, SysUser user);
+
+    List<PhotoOrMediaResult> getVideoByAsjbh(String asjbh);
+
+    List<PhotoOrMediaResult> getPhotoByAsjbh(String asjbh);
+
+    TbStAsj getXYByAsjbh(String asjbh);
 }

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SpxxServiceImpl.java

@@ -480,7 +480,7 @@ public class SpxxServiceImpl implements SpxxService {
         //柱状图 申请状态
         //柱状图 统计结果
         jsonObject.put("data","");
-        jsonObject.put("status","success");
+        jsonObject.put("status",200);
         jsonObject.put("code","200");
         return jsonObject;
     }

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjServiceImpl.java

@@ -7,6 +7,7 @@ import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
 import com.founder.commonutils.model.asjEntity.TbAsjJwdInfo;
 import com.founder.commonutils.model.asjEntity.TbStAsj;
 import com.founder.commonutils.model.asjEntity.TbStAsjResult;
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.SkPointlocation;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.newPublicEntity.ZdcsResult;
@@ -205,6 +206,25 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
         tbAsjJwdinfo = getTbAsjJwdinfo(tbAsjJwdinfo,user);
         return tbStAsjMapper.toQueryJwdinfoTotalCount(tbAsjJwdinfo);
     }
+    @Override
+    public List<PhotoOrMediaResult> getVideoByAsjbh(String asjbh) {
+        return tbStAsjMapper.getVideoByAsjbh(asjbh);
+    }
+
+    @Override
+    public List<PhotoOrMediaResult> getPhotoByAsjbh(String asjbh) {
+        return tbStAsjMapper.getPhotoByAsjbh(asjbh);
+    }
+
+    //通过asjbh查经纬度
+    @Override
+    public TbStAsj getXYByAsjbh(String asjbh) {
+        QueryWrapper wrapper = new QueryWrapper<>();
+        wrapper.eq("asjbh",asjbh);
+        wrapper.eq("xxsc_pdbz","0");
+        TbStAsj tbStAsj = tbStAsjMapper.selectOne(wrapper);
+        return tbStAsj;
+    }
 
     @Override
     public List<Map<String,Object>> toQueryJwdinfoTj(TbAsjJwdinfo tbAsjJwdinfo, SysUser user) {

service/publicapi/src/main/resources/data/getCzgl.json

 {
-    "kshdata": {
-      "nodes": [
-        {
+  "kshdata": {
+    "nodes": [
+      {
+        "id": "蒙AKH824",
+        "label": "蒙AKH824",
+        "properties": {
           "id": "蒙AKH824",
           "label": "蒙AKH824",
-          "properties": {
-            "id": "蒙AKH824",
-            "label": "蒙AKH824",
-            "imgType": "cph"
-          }
+          "imgType": "cph"
         }
-      ],
-      "links": [
-        {
-          "source": "430123196510265891",
-          "target": "蒙AKH824",
+      }
+    ],
+    "links": [
+      {
+        "source": "430123196510265891",
+        "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": "车主",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "车主",
-            "source": "430123196510265891",
-            "target": "蒙AKH824"
-          }
+          "source": "430123196510265891",
+          "target": "蒙AKH824"
         }
-      ]
-    },
-    "dataSumup": {
-      "name": "车主关联",
-      "list": [
-        "蒙AKH824"
-      ]
-    }
+      }
+    ]
+  },
+  "dataSumup": {
+    "name": "车主关联",
+    "list": [
+      "蒙AKH824"
+    ]
+  }
 }
\ No newline at end of file

service/publicapi/src/main/resources/data/getCzgl2.json

 {
-    "kshdata": {
-      "nodes": [
-        {
+  "kshdata": {
+    "nodes": [
+      {
+        "id": "430123196510265891",
+        "label": "430123196510265891",
+        "properties": {
           "id": "430123196510265891",
-          "label": "证件号码:430123196510265891",
-          "properties": {
-            "id": "430123196510265891",
-            "label": "证件号码:430123196510265891",
-            "imgType": "idcard"
-          }
+          "label": "430123196510265891",
+          "imgType": "idcard"
         }
-      ],
-      "links": [
-        {
-          "source": "蒙AKH824",
-          "target": "430123196510265891",
+      }
+    ],
+    "links": [
+      {
+        "source": "蒙AKH824",
+        "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": "车主",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "车主",
-            "source": "蒙AKH824",
-            "target": "430123196510265891"
-          }
+          "source": "蒙AKH824",
+          "target": "430123196510265891"
         }
-      ]
-    },
-    "dataSumup": {
-      "name": "车主关联",
-      "list": [
-        "430123196510265891"
-      ]
-    }
+      }
+    ]
+  },
+  "dataSumup": {
+    "name": "车主关联",
+    "list": [
+      "430123196510265891"
+    ]
+  }
 }
\ No newline at end of file

service/publicapi/src/main/resources/data/getJzgl.json

@@ -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",

service/publicapi/src/main/resources/data/getJzgl2.json

@@ -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",

service/publicapi/src/main/resources/data/getSmgl.json

 {
-    "kshdata": {
-      "nodes": [
-        {
+  "kshdata": {
+    "nodes": [
+      {
+        "id": "BGSC001",
+        "label": "BGSC001",
+        "properties": {
           "id": "BGSC001",
           "label": "BGSC001",
-          "properties": {
-            "id": "BGSC001",
-            "label": "BGSC001",
-            "imgType": "imsi"
-          }
-        },
-        {
+          "imgType": "imsi"
+        }
+      },
+      {
+        "id": "KFS001",
+        "label": "KFS001",
+        "properties": {
           "id": "KFS001",
           "label": "KFS001",
-          "properties": {
-            "id": "KFS001",
-            "label": "KFS001",
-            "imgType": "imei"
-          }
-        },
-        {
+          "imgType": "imei"
+        }
+      },
+      {
+        "id": "18545251333",
+        "label": "18545251333",
+        "properties": {
           "id": "18545251333",
           "label": "18545251333",
-          "properties": {
-            "id": "18545251333",
-            "label": "18545251333",
-            "imgType": "sjk"
-          }
-        },
-        {
+          "imgType": "sjk"
+        }
+      },
+      {
+        "id": "长沙市第一医院",
+        "label": "长沙市第一医院",
+        "properties": {
           "id": "长沙市第一医院",
           "label": "长沙市第一医院",
-          "properties": {
-            "id": "长沙市第一医院",
-            "label": "长沙市第一医院",
-            "imgType": "mac"
-          }
+          "imgType": "mac"
         }
-      ],
-      "links": [
-        {
-          "source": "430123196510265891",
-          "target": "BGSC001",
+      }
+    ],
+    "links": [
+      {
+        "source": "430123196510265891",
+        "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",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "IMSI",
-            "source": "430123196510265891",
-            "target": "BGSC001"
-          }
-        },
-        {
           "source": "430123196510265891",
-          "target": "KFS001",
+          "target": "BGSC001"
+        }
+      },
+      {
+        "source": "430123196510265891",
+        "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",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "IMEI",
-            "source": "430123196510265891",
-            "target": "KFS001"
-          }
-        },
-        {
           "source": "430123196510265891",
-          "target": "18545251333",
+          "target": "KFS001"
+        }
+      },
+      {
+        "source": "430123196510265891",
+        "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": "手机号",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "手机号",
-            "source": "430123196510265891",
-            "target": "18545251333"
-          }
-        },
-        {
           "source": "430123196510265891",
-          "target": "长沙市第一医院",
+          "target": "18545251333"
+        }
+      },
+      {
+        "source": "430123196510265891",
+        "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",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "MAC",
-            "source": "430123196510265891",
-            "target": "长沙市第一医院"
-          }
+          "source": "430123196510265891",
+          "target": "长沙市第一医院"
         }
-      ]
-    },
-    "dataSumup": {
-      "name": "四码关联",
-      "list": [
-        "BGSC001",
-        "KFS001",
-        "18545251333",
-        "长沙市第一医院"
-      ]
-    }
+      }
+    ]
+  },
+  "dataSumup": {
+    "name": "四码关联",
+    "list": [
+      "BGSC001",
+      "KFS001",
+      "18545251333",
+      "长沙市第一医院"
+    ]
+  }
 }
\ No newline at end of file

service/publicapi/src/main/resources/data/getSmgl2.json

 {
-    "kshdata": {
-      "nodes": [
-        {
+  "kshdata": {
+    "nodes": [
+      {
+        "id": "BGSC001",
+        "label": "BGSC001",
+        "properties": {
           "id": "BGSC001",
           "label": "BGSC001",
-          "properties": {
-            "id": "BGSC001",
-            "label": "BGSC001",
-            "imgType": "imsi"
-          }
-        },
-        {
+          "imgType": "imsi"
+        }
+      },
+      {
+        "id": "KFS001",
+        "label": "KFS001",
+        "properties": {
           "id": "KFS001",
           "label": "KFS001",
-          "properties": {
-            "id": "KFS001",
-            "label": "KFS001",
-            "imgType": "imei"
-          }
-        },
-        {
+          "imgType": "imei"
+        }
+      },
+      {
+        "id": "长沙市第一医院",
+        "label": "长沙市第一医院",
+        "properties": {
           "id": "长沙市第一医院",
           "label": "长沙市第一医院",
-          "properties": {
-            "id": "长沙市第一医院",
-            "label": "长沙市第一医院",
-            "imgType": "mac"
-          }
+          "imgType": "mac"
         }
-      ],
-      "links": [
-        {
-          "source": "18545251333",
-          "target": "BGSC001",
+      }
+    ],
+    "links": [
+      {
+        "source": "18545251333",
+        "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",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "IMSI",
-            "source": "18545251333",
-            "target": "BGSC001"
-          }
-        },
-        {
           "source": "18545251333",
-          "target": "KFS001",
+          "target": "BGSC001"
+        }
+      },
+      {
+        "source": "18545251333",
+        "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",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "IMEI",
-            "source": "18545251333",
-            "target": "KFS001"
-          }
-        },
-        {
           "source": "18545251333",
-          "target": "长沙市第一医院",
+          "target": "KFS001"
+        }
+      },
+      {
+        "source": "18545251333",
+        "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",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "MAC",
-            "source": "18545251333",
-            "target": "长沙市第一医院"
-          }
+          "source": "18545251333",
+          "target": "长沙市第一医院"
         }
-      ]
-    },
-    "dataSumup": {
-      "name": "四码关联",
-      "list": [
-        "BGSC001",
-        "KFS001",
-        "长沙市第一医院"
-      ]
-    }
+      }
+    ]
+  },
+  "dataSumup": {
+    "name": "四码关联",
+    "list": [
+      "BGSC001",
+      "KFS001",
+      "长沙市第一医院"
+    ]
+  }
 }
\ No newline at end of file

service/publicapi/src/main/resources/data/getThgl.json

 {
-    "kshdata": {
-      "nodes": [
-        {
+  "kshdata": {
+    "nodes": [
+      {
+        "id": "430123196510265892",
+        "label": "430123196510265892",
+        "properties": {
           "id": "430123196510265892",
           "label": "430123196510265892",
-          "properties": {
-            "id": "430123196510265892",
-            "label": "证件号码:430123196510265892",
-            "imgType": "idcard"
-          }
-        },
-        {
+          "imgType": "idcard"
+        }
+      },
+      {
+        "id": "430123196510265893",
+        "label": "430123196510265893",
+        "properties": {
           "id": "430123196510265893",
           "label": "430123196510265893",
-          "properties": {
-            "id": "430123196510265893",
-            "label": "430123196510265893",
-            "imgType": "idcard"
-          }
-        },
-        {
+          "imgType": "idcard"
+        }
+      },
+      {
+        "id": "430123196510265894",
+        "label": "430123196510265894",
+        "properties": {
           "id": "430123196510265894",
           "label": "430123196510265894",
-          "properties": {
-            "id": "430123196510265894",
-            "label": "430123196510265894",
-            "imgType": "idcard"
-          }
+          "imgType": "idcard"
         }
-      ],
-      "links": [
-        {
-          "source": "430123196510265891",
-          "target": "430123196510265892",
+      }
+    ],
+    "links": [
+      {
+        "source": "430123196510265891",
+        "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": "配偶关系",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "配偶关系",
-            "source": "430123196510265891",
-            "target": "430123196510265892"
-          }
-        },
-        {
           "source": "430123196510265891",
-          "target": "430123196510265893",
+          "target": "430123196510265892"
+        }
+      },
+      {
+        "source": "430123196510265891",
+        "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": "子女关系",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "子女关系",
-            "source": "430123196510265891",
-            "target": "430123196510265893"
-          }
-        },
-        {
           "source": "430123196510265891",
-          "target": "430123196510265894",
+          "target": "430123196510265893"
+        }
+      },
+      {
+        "source": "430123196510265891",
+        "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": "父母关系",
-          "properties": {
-            "time": "2022-09-16 09:59:11",
-            "label": "父母关系",
-            "source": "430123196510265891",
-            "target": "430123196510265894"
-          }
+          "source": "430123196510265891",
+          "target": "430123196510265894"
         }
-      ]
-    },
-    "dataSumup": {
-      "name": "同户关联",
-      "list": [
-        "430123196510265892",
-        "430123196510265893",
-        "430123196510265894"
-      ]
-    }
+      }
+    ]
+  },
+  "dataSumup": {
+    "name": "同户关联",
+    "list": [
+      "430123196510265892",
+      "430123196510265893",
+      "430123196510265894"
+    ]
+  }
 }
\ No newline at end of file