西藏多维、算力提交(西藏)

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

@@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 @Data
@@ -80,4 +81,13 @@ public class SkServiceCache implements Serializable {
     @ApiModelProperty(value = "每页数")
     @TableField(exist = false)
     private int pageSize;
+
+    @ApiModelProperty(value = "线索类型")
+    @TableField(exist = false)
+    private String xslx;
+
+    @ApiModelProperty(value = "导出时间格式转换备用字段")
+    @TableField(exist = false)
+    private String byzd1;
+
 }

common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceCacheController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceCacheController.java

-package com.founder.servicebase.controller;
-
+package com.founder.publicapi.controller.SkDataOperation;
 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;
@@ -27,15 +28,18 @@ 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服务信息")
@@ -46,6 +50,9 @@ public class SkServiceCacheController extends ApiController {
     SysDictitemAllMapper sysDictitemAllMapper;
     @Autowired
     private SkDictionaryService skDictionaryService;
+    @Autowired
+    TbStAsjService tbStAsjService;
+
 
     @PostMapping("saveSkCache")
     @ApiOperation(value = "时空_新增可视化缓存记录")
@@ -88,7 +95,12 @@ public class SkServiceCacheController extends ApiController {
         if (skServiceCache.getYpmc()!=null&& !"".equals(skServiceCache.getYpmc())){ // 研判名称
             queryWrapper.like("ypmc",skServiceCache.getYpmc());
         }
-        if (skServiceCache.getObjecttype()!=null&& !"".equals(skServiceCache.getObjecttype())){ // 研判类型
+        // 线索类型
+        if (skServiceCache.getXslx()!=null&& !"".equals(skServiceCache.getXslx())){
+            queryWrapper.eq("ypmc",skServiceCache.getXslx());
+        }
+        // 研判类型
+        if (skServiceCache.getObjecttype()!=null&& !"".equals(skServiceCache.getObjecttype())){
             queryWrapper.like("objecttype",skServiceCache.getObjecttype());
         }
         //时间
@@ -111,6 +123,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;
@@ -139,7 +156,12 @@ public class SkServiceCacheController extends ApiController {
         if (skServiceCache.getYpmc()!=null&& !"".equals(skServiceCache.getYpmc())){ // 研判名称
             queryWrapper.like("ypmc",skServiceCache.getYpmc());
         }
-        if (skServiceCache.getObjecttype()!=null&& !"".equals(skServiceCache.getObjecttype())){ // 研判类型
+        // 线索类型
+        if (skServiceCache.getXslx()!=null&& !"".equals(skServiceCache.getXslx())){
+            queryWrapper.eq("ypmc",skServiceCache.getXslx());
+        }
+        // 研判类型
+        if (skServiceCache.getObjecttype()!=null&& !"".equals(skServiceCache.getObjecttype())){
             queryWrapper.like("objecttype",skServiceCache.getObjecttype());
         }
         //时间
@@ -152,6 +174,15 @@ public class SkServiceCacheController extends ApiController {
         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) -> {
@@ -177,7 +208,7 @@ public class SkServiceCacheController extends ApiController {
         });
         ExportExcelUtil<SkServiceCache> exportExcelUtil = new ExportExcelUtil<>();
         String[] headersName = {"研判名称","研判号码","研判时间","研判条件"};
-        String[] headersField = {"ypmc","objectvalue","ypsj","yptj"};
+        String[] headersField = {"ypmc","objectvalue","byzd1","yptj"};
         exportExcelUtil.exportExcel("DataStatistics", headersName, headersField, page1.getRecords(), response,"线索列表信息");
     }
 }

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

@@ -47,4 +47,6 @@ public interface TbStAsjService extends IService<TbStAsj> {
     int toQueryJwdinfoTotalCount(TbAsjJwdinfo tbAsjJwdinfo, SysUser user);
 
     List<Map<String,Object>> toQueryJwdinfoTj(TbAsjJwdinfo tbAsjJwdinfo, SysUser user);
+
+    TbStAsj getXYByAsjbh(String asjbh);
 }

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

@@ -64,12 +64,6 @@ public interface ZtypService{
     //查询团伙关联嫌疑人信息数量
     int getThxyrByThbhCount(TbYwShseTh tbYwShseTh);
 
-    //查询团伙关联嫌疑人信息
-    List<TbXwZbfzxyr> getThxyrByKsh(TbYwShseTh tbYwShseTh);
-
-    //查询团伙关联嫌疑人信息数量
-    int getThxyrByKshCount(TbYwShseTh tbYwShseTh);
-
     //根据推荐的团伙信息添加犯罪团伙
     String addFzthaj(TbYwCchshzztjb cchshzztjb, HttpServletRequest request);
 

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

@@ -332,5 +332,13 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
         tbAsjJwdinfo.setUnitcode(unitcode);
         return tbAsjJwdinfo;
     }
-
+    //通过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;
+    }
 }