合并代码

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -1,5 +1,7 @@
 package com.gis.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -8,25 +10,25 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.common.constant.*;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.httpclient.FdkkClient;
 import com.gis.common.mq.RabbitMqProducerUtil;
 import com.gis.common.util.*;
 import com.gis.domain.dto.*;
-import com.gis.domain.entity.FodderEntity;
-import com.gis.domain.entity.ScenePanoEntity;
-import com.gis.domain.entity.WorkEntity;
-import com.gis.domain.entity.WorkHotsFodderEntity;
+import com.gis.domain.entity.*;
 import com.gis.domain.vo.ReportWorkVo;
+import com.gis.domain.vo.WorkNavigationVo;
+import com.gis.domain.vo.WorkVo;
 import com.gis.mapper.*;
 import com.gis.oss.util.FileAndOssUtil;
 import com.gis.oss.util.FileUtils;
 import com.gis.oss.util.QrCodeUtils;
-import com.gis.service.FodderService;
-import com.gis.service.ScenePanoService;
-import com.gis.service.WorkHotsFodderService;
-import com.gis.service.WorkService;
+import com.gis.service.*;
+import com.gis.util.UserRequest;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -123,11 +125,6 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
     @Value("${queue.relics-update-name-queue:#{null}}")
     String relicsUpdateNameQueue;
 
-    @Override
-    public IBaseStrMapper<WorkEntity, String> getBaseMapper() {
-        return this.entityMapper;
-    }
-
 
     @Override
     public Result search(AgePageDto param, boolean isAdmin) {
@@ -460,11 +457,11 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        String userNameForToken = getUserNameForToken();
+        String userNameForToken = userRequest.getUserNameForToken();
         if (!userNameForToken.equals(entity.getUserId()) && ObjectUtil.isEmpty(entity.getNum())) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
         } else if (ObjectUtil.isNotEmpty(entity.getType()) && entity.getType().equalsIgnoreCase("pro")) {
-            JSONObject cameraList = fdkkClient.getCameraListByToken(getToken(), "3,4,5");
+            JSONObject cameraList = fdkkClient.getCameraListByToken(userRequest.getCurrentToken(), "3,4,5");
             List<String> snCodes = new ArrayList<>();
             if (cameraList.getInteger("code") == 0) {
                 JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
@@ -1357,7 +1354,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
     @Override
     public Result<WorkEntity> searchSceneWorkList(AgePageDto param) {
-        String token = getToken();
+        String token = userRequest.getCurrentToken();
         JSONObject cameraList = fdkkClient.getCameraListByToken(token, "3,4,5");
         List<String> snCodes = new ArrayList<>();
         if (cameraList.getInteger("code") == 0) {