111

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

@@ -3,6 +3,7 @@ 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.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -15,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @MapperScan("com.fdkankan.**.mapper")
 @ForestScan("com.fdkankan.scene.httpclient")
-public class SceneApplication {
+public class SceneApplication implements CommandLineRunner {
 
     static {
         AspectLogEnhance.enhance();
@@ -24,4 +25,11 @@ public class SceneApplication {
     public static void main(String[] args) {
         SpringApplication.run(SceneApplication.class, args);
     }
+
+    @Override
+    public void run(String... args) throws Exception {
+
+
+
+    }
 }

src/main/java/com/fdkankan/scene/Interceptor/InitEditInfoAspect.java

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.Interceptor;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -48,6 +49,8 @@ public class InitEditInfoAspect {
 	private SceneEditControlsService sceneEditControlsService;
 	@Autowired
 	private SceneFileMappingService sceneFileMappingService;
+	@Autowired
+	private SceneConvertLogService sceneConvertLogService;
 
 	@Pointcut("@annotation(com.fdkankan.scene.annotation.InitEditInfo)")
 	public void InitEditInfo() {
@@ -96,6 +99,10 @@ public class InitEditInfoAspect {
 			scene = scenes.get(0);
 		}
 
+		if(StrUtil.isEmpty(scene.getStationcode())){
+
+		}
+
 		SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scene.getId());
 		if(Objects.isNull(sceneEditInfo)){
 			sceneEditInfo = new SceneEditInfo();

src/main/java/com/fdkankan/scene/Interceptor/ViewLogAspect.java

@@ -100,12 +100,12 @@ public class ViewLogAspect {
 			throw new BusinessException(4000, "4A鉴权失败:" + dataObj.getString("ERRDESC"));
 		}
 		String USERCODE = dataObj.getString("USERCODE");
-		String SERVICEID = dataObj.getString("SERVICEID");
+//		String SERVICEID = dataObj.getString("SERVICEID");
 		String ORGCODE = dataObj.getString("ORGCODE");
 
 		//查询用户信息
 		JSONObject param2 = new JSONObject();
-		param2.put("SERVICEID", SERVICEID);
+		param2.put("SERVICEID", syscode);
 		param2.put("LOGINACCOUNT", USERCODE);
 		param2.put("TOKEN", token);
 		encode = ThreeDESUtil.encode(JSON.toJSONString(param2), gatewayKey);
@@ -126,7 +126,7 @@ public class ViewLogAspect {
 		String nickName = dataObj.getString("LOGINNAME");
 
 		JSONObject param3 = new JSONObject();
-		param3.put("SERVICEID", SERVICEID);
+		param3.put("SERVICEID", syscode);
 		param3.put("QUERYMODE", "3");
 		param3.put("ORGCODE", ORGCODE);
 		param3.put("TOKEN", token);

src/main/java/com/fdkankan/scene/entity/Scene.java

@@ -59,6 +59,9 @@ public class Scene extends Model<Scene> {
     @TableField("SUBGROUP")
     private Integer subgroup;
 
+    @TableField("STATIONCODE")
+    private String stationcode;
+
 
     @Override
     public Serializable pkVal() {

src/main/java/com/fdkankan/scene/entity/SceneConvertLog.java

@@ -0,0 +1,71 @@
+package com.fdkankan.scene.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author
+ * @since 2024-12-10
+ */
+@Getter
+@Setter
+@TableName("t_scene_convert_log")
+public class SceneConvertLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 站址编码
+     */
+    @TableField("station_code")
+    private String stationCode;
+
+    /**
+     * 机房实体id
+     */
+    @TableField("entity_id")
+    private String entityId;
+
+    /**
+     * 转换状态，0-失败，1-成功
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 耗时
+     */
+    @TableField("time_consuming")
+    private Integer timeConsuming;
+
+
+}

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

@@ -21,7 +21,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"scene.generator", getTables(new String[]{
-                "system_secret"
+                "t_scene_convert_log"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -49,9 +49,9 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        DataSourceConfig.Builder datasourceConfig = new DataSourceConfig.Builder("jdbc:postgresql://10.180.145.98:5432/chinatower_3d",
+        DataSourceConfig.Builder datasourceConfig = new DataSourceConfig.Builder("jdbc:postgresql://10.180.145.98:5432/chinatower_vr",
                 "res_vr", "qawsed@123.");
-        datasourceConfig.schema("chinatower_3d");
+        datasourceConfig.schema("res_vr");
         FastAutoGenerator.create(datasourceConfig)
                 .globalConfig(builder -> {
                     builder.author("")               //作者
@@ -75,7 +75,7 @@ public class AutoGenerate {
                 })
                 .strategyConfig(builder -> {
                     builder.addInclude(tables)
-//                            .addTablePrefix("t_")
+                            .addTablePrefix("t_")
 
                             .serviceBuilder()
                             .formatServiceFileName("%sService")

src/main/java/com/fdkankan/scene/mapper/SceneConvertLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.scene.entity.SceneConvertLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-12-10
+ */
+@Mapper
+public interface SceneConvertLogMapper extends BaseMapper<SceneConvertLog> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.scene.entity.SceneConvertLog;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-12-10
+ */
+public interface SceneConvertLogService extends IService<SceneConvertLog> {
+
+
+
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.scene.entity.SceneConvertLog;
+import com.fdkankan.scene.mapper.SceneConvertLogMapper;
+import com.fdkankan.scene.service.SceneConvertLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-12-10
+ */
+@Service
+public class SceneConvertLogServiceImpl extends ServiceImpl<SceneConvertLogMapper, SceneConvertLog> implements SceneConvertLogService {
+
+}

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

@@ -411,24 +411,24 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
         if(Objects.isNull(param.getSubgroup())){
             param.setSubgroup(0);
         }
+        SceneInfoVO sceneInfo = null;
         switch (sceneInfoReqType){
             //如果是编辑页面请求，查数据库
             case EDIT:
-                SceneInfoVO sceneInfo4Edit = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
+                sceneInfo = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
                 //俊波要求这两个字段编辑页一定是1
-                sceneInfo4Edit.getControls().setShowDollhouse(CommonStatus.YES.code());
-                sceneInfo4Edit.getControls().setShowFloorplan(CommonStatus.YES.code());
-                return sceneInfo4Edit;
+                sceneInfo.getControls().setShowDollhouse(CommonStatus.YES.code());
+                sceneInfo.getControls().setShowFloorplan(CommonStatus.YES.code());
             //如果是查看页面请求，查redis
             case VIEW:
-                SceneInfoVO sceneInfo = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
+                sceneInfo = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
                 sceneInfo.setScenePassword(null);
                 //俊波要求这两个字段查看页一定是0
                 sceneInfo.getControls().setShowDollhouse(CommonStatus.NO.code());
                 sceneInfo.getControls().setShowFloorplan(CommonStatus.NO.code());
-                return sceneInfo;
         }
-        return null;
+
+        return sceneInfo;
     }
 
     /**

src/main/resources/mapper/scene.generator/SceneEditControlsMapper.xml

@@ -1,5 +0,0 @@
-<?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.SceneEditControlsMapper">
-
-</mapper>

src/main/resources/mapper/scene.generator/SceneEditInfoExtMapper.xml

@@ -1,5 +0,0 @@
-<?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.SceneEditInfoExtMapper">
-
-</mapper>

src/main/resources/mapper/scene.generator/SceneEditInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.SceneEditInfoMapper">
-
-</mapper>

src/main/resources/mapper/scene.generator/SystemSecretMapper.xml

@@ -1,5 +0,0 @@
-<?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.generator.mapper.SystemSecretMapper">
-
-</mapper>