1111

pom.xml

@@ -3,11 +3,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+<!--    <parent>-->
+<!--        <groupId>org.springframework.boot</groupId>-->
+<!--        <artifactId>spring-boot-starter-parent</artifactId>-->
+<!--        <version>2.3.12.RELEASE</version>-->
+<!--        <relativePath/>-->
+<!--    </parent>-->
+
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.12.RELEASE</version>
-        <relativePath/>
+        <groupId>com.chinatower.cloud</groupId>
+        <artifactId>spring-cloud-chinatower-platform</artifactId>
+        <version>3.0.6.0</version>
     </parent>
 
     <groupId>com.fdkankan</groupId>
@@ -53,16 +59,28 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>5.2.16.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-web</artifactId>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework</groupId>-->
+<!--                    <artifactId>spring-web</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework</groupId>-->
+<!--            <artifactId>spring-web</artifactId>-->
+<!--            <version>5.2.16.RELEASE</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -90,16 +108,16 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>tlog-web-spring-boot-starter</artifactId>
-            <version>1.3.6</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yomahub</groupId>-->
+<!--            <artifactId>tlog-web-spring-boot-starter</artifactId>-->
+<!--            <version>1.3.6</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.yomahub</groupId>
-            <artifactId>tlog-feign-spring-boot-starter</artifactId>
-            <version>1.3.6</version>
+            <artifactId>tlog-all-spring-boot-starter</artifactId>
+            <version>1.5.1</version>
         </dependency>
 
         <!--        htt请求工具-->
@@ -140,118 +158,41 @@
             <artifactId>freemarker</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.chinatower.cloud</groupId>
+            <artifactId>spring-cloud-starter-chinatower-nacos-discovery</artifactId>
+            <version>3.0.6.0</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-openfeign</artifactId>-->
+<!--        </dependency>-->
+
     </dependencies>
 
-    <dependencyManagement>
-
-        <dependencies>
-
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.2.7.RELEASE</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring.cloud-version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-all</artifactId>
-                <version>${hutool-version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson-version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>${servlet-api-version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${spring.boot-mybatis-version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.plugin</groupId>
-                <artifactId>spring-plugin-metadata</artifactId>
-                <version>${spring.plugin.metadata-version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.auth0</groupId>
-                <artifactId>java-jwt</artifactId>
-                <version>${jwt-version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.ant</groupId>
-                <artifactId>ant</artifactId>
-                <version>${ant-version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-spring</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jjwt.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java</artifactId>
-                <version>${protobuf-java.version}</version>
-            </dependency>
+<!--    <dependencyManagement>-->
+
+<!--        <dependencies>-->
 
 <!--            <dependency>-->
-<!--                <groupId>org.apache.commons</groupId>-->
-<!--                <artifactId>commons-lang3</artifactId>-->
-<!--                <version>${commons-lang3.version}</version>-->
+<!--                <groupId>com.alibaba.cloud</groupId>-->
+<!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
+<!--                <version>2.2.7.RELEASE</version>-->
+<!--                <type>pom</type>-->
+<!--                <scope>import</scope>-->
 <!--            </dependency>-->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>${commons-pool2.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-api</artifactId>
-                <version>2.17.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-to-slf4j</artifactId>
-                <version>2.17.0</version>
-            </dependency>
 
 <!--            <dependency>-->
-<!--                <groupId>com.chinatower.cloud</groupId>-->
-<!--                <artifactId>spring-cloud-chinatower-platform</artifactId>-->
-<!--                <version>3.0.6.0</version>-->
+<!--                <groupId>org.springframework.cloud</groupId>-->
+<!--                <artifactId>spring-cloud-dependencies</artifactId>-->
+<!--                <version>Hoxton.SR8</version>-->
+<!--                <type>pom</type>-->
+<!--                <scope>import</scope>-->
 <!--            </dependency>-->
 
-        </dependencies>
-    </dependencyManagement>
+<!--        </dependencies>-->
+<!--    </dependencyManagement>-->
 
 
     <build>

src/main/java/com/fdkankan/SceneApplication.java

@@ -1,17 +1,24 @@
 package com.fdkankan;
 
-import com.dtflys.forest.springboot.annotation.ForestScan;
+import com.yomahub.tlog.core.enhance.bytes.AspectLogEnhance;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
 @EnableScheduling
 @MapperScan("com.fdkankan.**.mapper")
 public class SceneApplication {
 
+    static {
+        AspectLogEnhance.enhance();
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(SceneApplication.class, args);
     }

src/main/java/com/fdkankan/feign/TietaFeignClient.java

@@ -0,0 +1,16 @@
+package com.fdkankan.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+@FeignClient(name = "chinatower-res-sys-service")
+public interface TietaFeignClient {
+
+    @PostMapping("/sys/base/user/checkProwadaTokenMicro")
+    JSONObject checkProwadaTokenMicro(@RequestBody JSONObject jsonObject);
+
+}

src/main/java/com/fdkankan/scene/bean/ResultData.java

@@ -0,0 +1,61 @@
+package com.fdkankan.scene.bean;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Calendar;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResultData<T> implements Serializable {
+    /**
+     * 状态码
+     */
+    private int code;
+    /**
+     * 响应信息
+     */
+    private String message;
+    /**
+     * 后端返回结果
+     */
+    private T data;
+    /**
+     * 请求是否成功
+     */
+    private Boolean success;
+    /**
+     * 响应时间戳
+     */
+    private long timestamp = Calendar.getInstance().getTimeInMillis();
+
+    public static ResultData ok() {
+        return ok(null);
+    }
+    public static ResultData ok(Object data) {
+        return ok("成功", data);
+    }
+    public static ResultData ok(String msg, Object data) {
+        return base(0, msg, data,true);
+    }
+
+    public static ResultData error(int code, String msg) {
+        return error(code, msg, null); }
+    public static ResultData error(int code, String msg, Object data) {
+        return base(code, msg, data,false);
+    }
+
+
+    private static ResultData  base(int code, String msg, Object data,Boolean success) {
+        ResultData rd = new ResultData();
+        rd.setCode(code);
+        rd.setMessage(msg);
+        rd.setData(data);
+        rd.setSuccess(success);
+        return rd;
+    }
+
+}

src/main/java/com/fdkankan/scene/config/WebConfig.java

@@ -1,7 +1,9 @@
 package com.fdkankan.scene.config;
 
+import com.yomahub.tlog.web.interceptor.TLogWebInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
@@ -13,9 +15,8 @@ public class WebConfig implements WebMvcConfigurer {
                 .allowedOrigins("*")
                 .allowedMethods("GET","POST","PUT","DELETE")
                 .allowedHeaders("*")
-                .allowCredentials(true)
+//                .allowCredentials(true)
                 .maxAge(168000);
     }
 
-
 }

src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -2,9 +2,9 @@ package com.fdkankan.scene.controller;
 
 
 import com.fdkankan.common.constant.SceneInfoReqType;
+import com.fdkankan.scene.bean.ResultData;
 import com.fdkankan.scene.service.SceneService;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
-import com.fdkankan.scene.vo.SceneInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,8 +25,6 @@ public class SceneController {
 
     @Autowired
     private SceneService sceneService;
-//    @Resource
-//    UserTokenApi userTokenApi;
 
     /**
      * <p>
@@ -38,16 +36,7 @@ public class SceneController {
      * @return com.fdkankan.scene.vo.SceneInfoVO
      **/
     @GetMapping(value = "/getInfo")
-    public SceneInfoVO getInfo(@Validated SceneInfoParamVO param) throws Exception{
-//        String token = param.getToken();
-//        String sysCode = param.getSyscode();
-//        String acctId = param.getAcctId();
-//        String RSP = "-1";
-//        // TODO: 2024/6/5 调用统一认证api,如果出参中返回的
-//        JSONObject jsonObject = userTokenApi.checkProwadaToken(sysCode, acctId, token);
-//        if(Objects.isNull(jsonObject) || !"0".equals(jsonObject.getString("RSP"))){
-//            throw new BusinessException(ErrorCode.AUTH_FAIL);
-//        }
+    public ResultData getInfo(@Validated SceneInfoParamVO param) throws Exception{
         param.setReqType(SceneInfoReqType.VIEW.code());
         return sceneService.getSceneInfo(param);
     }

src/main/java/com/fdkankan/scene/dto/CheckTokenDTO.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CheckTokenDTO implements Serializable {
+
+    private static final long serialVersionUID = 6384935760157228272L;
+    public String SYSCODE;
+    public String ACCTID;
+    public String TOKEN;
+}

src/main/java/com/fdkankan/scene/generator/MappingGeneratorOracle.java

@@ -49,15 +49,15 @@ public class MappingGeneratorOracle {
 	 * JDBC URL 说明: url地址前需要加上@,否则会报错
 	 */
 
-	private static final String JDBC_URL = "jdbc:oracle:thin:@//8.135.106.227:1521/helowin";
+	private static final String JDBC_URL = "jdbc:oracle:thin:@//10.180.41.39:1521/resdb";
 	/**
 	 * 数据库账户
 	 */
-	private static final String DB_USERNAME = "FDKK";
+	private static final String DB_USERNAME = "RES_VR";
 	/**
 	 * 数据库账户密码
 	 */
-	private static final String DB_PASSWORD = "qawsed@123.";
+	private static final String DB_PASSWORD = "IDCqawsed@123.";
 
 	/**
 	 * 执行即可生成代码 需要添加 freemarker 依赖 <dependency> <groupId>org.freemarker</groupId>
@@ -139,6 +139,7 @@ public class MappingGeneratorOracle {
 		// TODO 填写表前缀、表字段前缀，生成代码时去除字段前缀
 		strategyConfig.setTablePrefix("t_");
 		strategyConfig.setFieldPrefix("a_", "c_", "e_", "f_", "p_", "r_", "t_", "tf_");
+		strategyConfig.setInclude("T_FULLPHOTO_FILEINDEX");
 		return strategyConfig;
 	}
 

src/main/java/com/fdkankan/scene/generator/com/fdkankan/scene/controller/FullphotoFileindexController.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-07-08
+ */
+@RestController
+@RequestMapping("/fullphotoFileindex")
+public class FullphotoFileindexController {
+
+}

src/main/java/com/fdkankan/scene/generator/com/fdkankan/scene/entity/FullphotoFileindex.java

@@ -0,0 +1,132 @@
+package com.fdkankan.scene.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("T_FULLPHOTO_FILEINDEX")
+public class FullphotoFileindex extends Model<FullphotoFileindex> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 省分
+     */
+    @TableField("PROVINCE_ID")
+    private String provinceId;
+
+    /**
+     * 地市
+     */
+    @TableField("REGION_ID")
+    private String regionId;
+
+    /**
+     * 站址编码
+     */
+    @TableField("STATION_CODE")
+    private String stationCode;
+
+    /**
+     * 机房ID
+     */
+    @TableField("ENTITY_ID")
+    private String entityId;
+
+    /**
+     * 文件名称
+     */
+    @TableField("FILE_NAME")
+    private String fileName;
+
+    /**
+     * 文件md5码
+     */
+    @TableField("FILE_MD5")
+    private String fileMd5;
+
+    /**
+     * 文件类型(1-512图片，2-4K图片，3-8K图片，5-小地图文件，7-点位文件，11-模型文件，12-场景信息文件（可根据实际增加枚举值）)
+     */
+    @TableField("FILE_TYPE")
+    private String fileType;
+
+    /**
+     * 点位Uuid
+     */
+    @TableField("PIC_UUID")
+    private String picUuid;
+
+    /**
+     * 上传时间
+     */
+    @TableField("UP_TIME")
+    private LocalDate upTime;
+
+    /**
+     * 上传用户
+     */
+    @TableField("UP_USER")
+    private String upUser;
+
+    /**
+     * 文件大小
+     */
+    @TableField("FILE_SIZE")
+    private String fileSize;
+
+    /**
+     * 文件标识fileID
+     */
+    @TableField("FILEID")
+    private String fileid;
+
+    /**
+     * 记录唯一ID
+     */
+    @TableField("RECORD_ID")
+    private String recordId;
+
+    /**
+     * 上传记录id
+     */
+    @TableField("UPLOAD_ID")
+    private String uploadId;
+
+    /**
+     * 状态: 1-正常 2-已删除 3-删除失败
+     */
+    @TableField("STATUS")
+    private String status;
+
+    /**
+     * 分布式存储文件下载URL
+     */
+    @TableField("FILE_URL")
+    private String fileUrl;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+}

src/main/java/com/fdkankan/scene/generator/com/fdkankan/scene/mapper/FullphotoFileindexMapper.java

@@ -0,0 +1,16 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.FullphotoFileindex;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-07-08
+ */
+public interface FullphotoFileindexMapper extends BaseMapper<FullphotoFileindex> {
+
+}

src/main/java/com/fdkankan/scene/generator/com/fdkankan/scene/mapper/xml/FullphotoFileindexMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.FullphotoFileindexMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.fdkankan.scene.entity.FullphotoFileindex">
+        <result column="PROVINCE_ID" property="provinceId" />
+        <result column="REGION_ID" property="regionId" />
+        <result column="STATION_CODE" property="stationCode" />
+        <result column="ENTITY_ID" property="entityId" />
+        <result column="FILE_NAME" property="fileName" />
+        <result column="FILE_MD5" property="fileMd5" />
+        <result column="FILE_TYPE" property="fileType" />
+        <result column="PIC_UUID" property="picUuid" />
+        <result column="UP_TIME" property="upTime" />
+        <result column="UP_USER" property="upUser" />
+        <result column="FILE_SIZE" property="fileSize" />
+        <result column="FILEID" property="fileid" />
+        <result column="RECORD_ID" property="recordId" />
+        <result column="UPLOAD_ID" property="uploadId" />
+        <result column="STATUS" property="status" />
+        <result column="FILE_URL" property="fileUrl" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        PROVINCE_ID, REGION_ID, STATION_CODE, ENTITY_ID, FILE_NAME, FILE_MD5, FILE_TYPE, PIC_UUID, UP_TIME, UP_USER, FILE_SIZE, FILEID, RECORD_ID, UPLOAD_ID, STATUS, FILE_URL
+    </sql>
+
+</mapper>

src/main/java/com/fdkankan/scene/generator/com/fdkankan/scene/service/FullphotoFileindexService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.FullphotoFileindex;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-07-08
+ */
+public interface FullphotoFileindexService extends IService<FullphotoFileindex> {
+
+}

src/main/java/com/fdkankan/scene/generator/com/fdkankan/scene/service/impl/FullphotoFileindexServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.service.impl;
+
+import com.fdkankan.scene.entity.FullphotoFileindex;
+import com.fdkankan.scene.mapper.FullphotoFileindexMapper;
+import com.fdkankan.scene.service.FullphotoFileindexService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author dsx
+ * @since 2024-07-08
+ */
+@Service
+public class FullphotoFileindexServiceImpl extends ServiceImpl<FullphotoFileindexMapper, FullphotoFileindex> implements FullphotoFileindexService {
+
+}

src/main/java/com/fdkankan/scene/service/SceneService.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.service;
 
+import com.fdkankan.scene.bean.ResultData;
 import com.fdkankan.scene.entity.Scene;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
@@ -15,6 +16,6 @@ import com.fdkankan.scene.vo.SceneInfoVO;
  */
 public interface SceneService extends IService<Scene> {
 
-    SceneInfoVO getSceneInfo(SceneInfoParamVO param) throws Exception;
+    ResultData getSceneInfo(SceneInfoParamVO param) throws Exception;
 
 }

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -1,10 +1,13 @@
 package com.fdkankan.scene.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.feign.TietaFeignClient;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.scene.bean.ResultData;
 import com.fdkankan.scene.entity.Scene;
 import com.fdkankan.scene.entity.SceneFileMapping;
 import com.fdkankan.scene.mapper.SceneMapper;
@@ -14,8 +17,10 @@ import com.fdkankan.scene.vo.SceneEditControlsVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -31,15 +36,36 @@ import java.util.stream.Collectors;
 @Service
 public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements SceneService {
 
+    @Value("${spring.cloud.nacos.discovery.access-key}")
+    private String accessKey;
+
+    @Value("${tieta.checkToken.syscode}")
+    private String syscode;
+
     @Autowired
     private SceneFileMappingService sceneFileMappingService;
     @Autowired
     private RedisUtil redisUtil;
-    @Autowired
-    private SceneService sceneService;
+    @Resource
+    private TietaFeignClient tietaFeignClient;
 
     @Override
-    public SceneInfoVO getSceneInfo(SceneInfoParamVO param) throws Exception {
+    public ResultData getSceneInfo(SceneInfoParamVO param) throws Exception {
+
+        String token = param.getToken();
+        String acctId = param.getAcctId();
+
+        JSONObject params = new JSONObject();
+//        Map<String, Object> params = new HashMap<>();
+        params.put("SYSCODE", syscode);
+        params.put("ACCTID", acctId);
+        params.put("TOKEN", token);
+
+        JSONObject result = tietaFeignClient.checkProwadaTokenMicro(params);
+        if(!"0".equals(result.get("RSP"))){
+            return ResultData.error(4000, (String) result.get("ERRDESC"));
+        }
+
         String num = param.getNum();
         SceneInfoVO sceneInfoVO = null;
         String key = String.format(RedisKey.SCENE_JSON, num);
@@ -52,7 +78,7 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
             sceneInfoVO.getControls().setShowDollhouse(0);
             sceneInfoVO.setFloorLogo("2");
         }else{
-            Scene scene = sceneService.getOne(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num));
+            Scene scene = this.getOne(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num));
             sceneInfoVO = new SceneInfoVO();
             sceneInfoVO.setTitle(scene.getTitle());
             sceneInfoVO.setNum(scene.getNum());
@@ -63,8 +89,7 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
             sceneInfoVO.setModelKind(scene.getModelkind());
             sceneInfoVO.setFloorPlanAngle(Float.valueOf(scene.getFloorplanangle()));
             sceneInfoVO.setFloorLogo("2");
-            SceneEditControlsVO sceneEditControlsBean = SceneEditControlsVO.builder().showRule(1).showFloorplan(0).showDollhouse(0)
-                    .showDollhouse(1).showMap(1).showPanorama(1).showVR(1).showTitle(1).showFloorplan(1).build();
+            SceneEditControlsVO sceneEditControlsBean = SceneEditControlsVO.builder().showRule(1).showFloorplan(0).showDollhouse(0).showMap(1).showPanorama(1).showVR(1).showTitle(1).build();
             sceneInfoVO.setControls(sceneEditControlsBean);
 
             redisUtil.set(key, JSON.toJSONString(sceneInfoVO));
@@ -74,6 +99,6 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
         Map<String, String> keyMap = mappingList.stream().collect(Collectors.toMap(SceneFileMapping::getKey, SceneFileMapping::getUrl));
         sceneInfoVO.setMapping(keyMap);
 
-        return sceneInfoVO;
+        return ResultData.ok(sceneInfoVO);
     }
 }

src/main/resources/application-test.yml

@@ -1,6 +1,12 @@
 spring:
   application:
     name: chntzcgl-vr
+    syscode: CT00017
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.180.22.20:8848
+        access-key: b4eb646cfa43a3e748d7b81d718d795f
   datasource:
     url: jdbc:oracle:thin:@//10.180.41.39:1521/resdb
     username: RES_VR
@@ -22,33 +28,15 @@ fyun:
   endPoint:
   host: /oss/
 
-#app:
-#  product:
-#    client:
-#      4a:
-#        requestUrl: http://10.180.22.22:8097
-## 注册中心
-#register:
-#  url: http://10.180.22.9:8761/eureka/
-#  token: xxx #注册令牌，验收、准生产需由质量经理签发服务注册令牌，生产由维护经理签发
-
-#eureka:
-#  instance:
-#    #服务之间,运行以ip地址的形式找到对方,默认是application.name的形式寻找对方的.
-#    prefer-ip-address: true
-#    # 实例ID 区分同一服务中不同实例的唯一标识
-#    instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
-#    #实例的名称
-#    hostname: ${spring.cloud.client.ip-address}
-#    #实例状态页相对url
-#    statusPageUrlPath: /swagger-ui.html #${management.contextPath:}/info
-#    healthCheckUrlPath: ${management.contextPath:}/health
-#  client:
-#    register-with-eureka: false #是否向注册中心注册自己
-#    fetchRegistry: true #是否从注册中心抓取已有的注册信息 默认true，集群必须设置为true
-#    authToken: ${register.token}
-#    serviceUrl:
-#      defaultZone: ${register.url}
+tieta:
+  checkToken:
+    syscode: CHNTRMS2
+
+server:
+  port: 8089
+
+tlog:
+  enable-invoke-time-print: true