v1.1.0

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

@@ -14,4 +14,6 @@ public class LaserSceneParam {
     private String snCode;
     private List<String> snCodes = new ArrayList<>();
     private Integer sceneSource = 4;
+    private List<String> sceneCodes;
+
 }

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

@@ -46,15 +46,13 @@ public class LaserService {
     ICameraService cameraService;
 
 
-    public PageInfo pageList(SceneParam param) {
-        LaserSceneParam laserSceneParam = getLaserSceneParam(param);
-        if(laserSceneParam == null ){
-            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
-        }
+    public List<SceneVo> pageList(SceneParam param) {
+        LaserSceneParam laserSceneParam = new LaserSceneParam();
+        laserSceneParam.setSceneCodes(param.getSceneCodes());
         FdkkResponse response = laserClient.sceneList(laserSceneParam);
         JSONObject jsonObject =response.getData();
         if(jsonObject == null){
-            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+            return null;
         }
         JSONArray list = jsonObject.getJSONArray("list");
         long total =jsonObject.getLong("total");
@@ -78,10 +76,7 @@ public class LaserService {
             sceneVoList.add(vo);
         }
 
-        Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
-        voPage.setRecords(sceneVoList);
-        voPage.setTotal(total);
-        return PageInfo.PageInfo(voPage);
+        return sceneVoList;
     }
 
     private LaserSceneParam getLaserSceneParam(SceneParam param) {

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

@@ -163,8 +163,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
                 }
                 SceneParam param = new SceneParam();
                 param.setSnCodes(snCodeList);
-                PageInfo pageInfo = laserService.pageList(param);
-                resultMap.merge(companyId, pageInfo.getTotal(), Long::sum);
+                //PageInfo pageInfo = laserService.pageList(param);
+                //resultMap.merge(companyId, pageInfo.getTotal(), Long::sum);
             }
         }
 

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

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -292,9 +293,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public PageInfo pageList(SceneParam param) {
-        if(param.getType() == 2 || param.getType() == 6){  //深时
-            return laserService.pageList(param);
-        }
+//        if(param.getType() == 2 || param.getType() == 6){  //深时
+//            return laserService.pageList(param);
+//        }
 //        if(param.getType() == 3){ //双目lite
 //           return sceneService.pageList(param);
 //        }
@@ -316,9 +317,23 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
         HashMap<String,SceneCopyLog> map =  copyLogService.getByNewNumList(numList);
 
+        HashMap<String,SceneVo> voHashMap = new HashMap<>();
+        if(param.getType() == 2 || param.getType() == 6){ //深时点云，深光点云
+            param.setSceneCodes(numList);
+            List<SceneVo> sceneVos =  laserService.pageList(param);
+            for (SceneVo sceneVo : sceneVos) {
+                voHashMap.put(sceneVo.getNum(),sceneVo);
+            }
+        }
 
         for (SceneVo record : page.getRecords()) {
             record.setStatusString(SceneStatusUtil.getStatusString(record));
+
+            SceneVo sceneVo = voHashMap.get(record.getNum());
+            if(sceneVo !=null){
+                BeanUtil.copyProperties(sceneVo,record);
+            }
+
             if(map !=null ){
                 SceneCopyLog sceneCopyLog = map.get(record.getNum());
                 if(sceneCopyLog != null){
@@ -594,4 +609,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         return snCodeMap;
     }
+
+    public static void main(String[] args) {
+        System.out.println(SecurityUtil.MD5("4Dage168"));
+        System.out.println(SecurityUtil.MD52("4Dage168"));
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -17,5 +17,6 @@ public class SceneParam extends RequestBase {
     private Long userId;
 
     private List<String> snCodes;
+    private List<String> sceneCodes;
     private List<String> authNumList = new ArrayList<>();
 }

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

@@ -37,6 +37,9 @@
         <if test="param.sceneName != null and param.sceneName!='' ">
             and s.scene_name like concat ('%',#{param.sceneName},'%')
         </if>
+        <if test="param.type == 5 or param.type ==6">
+            and s.is_obj = 1
+        </if>
         and is_upgrade = 0
         UNION
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
@@ -48,6 +51,9 @@
         <if test="param.sceneName != null and param.sceneName!='' ">
             and s.title like concat ('%',#{param.sceneName},'%')
         </if>
+        <if test="param.type == 5 or param.type ==6">
+            and e.is_obj = 1
+        </if>
         ) as tb
         order by create_time desc
     </select>
@@ -70,6 +76,13 @@
         <if test="param.type !=null and param.type == 1">
             and s.scene_source = 3
         </if>
+        <if test="param.type == 2 or param.type ==5">
+            and s.scene_source = 4
+        </if>
+
+        <if test="param.type == 6 or param.type ==7">
+            and s.scene_source = 5
+        </if>
         <if test="param.companyId !=null ">
             and co.id = #{param.companyId}
         </if>

update-1.0.1.sql

@@ -0,0 +1,29 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local-192.168.0.25
+ Source Server Type    : MySQL
+ Source Server Version : 80027
+ Source Host           : 192.168.0.25:3306
+ Source Schema         : 4dkankan_v4
+
+ Target Server Type    : MySQL
+ Target Server Version : 80027
+ File Encoding         : 65001
+
+ Date: 26/09/2023 09:29:31
+*/
+use 4dkankan_v4;
+
+UPDATE t_user set `password` = '>F@DL' WHERE user_name ='13800138001';
+
+UPDATE sys_user set `password` = '4e65c8f3004bfd45cb2679290be2056e' WHERE user_name ='13800138001';
+
+UPDATE jy_user set `ry_password` = '4e65c8f3004bfd45cb2679290be2056e' WHERE ry_id ='13800138001';
+
+
+UPDATE t_user set `password` = '@0EBL' WHERE user_name ='admin';
+
+UPDATE sys_user set `password` = 'b0c7834f570febcc47ec029c0ede7064' WHERE user_name ='admin';
+
+UPDATE jy_user set `ry_password` = 'b0c7834f570febcc47ec029c0ede7064' WHERE ry_id ='admin';