1

doc/1.sql

@@ -1 +0,0 @@
-INSERT INTO jy_platform (id,platform_name,platform_address ) values (1,"江门公安",1);

doc/相关操作解析.sql

@@ -0,0 +1,34 @@
+/*
+   jy_platfrom 平台表  ,jy_user 用户表
+   删除平台需执行三条sql
+   1.修改平台表逻辑删除字段值
+   2.修改用户角色为普通警员
+   3.修改用户表平台关联关系，设置为江门普通警员
+   ? 为占位符，填入需要删除平台的id
+ */
+update jy_platfrom set rec_status = ? where id = ?;
+update sys_user set role_id = 47 where id in (select sys_user_id from jy_user where platform_id = ?);
+update jy_user set platform_id = 1,is_jm =1 where platform_id = ?;
+
+/**
+  禁用平台，与删除平台同理
+  status 0 正常，1禁用
+  ? 为占位符，填入需要禁用平台的id
+ */
+update jy_platfrom set status = 1 where id = ?;
+update sys_user set role_id = 47 where id in (select sys_user_id from jy_user where platform_id = ?);
+update jy_user set platform_id = 1,is_jm =1 where platform_id = ?;
+
+/*
+  t_scene_plus 场景表
+  1.修改场景表逻辑删除字段值
+  ? 为占位符，填入需要删除场景的场景码
+ */
+update t_scene_plus set rec_status = 'I' where num = ?;
+
+/*
+  sys_user 用户登录表
+  1.修改登录密码
+  ? 为占位符，第一个填入明文密码，第二个填入需要修改用户的ryNo即登录账号
+ */
+update sys_user set password = MD5('?') WHERE user_name = ?;

src/main/java/com/fdkankan/manage/config/LaserConfig.java

@@ -0,0 +1,15 @@
+package com.fdkankan.manage.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@RefreshScope
+@Data
+public class LaserConfig {
+
+    @Value("laser.web-site-pre")
+    private String laserWebSite;
+}

src/main/java/com/fdkankan/manage/httpClient/param/LaserSceneParam.java

@@ -1,25 +1,13 @@
 package com.fdkankan.manage.httpClient.param;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
+@AllArgsConstructor
 public class LaserSceneParam {
-    private Integer pageNum;
-    private Integer pageSize;
-    private String title;
-    private String phone;
-    private String snCode;
-    private List<String> snCodes = new ArrayList<>();
-    private Integer sceneSource = 4;
     private List<String> sceneCodes;
-    private String sceneCode;
-    private Long userId;
-    private List<Long> otherUserIds;
-
-    private Integer id;
-
-    private String sceneNum;
 }

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -7,6 +7,7 @@ import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.Result;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.config.LaserConfig;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.User;
@@ -17,6 +18,7 @@ import com.fdkankan.manage.httpClient.param.LaserSceneParam;
 import com.fdkankan.manage.httpClient.param.SSDownSceneParam;
 import com.fdkankan.manage.httpClient.vo.FdkkResponse;
 import com.fdkankan.manage.httpClient.vo.LaserUpdateUserVo;
+import com.fdkankan.manage.mapper.ILaserMapper;
 import com.fdkankan.manage.service.ICameraDetailService;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.IUserService;
@@ -42,8 +44,6 @@ public class LaserService {
 
    @Autowired
     LaserClient laserClient;
-    @Value("${4dkk.laserService.basePath}")
-    private String basePath;
     @Autowired
     IUserService userService;
     @Autowired
@@ -52,79 +52,6 @@ public class LaserService {
     ICameraService cameraService;
 
 
-    public  Page<SceneVo> pageList(SceneParam param) {
-        LaserSceneParam laserSceneParam = new LaserSceneParam();
-        laserSceneParam.setSceneCode(param.getNum());
-        laserSceneParam.setTitle(param.getSceneName());
-        laserSceneParam.setPageNum(param.getPageNum());
-        laserSceneParam.setPageSize(param.getPageSize());
-        laserSceneParam.setSnCode(param.getSnCode());
-        if(param.getUserId() != null){
-            laserSceneParam.setUserId(param.getUserId());
-        }
-        if(param.getUserIds() != null && param.getUserIds().size()>0){
-            laserSceneParam.setOtherUserIds(param.getUserIds());
-        }
-        if(StringUtils.isNotBlank(param.getUserName())){
-            List<User> likeUserName = userService.getLikeUserName(param.getUserName());
-            List<Long> userIds = likeUserName.stream().map(User::getId).collect(Collectors.toList());
-            if(!param.getUserIds().isEmpty() && !userIds.isEmpty()){
-                List<Long> list=  param.getUserIds().stream().filter(userIds::contains).collect(Collectors.toList());
-                laserSceneParam.setOtherUserIds(list);
-            }
-            if(userIds.isEmpty()){
-                return getResultPage(0L,new ArrayList<>());
-
-            }
-        }
-
-        if(param.getType() == 2){
-            laserSceneParam.setSceneSource(4);
-            List<String> collect = param.getAuthNumList().stream().filter(entity -> entity.contains("SS-") ).collect(Collectors.toList());
-            laserSceneParam.setSceneCodes(collect);
-        }
-        if(param.getType() == 6){
-            laserSceneParam.setSceneSource(5);
-            List<String> collect = param.getAuthNumList().stream().filter(entity -> entity.contains("SG-") ).collect(Collectors.toList());
-            laserSceneParam.setSceneCodes(collect);
-        }
-        FdkkResponse response = laserClient.sceneList(laserSceneParam);
-        JSONObject jsonObject =response.getData();
-        if(jsonObject == null){
-            return getResultPage(0L,new ArrayList<>());
-        }
-        JSONArray list = jsonObject.getJSONArray("list");
-        long total =jsonObject.getLong("total");
-
-        List<SceneVo> sceneVoList = new ArrayList<>();
-        for (Object o : list) {
-            String res = JSONObject.toJSONString(o);
-            SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
-            //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
-            JSONObject obj = (JSONObject) o;
-            vo.setStatusString(getLaserStatus(vo.getStatus()));
-            vo.setStatus(toFdStatus(vo.getStatus()));
-            if(vo.getStatus() == -3){
-                vo.setPayStatus(-1);
-            }else {
-                vo.setPayStatus(1);
-            }
-            vo.setSceneName(obj.getString("title"));
-            vo.setUserName(obj.getString("phone"));
-            vo.setPayStatus(1);
-            sceneVoList.add(vo);
-        }
-        return getResultPage(total,sceneVoList);
-    }
-
-    private Page<SceneVo> getResultPage(Long total,List<SceneVo> list){
-        Page<SceneVo> page = new Page<>();
-        page.setTotal(total);
-        page.setRecords(list);
-        return page;
-    }
-
-
 
     public Integer toFdStatus(Integer status) {
         //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
@@ -263,24 +190,6 @@ public class LaserService {
     }
 
 
-    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer sceneSource) {
-        LaserSceneParam newParam = new LaserSceneParam();
-        newParam.setPageNum(1);
-        newParam.setPageSize(sceneNumList.size());
-        newParam.setSceneCodes(sceneNumList);
-        newParam.setSceneSource(sceneSource);
-        return this.list(newParam);
-    }
-
-    public HashMap<String, JSONObject> list(String sceneName,Integer sceneSource) {
-        LaserSceneParam newParam = new LaserSceneParam();
-        newParam.setPageNum(1);
-        newParam.setPageSize(9999);
-        newParam.setTitle(sceneName);
-        newParam.setSceneSource(sceneSource);
-        return this.list(newParam);
-    }
-
     public HashMap<String, JSONObject> list(LaserSceneParam newParam) {
         HashMap<String, JSONObject> map = new HashMap<>();
         try {
@@ -302,4 +211,27 @@ public class LaserService {
 
         return map;
     }
+
+
+    @Autowired
+    ILaserMapper laserMapper;
+    @Autowired
+    LaserConfig laserConfig;
+
+    public List<JSONObject> getLaserSceneByDb(LaserSceneParam param){
+        List<JSONObject> list =  laserMapper.getSceneByDb(param);
+        for (JSONObject jsonObject : list) {
+            jsonObject.put("webSite",laserConfig.getLaserWebSite()+jsonObject.getString("scene_code"));
+        }
+        return list;
+    }
+
+    public HashMap<String, JSONObject> getMapLaserSceneByDb(LaserSceneParam newParam) {
+        HashMap<String, JSONObject> map = new HashMap<>();
+        List<JSONObject> laserSceneByDb = this.getLaserSceneByDb(newParam);
+        for (JSONObject obj : laserSceneByDb) {
+            map.put(obj.getString("num"),obj);
+        }
+        return map;
+    }
 }

src/main/java/com/fdkankan/manage/mapper/ILaserMapper.java

@@ -0,0 +1,17 @@
+package com.fdkankan.manage.mapper;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.manage.httpClient.param.LaserSceneParam;
+import com.fdkankan.manage.vo.response.DataGroupByCount;
+import com.fdkankan.manage.vo.response.DataGroupBySum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ILaserMapper {
+
+
+    List<JSONObject> getSceneByDb(@Param("param") LaserSceneParam param);
+}

src/main/java/com/fdkankan/manage/service/impl/JyUserShareServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
@@ -10,6 +11,7 @@ import com.fdkankan.manage.entity.JyUserShare;
 import com.fdkankan.manage.entity.ScenePlus;
 import com.fdkankan.manage.entity.UserShareParam;
 import com.fdkankan.manage.exception.BusinessException;
+import com.fdkankan.manage.httpClient.param.LaserSceneParam;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.mapper.IJyUserShareMapper;
 import com.fdkankan.manage.service.IJyUserService;
@@ -129,34 +131,17 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
     }
 
     private void setSsSceneVo(Page<UserShareSceneVo> page) {
-        HashMap<String,SceneVo> map = new HashMap<>();
-        List<String> ssNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(4)).map(UserShareSceneVo::getNum).collect(Collectors.toList());
-        List<String> sgNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(5)).map(UserShareSceneVo::getNum).collect(Collectors.toList());
-        SceneParam laserParam = new SceneParam();
-        laserParam.setPageNum(1);
-        laserParam.setPageSize(999);
-        if(!ssNumList.isEmpty()){
-            laserParam.setType(2);
-            laserParam.setAuthNumList(ssNumList);
-            Page<SceneVo> sceneVoPage = laserService.pageList(laserParam);
-            for (SceneVo sceneVo : sceneVoPage.getRecords()) {
-                map.put(sceneVo.getNum(),sceneVo);
-            }
-        }
-        if(!sgNumList.isEmpty()){
-            laserParam.setType(6);
-            laserParam.setAuthNumList(sgNumList);
-            Page<SceneVo> sceneVoPage = laserService.pageList(laserParam);
-            for (SceneVo sceneVo : sceneVoPage.getRecords()) {
-                map.put(sceneVo.getNum(),sceneVo);
-            }
+        List<String> LaserNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(4) || e.getSceneSource().equals(5) ).map(UserShareSceneVo::getNum).collect(Collectors.toList());
+        HashMap<String, JSONObject> map = new HashMap<>();
+        if(!LaserNumList.isEmpty()){
+            map = laserService.getMapLaserSceneByDb(new LaserSceneParam(LaserNumList));
         }
         for (UserShareSceneVo record : page.getRecords()) {
             //替换深时标题，链接
-            SceneVo sceneVo = map.get(record.getNum());
+            JSONObject sceneVo = map.get(record.getNum());
             if(sceneVo != null){
-                record.setWebSite(sceneVo.getWebSite());
-                record.setTitle(sceneVo.getSceneName());
+                record.setWebSite(sceneVo.getString("webSite"));
+                record.setTitle(sceneVo.getString("sceneName"));
             }
         }
     }
@@ -170,34 +155,17 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
     }
 
     private void setSsAuthSceneVo(Page<UserAuthSceneVo> page) {
-        HashMap<String,SceneVo> map = new HashMap<>();
-        List<String> ssNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(4)).map(UserAuthSceneVo::getNum).collect(Collectors.toList());
-        List<String> sgNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(5)).map(UserAuthSceneVo::getNum).collect(Collectors.toList());
-        SceneParam laserParam = new SceneParam();
-        laserParam.setPageNum(1);
-        laserParam.setPageSize(999);
-        if(!ssNumList.isEmpty()){
-            laserParam.setType(2);
-            laserParam.setAuthNumList(ssNumList);
-            Page<SceneVo> sceneVoPage = laserService.pageList(laserParam);
-            for (SceneVo sceneVo : sceneVoPage.getRecords()) {
-                map.put(sceneVo.getNum(),sceneVo);
-            }
-        }
-        if(!sgNumList.isEmpty()){
-            laserParam.setType(6);
-            laserParam.setAuthNumList(sgNumList);
-            Page<SceneVo> sceneVoPage = laserService.pageList(laserParam);
-            for (SceneVo sceneVo : sceneVoPage.getRecords()) {
-                map.put(sceneVo.getNum(),sceneVo);
-            }
+        List<String> LaserNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(4) || e.getSceneSource().equals(5) ).map(UserAuthSceneVo::getNum).collect(Collectors.toList());
+        HashMap<String, JSONObject> map = new HashMap<>();
+        if(!LaserNumList.isEmpty()){
+            map = laserService.getMapLaserSceneByDb(new LaserSceneParam(LaserNumList));
         }
         for (UserAuthSceneVo record : page.getRecords()) {
             //替换深时标题，链接
-            SceneVo sceneVo = map.get(record.getNum());
+            JSONObject sceneVo = map.get(record.getNum());
             if(sceneVo != null){
-                record.setWebSite(sceneVo.getWebSite());
-                record.setTitle(sceneVo.getSceneName());
+                record.setWebSite(sceneVo.getString("webSite"));
+                record.setTitle(sceneVo.getString("sceneName"));
             }
         }
     }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -17,6 +17,7 @@ import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.*;
 import com.fdkankan.manage.httpClient.client.FdKKClient;
+import com.fdkankan.manage.httpClient.param.LaserSceneParam;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.common.CameraConstant;
 import com.fdkankan.manage.entity.*;
@@ -345,7 +346,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         if(param.getType() == 2 || param.getType() == 6) { //深时点云，深光点云
             if(!numList.isEmpty()){
-                laserMap = laserService.list(numList, param.getType() == 2 ? 4 : 5);
+                //laserMap = laserService.list(numList, param.getType() == 2 ? 4 : 5);
+                laserMap = laserService.getMapLaserSceneByDb(new LaserSceneParam(numList));
             }
         }
         userIds = page.getRecords().stream().map(SceneVo::getUserId).collect(Collectors.toSet());

src/main/resources/mapper/manage/LaserMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.ILaserMapper">
+
+    <select id="getSceneByDb" resultType="com.alibaba.fastjson.JSONObject">
+        select * from fdkk_laser.t_scene
+                 where deleted = 0
+            <if test="param.sceneCodes != null and param.sceneCodes.size >0">
+                and scene_code in
+                 <foreach collection="param.sceneCodes" item="sceneCode" open="("  separator="," close=")">
+                     #{sceneCode}
+                 </foreach>
+            </if>
+    </select>
+</mapper>