Bladeren bron

更新:
本地更新绑定户型数据

wuweihao 4 jaren geleden
bovenliggende
commit
224a0b78cd

+ 3 - 3
cms_pano_fcb/gis_application/gis_application.iml

@@ -196,8 +196,6 @@
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
@@ -208,7 +206,6 @@
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
@@ -237,6 +234,9 @@
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />

+ 4 - 2
cms_pano_fcb/gis_application/src/main/resources/application-dev.properties

@@ -1,6 +1,6 @@
 #Ó¦ÓÃÃû
-spring.application.name=pano-service
-spring.cloud.nacos.discovery.server-addr=192.168.0.98:8848
+#spring.application.name=pano-service
+#spring.cloud.nacos.discovery.server-addr=192.168.0.98:8848
 
 #DB
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -103,3 +103,5 @@ file.path=F:\\test\\ngin\\${project.name}_data\\
 
 
 
+
+

+ 2 - 0
cms_pano_fcb/gis_application/src/main/resources/application-pro.properties

@@ -93,3 +93,5 @@ knife4j.basic.password=owen
 
 
 
+
+

+ 3 - 3
cms_pano_fcb/gis_common/gis_common.iml

@@ -209,8 +209,6 @@
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
@@ -221,7 +219,6 @@
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
@@ -251,5 +248,8 @@
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
   </component>
 </module>

+ 8 - 0
cms_pano_fcb/gis_common/pom.xml

@@ -181,6 +181,14 @@
         <!--</dependency>-->
 
 
+        <!-- httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
+
+
 
 
 

+ 359 - 0
cms_pano_fcb/gis_common/src/main/java/com/gis/common/util/HttpUtils.java

@@ -0,0 +1,359 @@
+package com.gis.common.util;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class HttpUtils {
+
+    protected static final Logger LOGGER = LoggerFactory.getLogger(HttpUtils.class);
+
+    /**
+     * get
+     *
+     * @param host
+     * @param path
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static String doGet(String host, String path,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpGet request = new HttpGet(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        HttpResponse httpResponse = httpClient.execute(request);
+        String restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
+        return restResult;
+    }
+
+    /**
+     * 20201-04-22
+     * post json
+     * @param url 请求地址
+     * @param headers 请求头
+     * @param body json参数
+     * @return
+     * @throws Exception
+     */
+    public static String doPostJson(String url, Map<String, String> headers, JSONObject body) throws Exception {
+        // 获得Http客户端(
+        CloseableHttpClient httpClient = HttpClientBuilder.create().build();
+        // 创建Post请求
+        HttpPost httpPost = new HttpPost(url);
+        LOGGER.info("request url: " + url);
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            httpPost.addHeader(e.getKey(), e.getValue());
+        }
+
+        StringEntity stringEntity = new StringEntity(body.toJSONString(), "UTF-8");
+        httpPost.setEntity(stringEntity);
+
+        HttpResponse httpResponse = httpClient.execute(httpPost);
+        String restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
+
+        return restResult;
+    }
+
+
+    /**
+     * post form
+     *
+     * @param host
+     * @param path
+     * @param headers
+     * @param querys
+     * @param bodys
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String host, String path,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      Map<String, String> bodys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (bodys != null) {
+            List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
+
+            for (String key : bodys.keySet()) {
+                nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key)));
+            }
+            UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
+            formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
+            request.setEntity(formEntity);
+        }
+        HttpResponse httpResponse = httpClient.execute(request);
+        String restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
+
+        return restResult;
+    }
+
+    /**
+     * Post String
+     *
+     * @param host
+     * @param path
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String host, String path,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      String body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (StringUtils.isNotBlank(body)) {
+            request.setEntity(new StringEntity(body, "utf-8"));
+        }
+
+        HttpResponse httpResponse = httpClient.execute(request);
+        String restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
+
+        return restResult;
+    }
+
+    /**
+     * Post stream
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPost(String host, String path, String method,
+                                      Map<String, String> headers,
+                                      Map<String, String> querys,
+                                      byte[] body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+            request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Put String
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     String body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (StringUtils.isNotBlank(body)) {
+            request.setEntity(new StringEntity(body, "utf-8"));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Put stream
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @param body
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doPut(String host, String path, String method,
+                                     Map<String, String> headers,
+                                     Map<String, String> querys,
+                                     byte[] body)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+            request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+
+    /**
+     * Delete
+     *
+     * @param host
+     * @param path
+     * @param method
+     * @param headers
+     * @param querys
+     * @return
+     * @throws Exception
+     */
+    public static HttpResponse doDelete(String host, String path, String method,
+                                        Map<String, String> headers,
+                                        Map<String, String> querys)
+            throws Exception {
+        HttpClient httpClient = wrapClient(host);
+
+        HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+
+        return httpClient.execute(request);
+    }
+
+    public static String buildUrl(String host, String path, Map<String, String> querys) throws UnsupportedEncodingException {
+        StringBuilder sbUrl = new StringBuilder();
+        sbUrl.append(host);
+        if (!StringUtils.isBlank(path)) {
+            sbUrl.append(path);
+        }
+        LOGGER.info("request api: " + sbUrl.toString());
+        if (null != querys) {
+            StringBuilder sbQuery = new StringBuilder();
+            for (Map.Entry<String, String> query : querys.entrySet()) {
+                if (0 < sbQuery.length()) {
+                    sbQuery.append("&");
+                }
+                if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) {
+                    sbQuery.append(query.getValue());
+                }
+                if (!StringUtils.isBlank(query.getKey())) {
+                    sbQuery.append(query.getKey());
+                    if (!StringUtils.isBlank(query.getValue())) {
+                        sbQuery.append("=");
+                        sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
+                    }
+                }
+            }
+            if (0 < sbQuery.length()) {
+                sbUrl.append("?").append(sbQuery);
+            }
+        }
+
+        return sbUrl.toString();
+    }
+
+    private static HttpClient wrapClient(String host) {
+        HttpClient httpClient = new DefaultHttpClient();
+        if (host.startsWith("https://")) {
+            sslClient(httpClient);
+        }
+        return httpClient;
+    }
+
+    private static void sslClient(HttpClient httpClient) {
+        try {
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            X509TrustManager tm = new X509TrustManager() {
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+
+                public void checkClientTrusted(X509Certificate[] xcs, String str) {
+
+                }
+
+                public void checkServerTrusted(X509Certificate[] xcs, String str) {
+
+                }
+            };
+            ctx.init(null, new TrustManager[]{tm}, null);
+            SSLSocketFactory ssf = new SSLSocketFactory(ctx);
+            ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+            ClientConnectionManager ccm = httpClient.getConnectionManager();
+            SchemeRegistry registry = ccm.getSchemeRegistry();
+            registry.register(new Scheme("https", 443, ssf));
+        } catch (KeyManagementException ex) {
+            throw new RuntimeException(ex);
+        } catch (NoSuchAlgorithmException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+
+
+}

+ 3 - 3
cms_pano_fcb/gis_domain/gis_domain.iml

@@ -192,8 +192,6 @@
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
@@ -204,7 +202,6 @@
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
@@ -236,5 +233,8 @@
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
   </component>
 </module>

+ 3 - 3
cms_pano_fcb/gis_mapper/gis_mapper.iml

@@ -193,8 +193,6 @@
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
@@ -205,7 +203,6 @@
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
@@ -237,5 +234,8 @@
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
   </component>
 </module>

+ 3 - 0
cms_pano_fcb/gis_mapper/src/main/java/com/gis/mapper/SceneMapper.java

@@ -98,4 +98,7 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
 
     @SelectProvider(type = SceneProvider.class, method = "countByType")
     Integer countByType(String houseId, String type);
+
+    @Select("select id, house_id, scene_code,hengda_id,room_id, type, is_delete,status,create_time,update_time  from tb_scene where is_delete = 0 and status >= 3 and type = 'house'")
+    List<SceneEntity> findByRoodData();
 }

+ 3 - 3
cms_pano_fcb/gis_service/gis_service.iml

@@ -194,8 +194,6 @@
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
@@ -206,7 +204,6 @@
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
@@ -238,5 +235,8 @@
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
   </component>
 </module>

+ 9 - 0
cms_pano_fcb/gis_service/src/main/java/com/gis/feign/HouseFeign.java

@@ -47,4 +47,13 @@ public interface HouseFeign {
 
     @GetMapping(value = "fcb/project/house/canEdit")
     Result canEdit(@RequestParam String houseId) throws Exception;
+
+
+    /**
+     * 加密接口
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "fcb/project/api/query/authCode", consumes = MediaType.APPLICATION_JSON_VALUE, produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
+    Result authCode(@RequestBody JSONObject param) throws Exception;
 }

+ 3 - 3
cms_pano_fcb/gis_web/gis_web.iml

@@ -195,8 +195,6 @@
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
@@ -207,7 +205,6 @@
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
@@ -236,6 +233,9 @@
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />

+ 89 - 19
cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/CommonController.java

@@ -1,11 +1,17 @@
 package com.gis.web.controller;
 
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gis.common.util.HttpUtils;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.SceneEntity;
 import com.gis.domain.entity.SceneInitEntity;
 import com.gis.domain.vo.SceneInitVo;
+import com.gis.feign.HouseFeign;
 import com.gis.mapper.SceneInitMapper;
 import com.gis.mapper.SceneMapper;
 import com.gis.service.HouseService;
@@ -15,13 +21,18 @@ import com.gis.web.aop.WebControllerLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -54,6 +65,13 @@ public class CommonController extends BaseController {
     @Autowired
     HouseService houseService;
 
+    @Autowired
+    HouseFeign houseFeign;
+
+    // uat
+    private final static String fcbClientCode = "dX96cHOkZm61AiCFni5k4qOlxvj8jSF7";
+    private final static String fcbDomain = "https://vr-web01-uat.fcb.com.cn";
+
 
     @ApiOperation(value = "检查token是否有效" , position = 3)
     @GetMapping("checkToken")
@@ -110,20 +128,6 @@ public class CommonController extends BaseController {
     }
 
 
-//    @ApiOperation(value = "保存")
-//    @PostMapping("save")
-//    public Result save(@Valid @RequestBody SceneInitDto param) {
-//        return sceneInitService.saveEntity(param);
-//    }
-//
-//
-//    @WebControllerLog(description = "VR项目-编辑VR项目", addDb = true)
-//    @ApiOperation(value = "VR项目修改", position = 3, notes = "修改VR项目的基础信息")
-//    @PostMapping("edit")
-//    public Result editHouse(@Valid @RequestBody EditHouseDto param) {
-//        return houseService.editHouse(param);
-//    }
-
 
     /**
      * 20201-05-24 新增
@@ -138,8 +142,10 @@ public class CommonController extends BaseController {
     }
 
 
+    /******************************** 2021-06-10 以下是修复旧数据临时用  *******************************************/
+
     /**
-     * 2021-5-13
+     * 2021-5-13 更新初始场景旧数据, 添加场景id
      * 更新没问题后,需要删除
      */
     @ApiOperation("更新初始场景旧数据")
@@ -185,9 +191,73 @@ public class CommonController extends BaseController {
     }
 
 
-    @ApiOperation(value = "编辑someData,(重命名)", position = 3)
-    @PostMapping("editSomeData")
-    public Result editSomeData(@Valid @RequestBody EditSomeDataDto param) {
-        return sceneService.editSomeData(param);
+
+    /**
+     * 20201-06-09 修改房车宝户型为绑定状态
+     * 本地执行脚本, 不需要更新到服务器跑
+     * @return
+     */
+    @ApiOperation("修改房车宝户型为绑定状态")
+    @GetMapping("updateRoom")
+    public Result updateRoom() throws Exception {
+        String filePath = "F:\\work\\test\\fcb\\uat.txt";
+        readFile(filePath);
+        return Result.success();
+    }
+
+
+    private static void readFile(String filePath) throws Exception {
+        // 读取本地文件
+        List<String> list = FileUtil.readLines(filePath, "utf-8");
+        log.info("size: {}", list.size());
+        int i = 1;
+        for (String s : list) {
+            String[] split = s.split(",");
+            String prodId = split[0];
+            String houseId = split[1];
+            authCode(prodId, houseId);
+            log.info("第 {} 个执行成", i);
+            i ++;
+        }
+    }
+
+
+    // 管理后台加密
+    private static void authCode(String prodId, String houseId) throws Exception {
+        JSONObject reqJson = new JSONObject();
+        reqJson.put("client_code", fcbClientCode);
+        reqJson.put("prodId", prodId);
+        // fcb.houseId对应我们的roomId
+        reqJson.put("houseId", houseId);
+        // 2:绑定
+        reqJson.put("bind", 2);
+        String authUrl = fcbDomain + "/fcb/project/api/query/authCode";
+
+        Map<String, String> headers  = new HashMap<>();
+        // 设置json请求头
+        headers.put("Content-Type", "application/json;charset=utf8");
+        String s = HttpUtils.doPostJson(authUrl, headers, reqJson);
+        log.info("s: {}", s);
+        JSONObject parse = JSON.parseObject(s);
+        Integer code = parse.getInteger("code");
+        if (code == 0) {
+            JSONObject data = parse.getJSONObject("data");
+            String authcode = data.getString("authcode");
+            String timeStamp = data.getString("timeStamp");
+            log.info("authcode: {},  timeStamp:{}", authcode, timeStamp);
+
+            // 请求房车宝绑定户型
+            reqJson.put("authcode", authcode);
+            reqJson.put("req_time", timeStamp);
+            bin(reqJson, headers);
+        }
     }
+
+    // fcb 绑定方法
+    private static void bin(JSONObject param, Map<String, String> headers) throws Exception {
+        String bindUrl = fcbDomain + "/vr/prodvr/prod/v1/bind";
+        String binResult = HttpUtils.doPostJson(bindUrl, headers, param);
+        log.info("binResult: {}", binResult);
+    }
+
 }

+ 7 - 6
cms_pano_fcb/pom.xml

@@ -37,6 +37,7 @@
         <fastjson.version>1.2.75</fastjson.version>
         <druid.version>1.1.14</druid.version>
         <hutool.version>5.3.3</hutool.version>
+        <httpclient.version>4.5.12</httpclient.version>
         <lombok.version>1.18.2</lombok.version>
         <lang3.version>3.7</lang3.version>
         <mysql.version>8.0.15</mysql.version>
@@ -281,13 +282,13 @@
                 <version>${junit.version}</version>
             </dependency>
 
-            <!--&lt;!&ndash; 二维码 &ndash;&gt;-->
-            <!--<dependency>-->
-                <!--<groupId>com.google.zxing</groupId>-->
-                <!--<artifactId>core</artifactId>-->
-                <!--<version>${zxing.version}</version>-->
-            <!--</dependency>-->
 
+            <!-- httpclient -->
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

+ 16 - 3
cms_pano_fcb/remark.md

@@ -167,6 +167,7 @@ sit:
    
    得到 house_id 然后查伟玉tm_house
    select id, house_title , estate_id from tm_house where id = 'houseId';
+   select id, house_title , estate_id from tm_house where id in ('houseId');
    
    
    
@@ -274,8 +275,9 @@ sit:
         
         初始场景旧数据导入   
         vr-web01-uat.fcb.com.cn/fcb/pano/common/updateData            
-        vr-web01-uat.fcb.com.cn/fcb/pano/common/getData    
-        
+        vr-web01-uat.fcb.com.cn/fcb/pano/common/getData  
+          
+        vr-web01-uat.fcb.com.cn/fcb/pano/common/updateRoom 
         
      20210330-1700
          更新sit 20210330内容 
@@ -287,7 +289,18 @@ sit:
         更新sit 20210408 内容  
         
       20210428-1000
-        更新sit  2021-04-25 内容         
+        更新sit  2021-04-25 内容    
+        
+        
+      202106-1000 更新户型旧数据
+        操作方式:
+        进入数据库
+        select id, house_id, scene_code,hengda_id,room_id, is_delete,status,create_time,update_time from tb_scene where is_delete = 0 and type = 'house' and room_id <> '' and hengda_id <> '';
+        select hengda_id,room_id from tb_scene where is_delete = 0 and type = 'house' and room_id <> '' and hengda_id <> '';
+        
+        获取结果后,只需要hengda_id,room_id, 然后进行处理
+        
+               
 
 # pro 更新日志
     20210228-1722