tianboguang 2 роки тому
батько
коміт
ecb354b4b8

+ 0 - 10
pom.xml

@@ -115,21 +115,11 @@
             <version>1.2.83</version>
         </dependency>
 
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-
-        <!--htt请求工具-->
-        <dependency>
-            <groupId>com.dtflys.forest</groupId>
-            <artifactId>forest-spring-boot-starter</artifactId>
-            <version>1.5.24</version>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>

+ 0 - 2
src/main/java/com/fdkankan/ucenter/controller/SceneCooperationController.java

@@ -1,9 +1,7 @@
 package com.fdkankan.ucenter.controller;
 
-import com.dtflys.forest.annotation.Post;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.ucenter.common.Result;
-import com.fdkankan.ucenter.entity.SceneCooperation;
 import com.fdkankan.ucenter.service.ISceneCooperationService;
 import com.fdkankan.ucenter.vo.request.SceneCooperationParam;
 import com.fdkankan.ucenter.vo.request.SceneParam;

+ 0 - 20
src/main/java/com/fdkankan/ucenter/httpClient/address/LaserAddressSource.java

@@ -1,20 +0,0 @@
-package com.fdkankan.ucenter.httpClient.address;
-
-import com.dtflys.forest.callback.AddressSource;
-import com.dtflys.forest.http.ForestAddress;
-import com.dtflys.forest.http.ForestRequest;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class LaserAddressSource implements AddressSource {
-
-    @Value("${4dkk.laserService.basePath:#{null}}")
-    private String basePath;
-
-
-    @Override
-    public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",null,basePath);
-    }
-}

+ 0 - 53
src/main/java/com/fdkankan/ucenter/httpClient/client/LaserClient.java

@@ -1,53 +0,0 @@
-package com.fdkankan.ucenter.httpClient.client;
-
-import com.dtflys.forest.annotation.*;
-import com.fdkankan.ucenter.common.Result;
-import com.fdkankan.ucenter.httpClient.address.LaserAddressSource;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 获取,调用激光服务
- */
-@Address(source = LaserAddressSource.class)
-public interface LaserClient {
-
-    /**
-     * 根据用户获取激光相机数量
-     */
-    @Post("/laser/4dage/getSceneNum")
-    Result getSceneNum(@Header("fdToken") String token);
-    /**
-     * 获取相机场景数
-     * @param param
-     */
-    @Post("/laser/4dage/scene/getSceneNumByCamera")
-    Result getSceneNumByCamera(@JSONBody Map<String, String> param);
-    /**
-     * 取消相机协作
-     * @param param
-     */
-    @Post("/laser/4dage/scene/cooperation/disable")
-    Result cooperationDisable(@JSONBody List<Map<String, String> >param);
-    /**
-     * 添加相机协作
-     * @param param
-     */
-    @Post("/laser/4dage/scene/cooperation/cameraSave")
-    Result cooperationCameraSave(@JSONBody List<Map<String, String> >param);
-
-    @Get("/laser/init/${0}")
-    Result getSceneByNum(String num);
-
-    /**
-     * 新增场景
-     */
-    @Post("/laser/init/{sceneNum}/saveOrEdit")
-    Result saveOrEdit(@Var("sceneNum") String sceneNum, @JSONBody  Map<String,Object> params);
-    /**
-     * 新增场景
-     */
-    @Post("/laser/4dage/scene/getScenesBySnCode")
-    Result getScenesBySnCode(@JSONBody Map<String, String> param, @Header("fdToken") String token) ;
-}

+ 0 - 14
src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -1,32 +1,18 @@
 package com.fdkankan.ucenter.httpClient.service;
 
-import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.ucenter.common.CameraTypeEnum;
-import com.fdkankan.ucenter.common.Result;
-import com.fdkankan.ucenter.common.constants.NacosProperty;
-import com.fdkankan.ucenter.common.utils.ShellUtil;
 import com.fdkankan.ucenter.entity.Camera;
 import com.fdkankan.ucenter.entity.CameraDetail;
-import com.fdkankan.ucenter.entity.User;
-import com.fdkankan.ucenter.httpClient.client.LaserClient;
 import com.fdkankan.ucenter.service.ICameraService;
 import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.vo.SceneBySnCodeVo;
 import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;