getSceneStatusByUnicode 添加返回 status.json路径

src/main/java/com/fdkankan/ucenter/common/OssPath.java

@@ -3,4 +3,6 @@ package com.fdkankan.ucenter.common;
 public class OssPath {
 
     public final static String houseTypePath = "scene_edit_data/%s/user/houseType.json";
+    public final static String v3_statusPath = "data/data%s/status.json";
+    public final static String v4_statusPath = "scene_view_data/%s/data/status.json";
 }

src/main/java/com/fdkankan/ucenter/config/RestTemplateConfiguration.java

@@ -0,0 +1,57 @@
+package com.fdkankan.ucenter.config;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+
+
+@Configuration
+public class RestTemplateConfiguration {
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate(httpRequestFactory());
+    }
+
+
+    @Bean
+    public ClientHttpRequestFactory httpRequestFactory() {
+        return new HttpComponentsClientHttpRequestFactory(httpClient());
+    }
+
+
+    @Bean
+    public HttpClient httpClient() {
+        Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
+                .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                .register("https", SSLConnectionSocketFactory.getSocketFactory())
+                .build();
+        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry);
+        //设置整个连接池最大连接数
+        connectionManager.setMaxTotal(400);
+
+        //路由是对maxTotal的细分
+        connectionManager.setDefaultMaxPerRoute(100);
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(3000)  //返回数据的超时时间
+                .setConnectTimeout(2000) //连接上服务器的超时时间
+                .setConnectionRequestTimeout(1000) //从连接池中获取连接的超时时间
+                .build();
+        return HttpClientBuilder.create()
+                .setDefaultRequestConfig(requestConfig)
+                .setConnectionManager(connectionManager)
+                .build();
+    }
+
+}

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -1,15 +1,22 @@
 package com.fdkankan.ucenter.controller;
 
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.impl.FdkkLaserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+
 @RestController
 public class TestController {
 
+    @Autowired
+    FdkkLaserService fdkkLaserService;
+
     @RequestMapping("/test")
     public Result test() throws Exception {
-
+        fdkkLaserService.test(new HashMap<>());
         return Result.success( );
     }
 }

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -7,6 +7,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.mapper.IScenePlusMapper;
@@ -16,6 +17,7 @@ import com.fdkankan.ucenter.vo.response.AppSceneVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -52,6 +54,9 @@ public class AppSceneService {
     @Resource
     IScenePlusMapper scenePlusMapper;
 
+    @Value("${fyun.host}")
+    private String ossHost;
+
     public PageInfo pageList(AppSceneParam param) {
         if(StringUtils.isEmpty(param.getAppUserName()) && StringUtils.isEmpty(param.getPhoneNum()) ){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
@@ -127,9 +132,10 @@ public class AppSceneService {
             status = -1;
         }
         String webSite = scenePro == null ? plusExt.getWebSite() : scenePro.getWebSite();
-        String sceneNum = scenePro == null ? scenePlus.getTitle() : scenePro.getSceneName();
+        String sceneNum = scenePro == null ? scenePlus.getNum() : scenePro.getNum();
         String thumb = scenePro == null ? plusExt.getThumb() : scenePro.getThumb();
         String dataSource = scenePro == null ? plusExt.getDataSource() : scenePro.getDataSource();
+        String sceneCallPath = scenePro == null ? String.format(OssPath.v4_statusPath,sceneNum) : String.format(OssPath.v4_statusPath,sceneNum);
         HashMap<String,Object> map = new HashMap<>();
         map.put("status",status == -2 ? 1:status);
         map.put("webSite",webSite);
@@ -138,6 +144,7 @@ public class AppSceneService {
         map.put("dataSource",dataSource);
         map.put("payStatus",payStatus);
         map.put("recStatus","A");
+        map.put("sceneCallPath",ossHost+sceneCallPath);
         return map;
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/FdkkLaserService.java

@@ -68,14 +68,36 @@ public class FdkkLaserService {
     }
 
     public Integer getLaserSceneNum(Map<String, String> params){
-        String url = laserHost + GET_LASER_SCENE_CNT_URL;
-        log.info("获取激光转台相机场景数，url:{},params:{}",GET_LASER_SCENE_CNT_URL, JSONObject.toJSONString(params));
-        ResponseEntity<Result> responseEntity = restTemplate.postForEntity(url,params, Result.class);
-        log.info("获取激光转台相机场景数，url:{},params:{},结果:{}",url, JSONObject.toJSONString(params),JSONObject.toJSONString(responseEntity.getBody()));
-        if(responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()){
-            log.error("自研激光转台相机协作失败!");
+        try {
+            String url = laserHost + GET_LASER_SCENE_CNT_URL;
+            log.info("获取激光转台相机场景数，url:{},params:{}",GET_LASER_SCENE_CNT_URL, JSONObject.toJSONString(params));
+            ResponseEntity<Result> responseEntity = restTemplate.postForEntity(url,params, Result.class);
+            log.info("获取激光转台相机场景数，url:{},params:{},结果:{}",url, JSONObject.toJSONString(params),JSONObject.toJSONString(responseEntity.getBody()));
+            if(responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()){
+                log.error("自研激光转台相机协作失败!");
+                return 0;
+            }
+            return (Integer) responseEntity.getBody().getData();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+       return 0;
+    }
+    public Integer test(Map<String, String> params){
+        try {
+            String url ="http://192.168.0.38:8088/test";
+            log.info("获取激光转台相机场景数，url:{},params:{}",GET_LASER_SCENE_CNT_URL, JSONObject.toJSONString(params));
+            ResponseEntity<Result> responseEntity = restTemplate.postForEntity(url,params, Result.class);
+            log.info("获取激光转台相机场景数，url:{},params:{},结果:{}",url, JSONObject.toJSONString(params),JSONObject.toJSONString(responseEntity.getBody()));
+            if(responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()){
+                log.error("自研激光转台相机协作失败!");
+                return 0;
+            }
+            return (Integer) responseEntity.getBody().getData();
+        }catch (Exception e){
+            e.printStackTrace();
         }
-        return (Integer) responseEntity.getBody().getData();
+       return 0;
     }
 
     public void disableCooperation(HashMap<Long,CameraDetail> detailMap,HashMap<Long,Camera> cameraMap ){

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -65,8 +65,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     IReceiverInfoService receiverInfoService;
     @Autowired
     RedisUtil redisUtil;
-    @Resource
-    private FYunFileServiceInterface fYunFileService;
+    @Autowired
+    FYunFileServiceInterface fYunFileService;
 
     private User getByEmail(String email){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();

src/main/resources/bootstrap-dev.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-v4
+        namespace: 4dkankan-test
         extension-configs:
           - data-id: 4dkankan-center-ucenter.yaml
             group: DEFAULT_GROUP
@@ -28,7 +28,11 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true