1111

.gitignore

@@ -0,0 +1,158 @@
+## .gitignore for Grails 1.2 and 1.3
+
+# .gitignore for maven
+target/
+*.releaseBackup
+
+# web application files
+#/web-app/WEB-INF
+
+# IDE support files
+/.classpath
+/.launch
+/.project
+/.settings
+/*.launch
+/*.tmproj
+/ivy*
+/eclipse
+
+# default HSQL database files for production mode
+/prodDb.*
+
+# general HSQL database files
+*Db.properties
+*Db.script
+
+# logs
+/stacktrace.log
+/test/reports
+/logs
+*.log
+*.log.*
+
+# project release file
+/*.war
+
+# plugin release file
+/*.zip
+/*.zip.sha1
+
+# older plugin install locations
+/plugins
+/web-app/plugins
+/web-app/WEB-INF/classes
+
+# "temporary" build files
+target/
+out/
+build/
+
+# other
+*.iws
+
+#.gitignore for java
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+## .gitignore for eclipse
+
+*.pydevproject
+.project
+.metadata
+bin/**
+tmp/**
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+## .gitignore for intellij
+
+*.iml
+*.ipr
+*.iws
+.idea/
+
+## .gitignore for linux
+.*
+!.gitignore
+!.gitattributes
+!.editorconfig
+!.eslintrc
+!.travis.yml
+*~
+
+## .gitignore for windows
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+## .gitignore for mac os x
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+## hack for graddle wrapper
+!wrapper/*.jar
+!**/wrapper/*.jar
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+gis_generate

720yun_fd_manage/gis_application/src/main/resources/application-locSit.yml

@@ -40,7 +40,7 @@ spring:
             test-on-return: false
             test-while-idle: true
             time-between-eviction-runs-millis: 60000
-            url: jdbc:mysql://120.25.146.52:13306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+            url: jdbc:mysql://120.25.146.52:13306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
             username: root
             validation-query: SELECT 1 FROM DUAL
             web-stat-filter:

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/BathSaveWorkExplanationDto.java

@@ -0,0 +1,13 @@
+package com.gis.domain.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class BathSaveWorkExplanationDto extends WorkIdDto{
+
+    List<WorkExplanationDto> list;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkExplanationDto.java

@@ -0,0 +1,63 @@
+package com.gis.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 作品场景讲解
+ * </p>
+ *
+ * @author
+ * @since 2024-04-22
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkExplanationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 场景id
+     */
+    private Long navigationId;
+
+    /**
+     * 是否默认开启
+     */
+    private Boolean openByDefault;
+
+    /**
+     * 文件url
+     */
+    private String audioUrl;
+
+    /**
+     * 文件名
+     */
+    private String audioName;
+
+    /**
+     * 素材id
+     */
+    private Long fodderId;
+
+    /**
+     * 循环播放
+     */
+    private Boolean playRepeat;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkIdDto.java

@@ -11,9 +11,9 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class WorkIdDto {
 
-    @NotBlank(message = "id不能为空")
-    @ApiModelProperty(value = "id" ,required = true)
-    private String id;
+    @NotBlank(message = "workId不能为空")
+    @ApiModelProperty(value = "workId" ,required = true)
+    private String workId;
 
 
 

720yun_fd_manage/gis_generate/src/main/java/com/gis/generate/AutoGenerate.java

@@ -20,7 +20,7 @@ public class AutoGenerate {
         System.out.println(path);
 
         generate(path,"", getTables(new String[]{
-                "tb_work_visual_angle"
+                "tb_work_explanation"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/ScenePanoMapper.java

@@ -1,5 +1,6 @@
 package com.gis.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.gis.domain.entity.ScenePanoEntity;
 
@@ -10,5 +11,5 @@ import com.gis.domain.entity.ScenePanoEntity;
 * @since 2024-04-03 18:01
 */
 @Mapper
-public interface ScenePanoMapper extends IBaseMapper<ScenePanoEntity,Long> {
+public interface ScenePanoMapper extends BaseMapper<ScenePanoEntity> {
 }

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/WorkExplanationMapper.java

@@ -0,0 +1,18 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.entity.WorkExplanation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 作品场景讲解 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-04-22
+ */
+@Mapper
+public interface WorkExplanationMapper extends BaseMapper<WorkExplanation> {
+
+}

720yun_fd_manage/gis_service/src/main/java/com/gis/service/ScenePanoService.java

@@ -1,5 +1,6 @@
 package com.gis.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.domain.entity.ScenePanoEntity;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  * @author Xiewj
  * @since 2024-04-03 18:01
  */
-public interface ScenePanoService extends IBaseService<ScenePanoEntity,Long> {
+public interface ScenePanoService extends IService<ScenePanoEntity> {
     ScenePanoEntity findByWorkIdAndName(String workId, String imgName);
     List<ScenePanoEntity> findByWorkId(String workId);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.common.config.RabbitConfig;
 import com.gis.common.constant.CmdConstant;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.ErrorEnum;
@@ -39,6 +38,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -53,7 +53,7 @@ import java.util.*;
 @Transactional
 public class FodderServiceImpl extends ServiceImpl<FodderMapper,FodderEntity> implements FodderService {
 
-    @Autowired
+    @Resource
     FodderMapper entityMapper;
 
     @Autowired

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/ScenePanoServiceImpl.java

@@ -1,9 +1,10 @@
 package com.gis.service.impl;
 
-import com.gis.mapper.IBaseMapper;
-import com.gis.service.ScenePanoService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.domain.entity.ScenePanoEntity;
 import com.gis.mapper.ScenePanoMapper;
+import com.gis.service.ScenePanoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,26 +17,17 @@ import java.util.List;
  * @since 2024-04-03 18:01
  */
 @Service
-public class ScenePanoServiceImpl extends IBaseServiceImpl<ScenePanoEntity, Long> implements ScenePanoService {
+public class ScenePanoServiceImpl extends ServiceImpl<ScenePanoMapper, ScenePanoEntity> implements ScenePanoService {
     @Autowired
 
     private ScenePanoMapper scenePanoMapper;
     @Override
-    public IBaseMapper<ScenePanoEntity, Long> getBaseMapper() {
-        return this.scenePanoMapper;
-    }
-    @Override
     public ScenePanoEntity findByWorkIdAndName(String workId, String imgName) {
-        ScenePanoEntity one=new ScenePanoEntity();
-        one.setWorkId(workId);
-        one.setName(imgName);
-        return getBaseMapper().selectOne(one);
+        return this.getOne(new LambdaQueryWrapper<ScenePanoEntity>().eq(ScenePanoEntity::getWorkId, workId).eq(ScenePanoEntity::getName, imgName));
     }
 
     @Override
     public List<ScenePanoEntity> findByWorkId(String workId) {
-        ScenePanoEntity one=new ScenePanoEntity();
-        one.setWorkId(workId);
-        return getBaseMapper().select(one);
+        return this.list(new LambdaQueryWrapper<ScenePanoEntity>().eq(ScenePanoEntity::getWorkId, workId));
     }
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -116,13 +116,8 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
     ScenePanoService scenePanoService;
     @Autowired
     RabbitMqProducerUtil rabbitMqProducer;
-    @Value("${queue.relics-update-name-queue}")
+    @Value("${queue.relics-update-name-queue:#{null}}")
     String relicsUpdateNameQueue;
-    @Override
-    public IBaseStrMapper<WorkEntity, String> getBaseMapper() {
-        return this.entityMapper;
-    }
-
 
     @Override
     public Result search(AgePageDto param, boolean isAdmin) {
@@ -451,11 +446,11 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        String userNameForToken = getUserNameForToken();
+        String userNameForToken = null;//getUserNameForToken();
         if (!userNameForToken.equals(entity.getUserId())&&ObjectUtil.isEmpty(entity.getNum())) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
         } else if (ObjectUtil.isNotEmpty(entity.getType())&&entity.getType().equalsIgnoreCase("pro")){
-            JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
+            JSONObject cameraList =fdkkClient.getCameraListByToken(null,"3,4,5");
             List<String> snCodes = new ArrayList<>();
             if (cameraList.getInteger("code") == 0) {
                 JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
@@ -1328,7 +1323,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
     @Override
     public Result<WorkEntity> searchSceneWorkList(AgePageDto param) {
-        String token = getToken();
+        String token = null;//getToken();
         JSONObject cameraList =fdkkClient.getCameraListByToken(token,"3,4,5");
         List<String> snCodes = new ArrayList<>();
         if (cameraList.getInteger("code") == 0) {
@@ -1339,7 +1334,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
         } else {
             return Result.failure("获取四维用户激光数据失败");
         }
-        startPage(param);
+        //startPage(param);
         param.setSnCodes(snCodes);
         List<WorkEntity> search = entityMapper.search(param, "");
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -167,7 +167,7 @@ public class WebController extends BaseController {
     @ApiOperation(value = "混合查下场景码或者作品id" , position = 4)
     @PostMapping("getIdInfo")
     public Result getIdInfo(@RequestBody WorkIdDto workIdDto) {
-        WorkEntity workEntity=workService.findByIdOrNum(workIdDto.getId());
+        WorkEntity workEntity=workService.findByIdOrNum(workIdDto.getWorkId());
         WorkIdVO workIdVO=new WorkIdVO();
         BeanUtil.copyProperties(workEntity,workIdVO);
         return Result.success(workIdVO);

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkEditVisualAngleBaseController.java

@@ -18,15 +18,13 @@ import javax.validation.Valid;
 @Api(tags = "作品编辑-视角")
 @RestController
 @RequestMapping("/work/edit/visual")
-public class WorkEditVisualAngleBaseController {
+public class WorkEditVisualAngleController {
 
     @Autowired
     private WorkBaseSettingService workBaseSettingService;
-    @Autowired
-    private WorkNavigationSettingService workNavigationSettingService;
 
     @Transactional(rollbackFor = Exception.class)
-    @ApiOperation(value = "保存基础设置", position = 1)
+    @ApiOperation(value = "保存", position = 1)
     @PostMapping("/save")
     public Result save(@RequestBody @Valid WorkBaseSettingDto dto){
         return  Result.success(workBaseSettingService.save(dto));