mvn

720yun_fd_consumer/gis_consumer/pom.xml

@@ -16,10 +16,20 @@
 
         <dependency>
             <groupId>com.gis</groupId>
-            <artifactId>gis_consumer_oss</artifactId>
-            <!--<version>1.1.1</version>-->
+            <artifactId>gis_domain</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_mapper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_oss</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/config/MyBatisPlusConfig.java

@@ -1,48 +0,0 @@
-package com.gis.config;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@Configuration
-@EnableTransactionManagement
-@MapperScan({"com.gis.mapper"})
-public class MyBatisPlusConfig {
-    /*
-     * 分页插件，自动识别数据库类型
-     * 多租户，请参考官网【插件扩展】
-     */
-    /**
-     * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题
-     */
-
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        //向Mybatis过滤器链中添加分页拦截器
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-        //还可以添加其他的拦截器
-        // 阻断插件
-        interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
-        return interceptor;
-    }
-    @Bean
-    ConfigurationCustomizer mybatisConfigurationCustomizer() {
-        return configuration -> configuration.addInterceptor(new com.github.pagehelper.PageInterceptor());
-    }
-
-    /**
-     * 如果是对全表的删除或更新操作，就会终止该操作
-     * https://baomidou.com/guide/interceptor-block-attack.html
-     */
-    public BlockAttackInnerInterceptor blockAttackInnerInterceptor()
-    {
-        return new BlockAttackInnerInterceptor();
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/constant/CmdConstant.java

@@ -1,36 +0,0 @@
-package com.gis.constant;
-
-
-/**
- * Created by owen on 2020/12/31 0031 14:22
- *
- */
-public class CmdConstant {
-
-
-    /**
-     * krpano 全景矢量切图
-     *
-     * yes y | 出现提醒，强制执行
-     * */
-    public final static String PANO_KRPANO = "krpanotools makepano -config=templates/vtour-multires.config ";
-
-    /**
-     * ossUtil上传目录
-     * ./ossutil cp -r localfolder/ oss://examplebucket/desfolder/
-     * opt/ossutil/ossutil64 cp -r /root/owen/720yun/vtour/ oss://oss-xiaoan/720yun_fd_manage/
-     *
-     */
-//    public final static String OSSUTIL_UPLOAD_DIR = "/opt/ossutil/ossutil64 cp -r /mnt/720yun_fd_manage_data/@sceneCode oss://oss-xiaoan/720yun_fd_manage/@sceneCode";
-
-    /**
-     * 用脚本的好处会自动结束线程， java直接跑命令容易出问题
-     * 调用oss上传目录脚本
-     * bash /opt/ossutil/ossupload.sh @dir @ossDir
-     *  bash /opt/ossutil/ossupload.sh /mnt/720yun_fd_manage_data/fd720_1A4Tba8mA 720yun_fd_manage/fd720_1A4Tba8mA
-     */
-//    public final static String OSSUTIL_UPLOAD_DIR = "bash /opt/ossutil/ossupload.sh /mnt/720yun_fd_manage_data/@sceneCode 720yun_fd_manage/@sceneCode";
-//    public final static String OSSUTIL_UPLOAD_DIR = "bash /root/user/java/720yun_fd_consumer_8002/ossupload.sh /mnt/720yun_fd_manage_data/@sceneCode 720yun_fd_manage/@sceneCode";
-    public final static String OSSUTIL_UPLOAD_DIR = "bash /mnt/720yun_fd_manage_data/baseData/ossupload.sh /mnt/720yun_fd_manage_data/@sceneCode 720yun_fd_manage/@sceneCode";
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/constant/ConfigConstant.java

@@ -1,35 +0,0 @@
-package com.gis.constant;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by owen on 2020/12/31 0031 14:22
- *
- * 全局动态参数
- */
-@Component
-public class ConfigConstant {
-
-
-
-    /** 服务器文件地址*/
-    @Value("${server.file.path}")
-    public  String serverBasePath;
-
-    @Value("${project.name}")
-    public String projectName;
-
-    @Value("${config.bashPath}")
-    public  String ossBasePath;
-
-
-    /*********************** 其他参数 ***********************/
-
-    @Value("${domain.4dkk}")
-    public  String domain4dKK;
-
-    /**redis token前缀*/
-    @Value("${redis.token.prefix}")
-    public  String redisTokenPrefix;
-}

720yun_fd_consumer/gis_consumer_oss/src/main/java/com/gis/oss/constant/StorageType.java

@@ -1,4 +1,4 @@
-package com.gis.oss.constant;
+package com.gis.constant;
 
 public enum StorageType {
 

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/constant/SysConstants.java

@@ -2,7 +2,7 @@ package com.gis.constant;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjUtil;
-import com.gis.entity.MqEcs;
+import com.gis.domain.entity.MqEcs;
 import com.gis.service.IMqEcsService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/controller/TestController.java

@@ -1,6 +1,6 @@
 package com.gis.controller;
 
-import com.gis.util.Result;
+import com.gis.common.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/DoSliceDTO.java

@@ -1,11 +0,0 @@
-package com.gis.dto;
-import lombok.Data;
-
-/**
- * @author Xiewj
- * @date 2024/4/7
- */
-@Data
-public class DoSliceDTO {
-    private Long id;
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/InitWorkNavigationSceneDTO.java

@@ -1,39 +0,0 @@
-package com.gis.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * 作品导航表
- *
- * @author Xiewj
- * @since 2023-09-08 18:13
- */
-@Data
-public class InitWorkNavigationSceneDTO implements Serializable {
-
-    @NotBlank(message = "name不能为空")
-    @ApiModelProperty("名称")
-    private String name;
-
-    @ApiModelProperty("素材id，当type=pano时不能为空")
-    private Long fodderId;
-
-    @NotBlank(message = "type不能为空")
-    @ApiModelProperty("场景类型，pano-全景图，4dkk-官网场景")
-    private String type;
-
-    @NotBlank(message = "sceneCode不能为空")
-    @ApiModelProperty("场景码")
-    private String sceneCode;
-
-    @ApiModelProperty("官网场景版本")
-    private String version;
-
-    @ApiModelProperty("icon")
-    private String icon;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/RelicsSceneInitQueueDTO.java

@@ -1,55 +0,0 @@
-package com.gis.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Xiewj
- * @date 2024/4/3
- */
-@Data
-public class RelicsSceneInitQueueDTO {
-
-    private String sceneCode;
-
-    @ApiModelProperty(value = "判断是否为slam场景,深光和深时 以前的场景都是4" +
-            "typedef enum SceneLocation {\n" +
-            "    Scene_Location_Slam  = 0, //slam\n" +
-            "    Scene_Location_SFM 1 ,   //sfm\n" +
-            "    Scene_Location_SFMAI  2,     //SFM + AI\n" +
-            "    Scene_Location_MutiFloor 3 ,    //多楼层\n" +
-            "    Scene_Location_PointCloud 4,    //点云\n" +
-            "    Scene_Location_SLAMPoint 5,    //slam实时拍\n" +
-            "    Scene_Location_SLAMPointAndSFMAI  6   //slam实时拍+站点\n" +
-            "} SceneLocation;")
-    private Integer location;
-
-    @ApiModelProperty(value = "场景来源：相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光 5深光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景")
-    private Integer sceneSource;
-
-    @ApiModelProperty(value = "计算完成时间")
-    private Date algorithmTime;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    private String phoneNum;
-
-    private Integer userId;
-
-    private String snCode;
-
-    //0-计算中 1-计算成功  -1-计算失败
-    private int status;
-
-    private String sceneName;
-
-
-    @ApiModelProperty(value = "点位数量")
-    private Integer shootCount;
-
-    private int payStatus;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/WorkAddDto.java

@@ -1,25 +0,0 @@
-package com.gis.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-/**
- * Created by owen on 2021/2/22 0028 16:36
- */
-@Data
-public class WorkAddDto {
-
-//    @ApiModelProperty(value = "封面图")
-//    private String icon;
-//
-//    @ApiModelProperty(value = "场景密码")
-//    private String password;
-
-    @ApiModelProperty(value = "选中的素材")
-    @NotEmpty(message = "至少选择一个素材")
-    private List<InitWorkNavigationSceneDTO> sceneDTOList;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/WorkCustomMaskDto.java

@@ -1,43 +0,0 @@
-package com.gis.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 遮罩设置表
- *
- * @author Xiewj
- * @since 2023-09-06 14:37
- */
-@Data
-public class WorkCustomMaskDto {
-
-
-    @ApiModelProperty(value = "对象ID")
-    private Long id;
-
-    @ApiModelProperty("wordid")
-    private String workId;
-
-    @ApiModelProperty("素材id")
-    private Long fodderId;
-
-    @ApiModelProperty("导航id")
-    private Long navigationId;
-
-    @ApiModelProperty("图片地址	")
-    private String icon;
-
-    @ApiModelProperty("开关 默认false")
-    private Boolean isShow;
-
-    @ApiModelProperty("类型 earth sky")
-    private String type;
-
-    @ApiModelProperty("缩放")
-    private Double scale;
-
-    @ApiModelProperty("随着场景转动")
-    private Boolean antidistorted;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/WorkIdDto.java

@@ -1,21 +0,0 @@
-package com.gis.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * Created by Xiewj on  2024年4月18日14:09:13
- */
-@Data
-public class WorkIdDto {
-
-    @NotBlank(message = "workId不能为空")
-    @ApiModelProperty(value = "workId" ,required = true)
-    private String workId;
-
-
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/WorkMaskBatchSaveDTO.java

@@ -1,13 +0,0 @@
-package com.gis.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-@Data
-public class WorkMaskBatchSaveDTO extends WorkIdDto{
-
-    @NotEmpty(message = "数据不能为空")
-    List<WorkCustomMaskDto> list;
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/dto/WorkNavigationDTO.java

@@ -1,36 +0,0 @@
-package com.gis.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 作品导航表
- *
- * @author Xiewj
- * @since 2023-09-08 18:13
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class WorkNavigationDTO extends WorkIdDto implements Serializable {
-
-    @ApiModelProperty("id")
-    private Long id;
-
-    @ApiModelProperty("父菜单ID")
-    private Long parentId;
-
-    @ApiModelProperty("名称")
-    private String name;
-
-    @ApiModelProperty("排序")
-    private Integer sort;
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/BaseEntity.java

@@ -1,44 +0,0 @@
-package com.gis.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Date;
-
-@Data
-@MappedSuperclass
-public abstract class BaseEntity {
-
-    @Id
-    @TableId(value = "id", type = IdType.AUTO)
-    @Column(name = "id")
-    @ApiModelProperty(value = "对象ID")
-    private Long id;
-
-    @ApiModelProperty(value = "创建时间")
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    /**
-     * 用来批量操作的
-     * 0代表未删除 ， 1代表已经删除，默认写0
-     * 需要使用对象类型
-     */
-    @JsonIgnore
-    @TableLogic(value = "0",delval = "1")
-    private Integer isDelete;
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/BaseStrEntity.java

@@ -1,46 +0,0 @@
-package com.gis.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Date;
-
-@Data
-@MappedSuperclass
-public abstract class BaseStrEntity {
-
-    @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "对象ID")
-    private String id;
-
-    @ApiModelProperty(value = "创建时间")
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    /**
-     * 用来批量操作的
-     * 0代表未删除 ， 1代表已经删除，默认写0
-     * 需要使用对象类型
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableLogic(value = "0",delval = "1")
-    private Integer isDelete;
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/FodderEntity.java

@@ -1,55 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-@Data
-@Entity
-@TableName( "tb_fodder")
-public class FodderEntity extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = -1428200960867373738L;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "存放地址")
-    private String filePath;
-
-    @ApiModelProperty(value = "oss存放地址")
-    private String ossPath;
-
-    @ApiModelProperty(value = "状态 1：切图中， 2：失败， 3：完成")
-    private Integer status;
-
-    @ApiModelProperty(value = "类型, 全景图:pano， 图片：image, 音频：audio， 视频：video")
-    private String type;
-
-    @ApiModelProperty(value = "创建人")
-    private String userId;
-
-    @ApiModelProperty(value = "封面图")
-    private String icon;
-
-    @ApiModelProperty(value = "文件名")
-    private String fileName;
-
-    @ApiModelProperty(value = "文件大小，单位MB")
-    private String fileSize;
-
-    @ApiModelProperty(value = "场景码")
-    private String sceneCode;
-
-    @ApiModelProperty(value = "tour.xml")
-    private String tour;
-
-
-
-
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/ScenePanoEntity.java

@@ -1,63 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * 四维看看场景全景图表
- *
- * @author Xiewj
- * @since 2024-04-03 18:01
- */
-@Data
-@ApiModel("四维看看场景全景图表")
-@TableName( "tb_scene_pano")
-public class ScenePanoEntity extends BaseEntity implements Serializable  {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("wordid")
-    private String workId;
-
-    @ApiModelProperty("名称")
-    private String name;
-
-    @ApiModelProperty("服务器存放地址")
-    private String filePath;
-
-    @ApiModelProperty("oss存放地址")
-    private String ossPath;
-
-    @ApiModelProperty("状态")
-    private Integer status;
-
-    @ApiModelProperty("封面图")
-    private String icon;
-
-    @ApiModelProperty("文件名")
-    private String fileName;
-
-    @ApiModelProperty("场景码")
-    private String sceneCode;
-
-    @ApiModelProperty("文件大小，单位MB")
-    private String fileSize;
-
-    @ApiModelProperty("预览图（全景图使用）")
-    private String previewIcon;
-
-    @ApiModelProperty("tour.xml")
-    private String tour;
-
-    @ApiModelProperty("四维看看场景码")
-    private String num;
-
-    private String visid;
-    private String uuid;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkCoverTypeEntity.java

@@ -1,101 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 开场动画表
- *
- * @author Xiewj
- * @since 2023-09-05 19:21
- */
-@Data
-@ApiModel("开场封面表")
-@TableName( "tb_work_cover_type")
-public class WorkCoverTypeEntity extends BaseEntity implements Serializable {
-    @ApiModelProperty(value = "关联作品id")
-    private String workId;
-    private static final long serialVersionUID = 1L;
-    @ApiModelProperty("pc视频封面")
-    private String videoPcIcon;
-
-    @ApiModelProperty("pc视频地址")
-    private String videoPc;
-
-    @ApiModelProperty("移动视频地址")
-    private String videoMo;
-
-    @ApiModelProperty("移动视频封面")
-    private String videoMoIcon;
-
-    @ApiModelProperty("（center，full） PC端视频位置 默认center")
-    private String videoPcLoc;
-
-    @ApiModelProperty("（center，full） 移动端视频位置 默认center")
-    private String videoMoLoc;
-
-    @ApiModelProperty("（imgTile, colorFill）（图片填充或纯色） 视频背景显示方式 默认colorFill")
-    private String coverVideoBac;
-
-    @ApiModelProperty("视频填充背景图片")
-    private String videoBacImg;
-
-    @ApiModelProperty("（0/1） 视频3秒开关 默认:1")
-    private int coverVideoInWay;
-
-    @ApiModelProperty(" 原生视频开关  默认:0")
-    private int coverVideoControl;
-
-    @ApiModelProperty("(video,image,videoAndImg) 类型 默认 img ")
-    private String coverSelect;
-
-    @ApiModelProperty("（center，full） PC端位置 默认center")
-    private String coverPcLoc;
-
-    @ApiModelProperty("（before，later） 出现顺序 默认 before")
-    private String coverImageOrder;
-
-    @ApiModelProperty("移动封面地址")
-    private String coverMo;
-
-    @ApiModelProperty("pc封面地址")
-    private String coverPc;
-
-    @ApiModelProperty("（center，full） 移动端位置 默认center")
-    private String coverMoLoc;
-
-    @ApiModelProperty("（imgTile，colorFill） （图片填充或纯色）封面图片方式 默认colorFill")
-    private String coverImgBac;
-
-    @ApiModelProperty("封面背景填充颜色 默认#000000")
-    private String imgColorSelec;
-
-    @ApiModelProperty("（0/1）图片3秒开关 默认1")
-    private int coverImageInWay;
-
-    @ApiModelProperty("是否显示开关 默认 0")
-    private int isShowCover;
-
-    @ApiModelProperty("视频背景填充颜色 默认#000000")
-    private String videoColorSelec;
-
-    @ApiModelProperty("关联fodderId")
-    private Integer videoMoId;
-    @ApiModelProperty("关联fodderId")
-    private Integer coverMoId;
-
-    @ApiModelProperty("关联fodderId")
-    private Integer videoPcId;
-
-    @ApiModelProperty("关联fodderId")
-    private Integer coverPcId;
-
-    @ApiModelProperty("关联fodderId")
-    private Integer coverBacId;
-    @ApiModelProperty("封面背景图片")
-    private String coverBac;
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkCustomButtonEntity.java

@@ -1,41 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 自定义按钮设置表
- *
- * @author Xiewj
- * @since 2023-09-06 14:50
- */
-@Data
-@ApiModel("自定义按钮设置表")
-@TableName( "tb_work_custom_button")
-public class WorkCustomButtonEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty("wordid")
-    private String workId;
-
-    @ApiModelProperty("开关 默认false")
-    private Integer isShow;
-
-    @ApiModelProperty("名称 电话 链接	")
-    private String name;
-
-    @ApiModelProperty("_self _blank 默认_self	")
-    private String openMethod;
-
-    @ApiModelProperty("value	")
-    private String value;
-
-    @ApiModelProperty("phone link	")
-    private String type;
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkCustomMaskEntity.java

@@ -1,48 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 遮罩设置表
- *
- * @author Xiewj
- * @since 2023-09-06 14:37
- */
-@Data
-@ApiModel("遮罩设置表")
-@TableName( "tb_work_custom_mask")
-public class WorkCustomMaskEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty("wordid")
-    private String workId;
-
-    @ApiModelProperty("navigation_id")
-    private Long navigationId;
-
-    @ApiModelProperty("素材id")
-    private Long fodderId;
-
-    @ApiModelProperty("图片地址")
-    private String icon;
-
-    @ApiModelProperty("开关 默认false")
-    private Boolean isShow;
-
-    @ApiModelProperty("类型 earth sky")
-    private String type;
-
-    @ApiModelProperty("随着场景转动")
-    private Boolean antidistorted;
-
-    @ApiModelProperty("缩放")
-    private Double scale;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkEntity.java

@@ -1,90 +0,0 @@
-package com.gis.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 作品表
- */
-@Data
-@Entity
-@TableName("tb_work")
-public class WorkEntity extends BaseStrEntity implements Serializable {
-
-    private static final long serialVersionUID = 6827754544317282072L;
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "简介")
-    private String description;
-
-    @ApiModelProperty(value = "状态, 0:默认不显示， 1：显示")
-    private Integer status;
-
-    @ApiModelProperty(value = "创建人")
-    private String userId;
-
-    @ApiModelProperty(value = "封面图")
-    private String icon;
-
-    @ApiModelProperty(value = "访问量")
-    private Integer visit;
-
-    @JSONField(serialize = false)
-    @ApiModelProperty(value = "作品密码， 默认0：不需要密码")
-    private String password;
-
-
-    @ApiModelProperty(value = "二维码")
-    private String qrCode;
-
-    @ApiModelProperty(value = "分享地址（二维码扫描后地址）")
-    private String share;
-
-    @ApiModelProperty(value = "是否有密码，0：没有， 1：有")
-    private Integer isPassword;
-
-    /** 用来关联删除素材时使用*/
-    @ApiModelProperty(value = "场景码")
-    private String sceneCodes;
-
-    @ApiModelProperty(value = "作品类型：pano:全是全景图 | 4dkk: 全是四维看看 ： mix：混合(pano+4dkk), 通过sceneCodes判断")
-    private String type;
-
-    //计算状态
-    @ApiModelProperty(value = "计算状态：0-计算中 1-计算成功  -1-计算失败")
-    private Integer calcStatus;
-
-    @ApiModelProperty(value = "四维看看场景码")
-    private String num;
-
-    @ApiModelProperty(value = "相机编码")
-    private String snCode;
-
-
-    private Integer location;
-
-
-    @ApiModelProperty(value = "场景来源：相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光 5深光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景")
-    private Integer sceneSource;
-
-    @ApiModelProperty(value = "计算完成时间")
-    private Date algorithmTime;
-
-    @ApiModelProperty(value = "拍摄时间")
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private Date shootTime;
-
-    @ApiModelProperty(value = "0表示未付款，1表示付款了，-1表示欠费（八目场景指锁住），-2表示临时空间（八目场景）", name = "payStatus")
-    private Integer payStatus;
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkLogoEntity.java

@@ -1,37 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * logo表
- *
- * @author Xiewj
- * @since 2023-09-06 10:21
- */
-@Data
-@ApiModel("logo表")
-@TableName( "tb_work_logo")
-public class WorkLogoEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "关联作品id")
-    private String workId;
-
-    @ApiModelProperty("wordid")
-    private String logo;
-
-    @ApiModelProperty("开关 默认1")
-    private Integer isLogo;
-
-    @ApiModelProperty(" 默认false")
-    private Boolean logoChange;
-
-    @ApiModelProperty(" logoId")
-    private Long logoId;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkNavigationEntity.java

@@ -1,49 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 作品导航表
- *
- * @author Xiewj
- * @since 2023-09-08 18:13
- */
-@Data
-@ApiModel("作品导航表")
-@TableName("tb_work_navigation")
-public class WorkNavigationEntity extends BaseEntity  implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("wordid")
-    private String workId;
-
-    @ApiModelProperty("父菜单ID")
-    private Long parentId;
-
-    @ApiModelProperty("名称")
-    private String name;
-
-    @ApiModelProperty("素材id")
-    private Long fodderId;
-
-    @ApiModelProperty("是否初始场景")
-    private Integer isFirstScene;
-
-    private String type;
-
-    private String sceneCode;
-
-    private String icon;
-
-    private String version;
-
-    private Integer sort;
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkNavigationVo.java

@@ -1,45 +0,0 @@
-package com.gis.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 作品导航表
- *
- * @author Xiewj
- * @since 2023-09-08 18:13
- */
-
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
-@ApiModel("作品导航表")
-public class WorkNavigationVo implements Serializable {
-
-
-    @ApiModelProperty(value = "对象ID")
-    private Long id;
-
-    @ApiModelProperty("wordid")
-    private String workId;
-
-    @ApiModelProperty("父菜单ID")
-    private Long parentId;
-
-    @ApiModelProperty("名称")
-    private String name;
-
-    private String type;
-
-    private String icon;
-
-    private String sceneCode;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkOpeningAnimationEntity.java

@@ -1,32 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 开场动画表
- *
- * @author Xiewj
- * @since 2023-09-05 19:21
- */
-@Data
-@ApiModel("开场动画表")
-@TableName( "tb_work_opening_animation")
-public class WorkOpeningAnimationEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("显示开场动画按钮 默认 true ")
-    private Integer openingAnimationType;
-
-    @ApiModelProperty("小行星开场:1,小行星巡游开场 :2,小行星缩放开场:3,水平巡游开场:4,水晶球开场:5 默认1")
-    private Boolean isShowOpeningAnimation;
-
-    @ApiModelProperty(value = "关联作品id")
-    private String workId;
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkOpeningTipEntity.java

@@ -1,54 +0,0 @@
-package com.gis.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Entity;
-import java.io.Serializable;
-
-/**
- * 作品表
- */
-@Data
-@Entity
-@TableName( "tb_work_opening_tip")
-public class WorkOpeningTipEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 6827754544317282072L;
-
-//  "pcIcon：PC端
-//    pcIconId：PC素材ID OpeningTip
-//    appIcon：移动端
-//    appIconId:移动端素材ID
-//    isRemind：仅首次打开链接时，提示
-//    remindTime: 显示秒数 （0-3）"
-
-
-//    "remindTime 默认1
-//    isRemind:1"
-
-    @ApiModelProperty(value = "关联作品id")
-    private String workId;
-
-    @ApiModelProperty(value = "PC端 icon")
-    private String pcIcon;
-
-    @ApiModelProperty(value = "PC端 iconId")
-    private String pcIconId;
-
-    @ApiModelProperty(value = "PC端 appIcon")
-    private String appIcon;
-
-    @ApiModelProperty(value = "PC端 appIconId")
-    private String appIconId;
-
-    @ApiModelProperty(value = "仅首次打开链接时，提示  默认1 ")
-    private Integer isRemind;
-
-    @ApiModelProperty(value = "显示秒数 （0-3） 默认 1")
-    private Integer remindTime;
-
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/handler/MyMetaObjectHandler.java

@@ -1,32 +0,0 @@
-package com.gis.handler;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-/**
- * @description: 处理createTime，updateTime字段的插入和更新
- * @author: Xiewj
- * @date: 2021-08-16 15:32:55
- **/
-@Slf4j
-@Component
-public class MyMetaObjectHandler implements MetaObjectHandler {
-
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        // 起始版本 3.3.3(推荐)
-        this.strictInsertFill(metaObject, "createTime", () -> new Date(), Date.class);
-
-    }
-
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        // 起始版本 3.3.3(推荐)
-        this.setFieldValByName("updateTime", new Date(), metaObject);
-        this.strictUpdateFill(metaObject, "updateTime", () ->new Date(), Date.class);
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/SceneMigrateListener.java

@@ -5,7 +5,7 @@
 //import com.alibaba.fastjson.JSON;
 //import com.alibaba.fastjson.JSONObject;
 //import com.gis.constant.ConfigConstant;
-//import com.gis.dto.OpenSceneMigrateDto;
+//import com.gis.domain.dto.OpenSceneMigrateDto;
 //import com.gis.entity.WorkEntity;
 //import com.gis.mq.RabbitMqProducerUtil;
 //import com.gis.oss.util.FileAndOssUtil;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/ScenePayStatusListener.java

@@ -3,7 +3,7 @@
 //import cn.hutool.core.util.ArrayUtil;
 //import cn.hutool.core.util.ObjectUtil;
 //import com.alibaba.fastjson.JSONObject;
-//import com.gis.dto.SceneQueueDTO;
+//import com.gis.domain.dto.SceneQueueDTO;
 //import com.gis.entity.WorkEntity;
 //import com.gis.service.WorkService;
 //import com.rabbitmq.client.Channel;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/container/DoSliceQueueListener.java

@@ -1,12 +1,11 @@
 package com.gis.listener.container;
 import com.alibaba.fastjson.JSONObject;
-import com.gis.dto.DoSliceDTO;
+import com.gis.domain.dto.DoSliceDTO;
 import com.gis.service.FodderService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import com.rabbitmq.client.Channel;
 import org.springframework.amqp.core.Message;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/container/PanoMigrateSceneQueueListener.java

@@ -4,16 +4,10 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.gis.constant.ConfigConstant;
-import com.gis.dto.DoSliceDTO;
-import com.gis.dto.OpenSceneMigrateDto;
-import com.gis.entity.WorkEntity;
-import com.gis.mq.RabbitMqProducerUtil;
-import com.gis.oss.util.FileAndOssUtil;
+import com.gis.domain.entity.WorkEntity;
+import com.gis.domain.dto.OpenSceneMigrateDto;
 import com.gis.service.FodderService;
-import com.gis.service.ScenePanoService;
 import com.gis.service.WorkService;
-import com.gis.util.QrCodeUtils;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/container/PanoPayStatusSceneQueueListener.java

@@ -3,8 +3,8 @@ package com.gis.listener.container;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.gis.dto.SceneQueueDTO;
-import com.gis.entity.WorkEntity;
+import com.gis.domain.entity.WorkEntity;
+import com.gis.domain.dto.SceneQueueDTO;
 import com.gis.service.FodderService;
 import com.gis.service.WorkService;
 import com.rabbitmq.client.Channel;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/container/SceneQueueListener.java

@@ -1,28 +1,17 @@
 package com.gis.listener.container;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.filestorage.FileStorageTemplate;
-import com.gis.constant.CmdConstant;
-import com.gis.constant.ConfigConstant;
-import com.gis.dto.RelicsSceneInitQueueDTO;
-import com.gis.dto.SceneQueueDTO;
-import com.gis.dto.WorkAddDto;
-import com.gis.dto.WorkNavigationDTO;
-import com.gis.entity.*;
-import com.gis.exception.BaseRuntimeException;
-import com.gis.mq.RabbitMqProducerUtil;
-import com.gis.oss.util.FileAndOssUtil;
-import com.gis.receiver.QueueNameService;
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.mq.RabbitMqProducerUtil;
+import com.gis.domain.dto.RelicsSceneInitQueueDTO;
+import com.gis.domain.entity.MqSendLog;
+import com.gis.domain.entity.WorkEntity;
+import com.gis.domain.dto.SceneQueueDTO;
+import com.gis.oss.util.QrCodeUtils;
 import com.gis.service.*;
-import com.gis.util.CmdUtils;
-import com.gis.util.QrCodeUtils;
-import com.gis.util.RandomUtils;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
@@ -34,15 +23,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @author Xiewj
@@ -56,8 +38,6 @@ public class SceneQueueListener implements ChannelAwareMessageListener {
     @Autowired
     WorkService workService;
     @Autowired
-    FileAndOssUtil fileAndOssUtil;
-    @Autowired
     ConfigConstant configConstant;
     @Autowired
     QrCodeUtils qrCodeUtils;
@@ -116,7 +96,7 @@ public class SceneQueueListener implements ChannelAwareMessageListener {
             WorkEntity workEntity=workService.findByNum(param.getSceneCode());
             if (ObjectUtil.isEmpty(workEntity)&&param.getStatus()==0){
                 //初始化创建work表数据
-                workService.entityAdd(param);
+                workService.entityAdd2(param);
                 sendStartMq(param);
                 channel.basicAck(deliveryTag, false);
             }if (ObjectUtil.isNotEmpty(workEntity)&&param.getStatus()!=1){

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/container/SceneWorkQueueListener.java

@@ -9,21 +9,22 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.filestorage.FileStorageTemplate;
-import com.gis.constant.CmdConstant;
-import com.gis.constant.ConfigConstant;
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.mq.RabbitMqProducerUtil;
+import com.gis.common.util.CmdUtils;
+import com.gis.common.util.RandomUtils;
+import com.gis.common.util.RedisUtil;
 import com.gis.constant.RedisKey;
 import com.gis.constant.SysConstants;
-import com.gis.dto.*;
-import com.gis.entity.*;
+import com.gis.domain.dto.*;
+import com.gis.domain.entity.*;
+import com.gis.domain.vo.WorkNavigationVo;
 import com.gis.exception.BaseRuntimeException;
-import com.gis.mq.RabbitMqProducerUtil;
+import com.gis.oss.constant.CmdConstant;
 import com.gis.oss.util.FileAndOssUtil;
+import com.gis.oss.util.QrCodeUtils;
 import com.gis.receiver.QueueNameService;
 import com.gis.service.*;
-import com.gis.util.CmdUtils;
-import com.gis.util.QrCodeUtils;
-import com.gis.util.RandomUtils;
-import com.gis.util.RedisUtil;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/FodderMapper.java

@@ -1,17 +0,0 @@
-package com.gis.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.FodderEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Component;
-
-
-@Component
-@Mapper
-public interface FodderMapper extends BaseMapper<FodderEntity> {
-
-    @Select("select * from tb_fodder where is_delete = 0 and id = #{id}")
-    FodderEntity findById(Long id);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/ScenePanoMapper.java

@@ -1,15 +0,0 @@
-package com.gis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.ScenePanoEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* 四维看看场景全景图表 Mapper
-*
-* @author Xiewj
-* @since 2024-04-03 18:01
-*/
-@Mapper
-public interface ScenePanoMapper extends BaseMapper<ScenePanoEntity> {
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkCoverTypeMapper.java

@@ -1,18 +0,0 @@
-package com.gis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkCoverTypeEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
-* 开场封面表 Mapper
-*
-* @author Xiewj
-* @since 2023-09-05 20:45
-*/
-@Component("WorkCoverTypeMapper")
-@Mapper
-public interface WorkCoverTypeMapper extends BaseMapper<WorkCoverTypeEntity> {
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkCustomButtonMapper.java

@@ -1,17 +0,0 @@
-package com.gis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkCustomButtonEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
-* 自定义按钮设置表 Mapper
-*
-* @author Xiewj
-* @since 2023-09-06 14:50
-*/
-@Component("WorkCustomButtonMapper")
-@Mapper
-public interface WorkCustomButtonMapper extends BaseMapper<WorkCustomButtonEntity> {
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkCustomMaskMapper.java

@@ -1,17 +0,0 @@
-package com.gis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkCustomMaskEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
-* 遮罩设置表 Mapper
-*
-* @author Xiewj
-* @since 2023-09-06 14:37
-*/
-@Component("WorkCustomMaskMapper")
-@Mapper
-public interface WorkCustomMaskMapper extends BaseMapper<WorkCustomMaskEntity> {
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkLogoMapper.java

@@ -1,17 +0,0 @@
-package com.gis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkLogoEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
-* logo表 Mapper
-*
-* @author Xiewj
-* @since 2023-09-06 10:21
-*/
-@Component("WorkLogoMapper")
-@Mapper
-public interface WorkLogoMapper extends BaseMapper<WorkLogoEntity> {
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkMapper.java

@@ -1,43 +0,0 @@
-package com.gis.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkEntity;
-import org.apache.ibatis.annotations.*;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-@Component
-@Mapper
-public interface WorkMapper extends BaseMapper<WorkEntity> {
-
-
-    @Update("UPDATE tb_work SET visit= visit + 1 where id = #{id}")
-    void addVisit(String id);
-
-    @Select("select id, name, scene_codes from tb_work where is_delete = 0 and user_id = #{userId} and scene_codes like #{sceneCode}")
-    List<WorkEntity> likeSceneCode(String sceneCode, String userId);
-    /**
-     * for update 锁表更新完，才能进行更新，需要开启事务
-     * 并发量大作会出现脏数据
-     *
-     * @param id
-     * @return
-     */
-    @Select("select id, name, scene_codes, user_id from tb_work where is_delete = 0 and id = #{id} for update")
-    WorkEntity findByIdForUpdate(String id);
-
-    /***
-     * 2022-3-18
-     * 真删除无效时数据
-     * @param now
-     */
-    @Delete("delete from tb_work where is_delete=0 and status=0 and DATE_FORMAT( create_time, '%Y%m' ) <= DATE_FORMAT(#{now} , '%Y%m' )")
-    void delByTime(String now);
-
-
-    @Select("select id from tb_work where is_delete=0 and status=#{status}")
-    List<String> getIdByStatus(int status);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkNavigationMapper.java

@@ -1,20 +0,0 @@
-package com.gis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkNavigationEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
-* 作品导航表 Mapper
-*
-* @author Xiewj
-* @since 2023-09-08 18:13
-*/
-@Component("WorkNavigationMapper")
-@Mapper
-public interface WorkNavigationMapper extends BaseMapper<WorkNavigationEntity> {
-
-//    List<WorkNavigationVo> selectList(@Param("dto") WorkNavigationDTO dto,@Param("workId")  String workId);
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkOpeningAnimationMapper.java

@@ -1,17 +0,0 @@
-package com.gis.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkOpeningAnimationEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
-* 开场动画表 Mapper
-*
-* @author Xiewj
-* @since 2023-09-05 19:21
-*/
-@Component("WorkOpeningAnimationMapper")
-@Mapper
-public interface WorkOpeningAnimationMapper extends BaseMapper<WorkOpeningAnimationEntity> {
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mapper/WorkOpeningTipMapper.java

@@ -1,20 +0,0 @@
-package com.gis.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.entity.WorkOpeningTipEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
- * @Entity generator.domain.TbWorkOpeningTip
- */
-@Component("WorkOpeningTipMapper")
-@Mapper
-public interface WorkOpeningTipMapper extends BaseMapper<WorkOpeningTipEntity> {
-
-}
-
-
-
-

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/mq/RabbitMqProducerUtil.java

@@ -1,81 +0,0 @@
-package com.gis.mq;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rabbitmq.client.AMQP.Queue.DeclareOk;
-import com.rabbitmq.client.Channel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.ChannelCallback;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.UUID;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/19
- **/
-@Component
-public class RabbitMqProducerUtil {
-
-    private Logger log = LoggerFactory.getLogger(this.getClass().getName());
-
-
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    /**
-     * 工作队列模式发送消息
-     * @param queue 队列名
-     * @param content 载荷
-     */
-    public void sendByWorkQueue(String queue, Object content){
-        String messageId = UUID.randomUUID().toString();
-        String jsonObject = JSONObject.toJSONString(content);
-        log.info("开始发送Mq消息，messageId:{},消息队列：{}，消息内容：{}",messageId, queue,jsonObject);
-        rabbitTemplate.convertAndSend(queue, jsonObject, message -> {
-            message.getMessageProperties().setMessageId(messageId);
-            return message;
-        }, new CorrelationData(messageId));
-    }
-
-    /**
-     * 工作队列模式发送带优先级消息
-     * @param queue 队列名
-     * @param content 载荷
-     * @param priority 优先级，正整数，值越大优先级越高，当值大于队列设置的最大优先级时，效果等同于最大优先级
-     */
-    public void sendByWorkQueue(String queue, Object content, Integer priority){
-        String messageId = UUID.randomUUID().toString();
-        String jsonObject = JSONObject.toJSONString(content);
-        log.info("开始发送Mq消息，messageId:{},消息队列：{}，消息内容：{}",messageId, queue, jsonObject);
-        rabbitTemplate.convertAndSend(queue, content, message -> {
-            message.getMessageProperties().setMessageId(messageId);
-            message.getMessageProperties().setPriority(priority);
-            return message;
-        }, new CorrelationData(messageId));
-    }
-
-    /**
-     * 获取队列未被消费的消息数量
-     * @return
-     */
-    public int getMessageCount(String queueName) {
-        DeclareOk declareOk = rabbitTemplate.execute(new ChannelCallback<DeclareOk>() {
-            public DeclareOk doInRabbit(Channel channel) throws Exception {
-                return channel.queueDeclarePassive(queueName);
-            }
-        });
-
-        return declareOk.getMessageCount();
-    }
-
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/receiver/QueueNameService.java

@@ -2,7 +2,7 @@ package com.gis.receiver;
 
 import cn.hutool.core.util.StrUtil;
 import com.gis.constant.SysConstants;
-import com.gis.entity.MqEcs;
+import com.gis.domain.entity.MqEcs;
 import com.gis.service.IMqEcsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/FodderService.java

@@ -1,12 +0,0 @@
-package com.gis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.FodderEntity;
-
-/**
- * Created by owen on 2022/7/27 0027 16:54
- */
-public interface FodderService extends IService<FodderEntity> {
-
-    void doSlice(Long param, String traceId);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/ScenePanoService.java

@@ -1,19 +0,0 @@
-package com.gis.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.ScenePanoEntity;
-
-import java.util.List;
-
-/**
- * 四维看看场景全景图表 服务类接口
- *
- * @author Xiewj
- * @since 2024-04-03 18:01
- */
-public interface ScenePanoService extends IService<ScenePanoEntity> {
-
-    ScenePanoEntity findByWorkIdAndName(String workId, String imgName);
-    List<ScenePanoEntity> findByWorkId(String workId);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkCoverTypeService.java

@@ -1,17 +0,0 @@
-package com.gis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.WorkCoverTypeEntity;
-
-/**
- * 开场封面表 服务类接口
- *
- * @author Xiewj
- * @since 2023-09-05 20:45
- */
-public interface WorkCoverTypeService extends IService<WorkCoverTypeEntity> {
-
-    WorkCoverTypeEntity getByWorkId(String workId);
-
-    void removeByWorkId(String workId);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkCustomButtonService.java

@@ -1,18 +0,0 @@
-package com.gis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.WorkCustomButtonEntity;
-
-import java.util.List;
-
-/**
- * 自定义按钮设置表 服务类接口
- *
- * @author Xiewj
- * @since 2023-09-06 14:50
- */
-public interface WorkCustomButtonService extends IService<WorkCustomButtonEntity> {
-
-    List<WorkCustomButtonEntity> listByWorkId(String workId);
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkCustomMaskService.java

@@ -1,23 +0,0 @@
-package com.gis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.dto.WorkMaskBatchSaveDTO;
-import com.gis.entity.WorkCustomMaskEntity;
-import com.gis.vo.WorkCustomMaskVO;
-
-import java.util.List;
-
-/**
- * 遮罩设置表 服务类接口
- *
- * @author Xiewj
- * @since 2023-09-06 14:37
- */
-public interface WorkCustomMaskService extends IService<WorkCustomMaskEntity> {
-
-    List<WorkCustomMaskVO> batchSave(WorkMaskBatchSaveDTO dto);
-
-    List<WorkCustomMaskEntity> listByWorkId(String workId);
-
-    void deleteByNavigationIds(List<Long> navigationIds);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkLogoService.java

@@ -1,17 +0,0 @@
-package com.gis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.WorkLogoEntity;
-
-/**
- * logo表 服务类接口
- *
- * @author Xiewj
- * @since 2023-09-06 10:21
- */
-public interface WorkLogoService extends IService<WorkLogoEntity> {
-
-    WorkLogoEntity getByWorkId(String workId);
-
-    void removeByWorkId(String workId);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkNavigationService.java

@@ -1,25 +0,0 @@
-package com.gis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.WorkNavigationEntity;
-
-import java.util.List;
-
-/**
- * 作品导航表 服务类接口
- *
- * @author Xiewj
- * @since 2023-09-08 18:13
- */
-public interface WorkNavigationService extends IService<WorkNavigationEntity> {
-    List<WorkNavigationEntity> selectByParentId(long parentId);
-
-    List<WorkNavigationEntity> selectScenes(String workId);
-
-    List<WorkNavigationEntity> selectByWorkId(String workId);
-
-    void reSetFistSceneByWorkId(String workId);
-
-    List<Long> getDeleteIdList(String workId, List<Long> ids);
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkNavigationSettingService.java

@@ -1,11 +0,0 @@
-package com.gis.service;
-
-import com.gis.dto.WorkNavigationDTO;
-import com.gis.entity.WorkNavigationVo;
-
-public interface WorkNavigationSettingService {
-
-    WorkNavigationVo addGroup(WorkNavigationDTO dto);
-
-    void removeByWorkId(String id);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkOpeningAnimationService.java

@@ -1,17 +0,0 @@
-package com.gis.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.WorkOpeningAnimationEntity;
-
-/**
- * 开场动画表 服务类接口
- *
- * @author Xiewj
- * @since 2023-09-05 19:35
- */
-public interface WorkOpeningAnimationService extends IService<WorkOpeningAnimationEntity> {
-
-    WorkOpeningAnimationEntity getByWorkId(String workId);
-
-    void removeByWorkId(String workId);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkOpeningTipService.java

@@ -1,15 +0,0 @@
-package com.gis.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.entity.WorkOpeningTipEntity;
-
-/**
- *
- */
-public interface WorkOpeningTipService extends IService<WorkOpeningTipEntity> {
-
-    WorkOpeningTipEntity getByWorkId(String workId);
-
-    void removeByWorkId(String workId);
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkService.java

@@ -1,17 +0,0 @@
-package com.gis.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.dto.SceneQueueDTO;
-import com.gis.entity.WorkEntity;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:14
- */
-public interface WorkService extends IService<WorkEntity> {
-
-    WorkEntity entityAdd(SceneQueueDTO sceneQueueDTO);
-    WorkEntity findByNum(String num);
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -1,191 +0,0 @@
-package com.gis.service.impl;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.XmlUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.filestorage.FileStorageTemplate;
-import com.gis.constant.CmdConstant;
-import com.gis.constant.ConfigConstant;
-import com.gis.entity.FodderEntity;
-import com.gis.exception.BaseRuntimeException;
-import com.gis.mapper.FodderMapper;
-import com.gis.oss.util.FileAndOssUtil;
-import com.gis.service.FodderService;
-import com.gis.util.CmdUtils;
-import com.gis.util.FileUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Date;
-import java.util.concurrent.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by owen on 2022/7/27 0027 16:55
- */
-@Slf4j
-@Service
-public class FodderServiceImpl extends ServiceImpl<FodderMapper,FodderEntity> implements FodderService {
-
-    @Autowired
-    ConfigConstant configConstant;
-
-    @Autowired
-    FodderMapper fodderMapper;
-
-    @Autowired
-    FileAndOssUtil fileAndOssUtil;
-    @Resource
-    private FileStorageTemplate ossUtil;
-    // 获取切图后的tour.xml
-    private String getTourXmlScene(String code) {
-        log.info("处理tour.xml");
-        String tourPath = configConstant.serverBasePath + code + "/vtour/tour.xml";
-        log.info("tourPath: {}", tourPath);
-        BaseRuntimeException.isTrue(!FileUtils.checkFileExtend(tourPath, 10), null, code + "_tour.xml文件不存在");
-        String tour = FileUtil.readUtf8String(tourPath);
-        tour = this.extractSceneTag(tour);
-        String trim = StrUtil.trim(tour);
-        // log.info("trim: {}", trim);
-        BaseRuntimeException.isTrue(StrUtil.isAllBlank(trim), null, code + "_tour.xml文件不存在");
-
-        // 2022-09-15 加入相对路径
-        String basePath = "%CURRENTXML%../" + code + "/vtour/panos/";
-        trim = trim.replaceAll("panos/", basePath);
-
-        return trim;
-    }
-    public static String extractSceneTag(String xmlString) {
-        Pattern pattern = Pattern.compile("<scene.*?</scene>", Pattern.DOTALL);
-        Matcher matcher = pattern.matcher(xmlString);
-
-        if (matcher.find()) {
-            return matcher.group();
-        }
-
-        return "";
-    }
-    // 上传切图到oss
-//    private void uploadOss(String sceneCode) {
-//        String cmd = CmdConstant.OSSUTIL_UPLOAD_DIR;
-//        cmd = cmd.replaceAll("@sceneCode", sceneCode);
-//        log.info("ossCmd: " + cmd);
-//        long start = System.currentTimeMillis();
-//        CmdUtils.callshell(cmd);
-//        long end = System.currentTimeMillis();
-//        log.info("切图上传完成, 耗时：{} s" , (end-start)/1000 );
-//    }
-
-
-    private void uploadOss(String sceneCode) {
-//        String cmd = CmdConstant.OSSUTIL_UPLOAD_DIR;
-//        cmd = cmd.replaceAll("@sceneCode", sceneCode);
-//        log.info("ossCmd: " + cmd);
-        long start = System.currentTimeMillis();
-        //   /mnt/720yun_fd_manage_data/@sceneCode 720yun_fd_manage/@sceneCode"
-        String filePath = "/mnt/720yun_fd_manage_data/" + sceneCode;
-        String ossKey = "720yun_fd_manage/" + sceneCode;
-        fileAndOssUtil.uploadBySh(filePath, ossKey);
-        long end = System.currentTimeMillis();
-        log.info("切图上传完成, 耗时：{} s" , (end-start)/1000 );
-    }
-
-    @Override
-    public void doSlice(Long id, String traceId) {
-        MDC.put("TRACE_ID", traceId);
-
-        log.info("切图流程开始 : " + id);
-        long start = System.currentTimeMillis();
-        FodderEntity entity = null;
-        int maxAttempts = 3; // 定义尝试次数
-        int attempts = 0; // 尝试次数计数器
-        while (entity == null && attempts < maxAttempts) {
-            entity = fodderMapper.findById(id);
-            if (entity == null) {
-                ThreadUtil.safeSleep(1000); // 暂停1000毫秒（1秒）
-                attempts++;
-            }
-        }
-        if (entity == null) {
-            log.error("场景不存在： " + id);
-            // 直接结束，抛异常的话，会造成死循环，产生大量日志，而且队列也跑不下去
-            return;
-        }
-        String panoPath = entity.getFilePath();
-        String sceneCode = entity.getSceneCode();
-        String cmd = CmdConstant.PANO_KRPANO + panoPath;
-        if (panoPath.endsWith(".jpg")){
-            String parent = FileUtil.getParent(panoPath, 1);
-            FileUtil.del(parent+ File.separator + "vtour");
-        }
-
-        // 超时处理机制
-        final ExecutorService exec = Executors.newFixedThreadPool(1);
-        Callable<String> call = new Callable<String>() {
-            @Override
-            public String call() throws Exception {
-                MDC.put("TRACE_ID", traceId);
-                CmdUtils.callLine(cmd, 200);
-                long end = System.currentTimeMillis();
-                log.info("切图完成耗时： {} s" ,(end-start)/1000);
-                log.warn("end processListener : "+ id);
-                return "执行完成";
-            }
-        };
-        // 超时回调
-        Future<String> future = exec.submit(call);
-        try {
-            String obj = future.get(20, TimeUnit.MINUTES); //任务处理超时时间设为 3分钟
-            entity.setStatus(3);
-            String tourXmlScene = this.getTourXmlScene(sceneCode);
-            entity.setTour(tourXmlScene);
-            // 上传切图
-            this.uploadOss(sceneCode);
-            String ossUrl = ossUtil.calculateUrl("") + configConstant.ossBasePath + sceneCode+"/vtour/panos/"+sceneCode+".tiles/thumb.jpg";
-            log.info("切图预览图ossUrl: {}",ossUrl);
-
-            entity.setIcon(ossUrl);
-
-            log.info("任务成功返回: " + obj);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-            entity.setStatus(2);
-            StringWriter trace=new StringWriter();
-            log.error(trace.toString());
-            log.error("异常了 InterruptedException");
-        } catch (ExecutionException | BaseRuntimeException e) {
-            e.printStackTrace();
-            StringWriter trace=new StringWriter();
-            e.printStackTrace(new PrintWriter(trace));
-            log.error("超时了 1");
-            // 异常日志要打印，不然不会出现在日志文件中，只会出现在控制台
-            log.error(trace.toString());
-            entity.setStatus(2);
-            future.cancel(true);
-        } catch (TimeoutException e) {
-            e.printStackTrace();
-            StringWriter trace=new StringWriter();
-            e.printStackTrace(new PrintWriter(trace));
-            log.error("超时了 2");
-            log.error(trace.toString());
-            entity.setStatus(2);
-            future.cancel(true);
-        } finally {
-            entity.setUpdateTime(new Date());
-            updateById(entity);
-            log.info("切图流程, 更新数据库完成 : " + id);
-        }
-        log.info("切图流程结束 : " + id);
-    }
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/ScenePanoServiceImpl.java

@@ -1,36 +0,0 @@
-package com.gis.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.entity.ScenePanoEntity;
-import com.gis.mapper.ScenePanoMapper;
-import com.gis.service.ScenePanoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 四维看看场景全景图表 服务实现类
- *
- * @author Xiewj
- * @since 2024-04-03 18:01
- */
-@Service
-public class ScenePanoServiceImpl extends ServiceImpl<ScenePanoMapper, ScenePanoEntity> implements ScenePanoService {
-    @Autowired
-
-    private ScenePanoMapper scenePanoMapper;
-
-    @Override
-    public ScenePanoEntity findByWorkIdAndName(String workId, String imgName) {
-        return this.getOne(new LambdaQueryWrapper<ScenePanoEntity>().eq(ScenePanoEntity::getWorkId, workId).eq(ScenePanoEntity::getName, imgName));
-
-    }
-
-    @Override
-    public List<ScenePanoEntity> findByWorkId(String workId) {
-        return this.list(new LambdaQueryWrapper<ScenePanoEntity>().eq(ScenePanoEntity::getWorkId, workId));
-
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkCoverTypeServiceImpl.java

@@ -1,27 +0,0 @@
-package com.gis.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.entity.WorkCoverTypeEntity;
-import com.gis.mapper.WorkCoverTypeMapper;
-import com.gis.service.WorkCoverTypeService;
-import org.springframework.stereotype.Service;
-
-/**
- * 开场封面表 服务实现类
- *
- * @author Xiewj
- * @since 2023-09-05 20:45
- */
-@Service
-public class WorkCoverTypeServiceImpl extends ServiceImpl<WorkCoverTypeMapper, WorkCoverTypeEntity> implements WorkCoverTypeService {
-    @Override
-    public WorkCoverTypeEntity getByWorkId(String workId) {
-        return getOne(new LambdaQueryWrapper<WorkCoverTypeEntity>().eq(WorkCoverTypeEntity::getWorkId, workId));
-    }
-
-    @Override
-    public void removeByWorkId(String workId) {
-        remove(new LambdaQueryWrapper<WorkCoverTypeEntity>().eq(WorkCoverTypeEntity::getWorkId, workId));
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkCustomButtonServiceImpl.java

@@ -1,24 +0,0 @@
-package com.gis.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.entity.WorkCustomButtonEntity;
-import com.gis.mapper.WorkCustomButtonMapper;
-import com.gis.service.WorkCustomButtonService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 自定义按钮设置表 服务实现类
- *
- * @author Xiewj
- * @since 2023-09-06 14:50
- */
-@Service
-public class WorkCustomButtonServiceImpl extends ServiceImpl<WorkCustomButtonMapper, WorkCustomButtonEntity> implements WorkCustomButtonService {
-    @Override
-    public List<WorkCustomButtonEntity> listByWorkId(String workId) {
-        return list(new LambdaQueryWrapper<WorkCustomButtonEntity>().eq(WorkCustomButtonEntity::getWorkId, workId));
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkCustomMaskServiceImpl.java

@@ -1,57 +0,0 @@
-package com.gis.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.dto.WorkCustomMaskDto;
-import com.gis.dto.WorkMaskBatchSaveDTO;
-import com.gis.entity.WorkCustomMaskEntity;
-import com.gis.exception.BaseRuntimeException;
-import com.gis.mapper.WorkCustomMaskMapper;
-import com.gis.service.WorkCustomMaskService;
-import com.gis.vo.WorkCustomMaskVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * 遮罩设置表 服务实现类
- *
- * @author Xiewj
- * @since 2023-09-06 14:37
- */
-@Service
-public class WorkCustomMaskServiceImpl extends ServiceImpl<WorkCustomMaskMapper, WorkCustomMaskEntity> implements WorkCustomMaskService {
-
-
-    @Override
-    public List<WorkCustomMaskVO> batchSave(WorkMaskBatchSaveDTO dto) {
-
-        List<WorkCustomMaskDto> list = dto.getList();
-        List<Long> ids = list.stream().filter(v -> Objects.nonNull(v.getId())).map(v -> v.getId()).collect(Collectors.toList());
-        if(CollUtil.isNotEmpty(ids)){
-            long count = this.count(new LambdaQueryWrapper<WorkCustomMaskEntity>().eq(WorkCustomMaskEntity::getWorkId, dto.getWorkId()).in(WorkCustomMaskEntity::getId, ids));
-            if(ids.size() != count){
-                throw new BaseRuntimeException("id有误");
-            }
-        }
-        List<WorkCustomMaskEntity> workCustomMaskEntities = BeanUtil.copyToList(list, WorkCustomMaskEntity.class);
-        workCustomMaskEntities.stream().forEach(v->v.setWorkId(dto.getWorkId()));
-        this.saveOrUpdateBatch(workCustomMaskEntities);
-
-        return BeanUtil.copyToList(workCustomMaskEntities, WorkCustomMaskVO.class);
-    }
-
-    @Override
-    public List<WorkCustomMaskEntity> listByWorkId(String workId) {
-        return this.list(new LambdaQueryWrapper<WorkCustomMaskEntity>().eq(WorkCustomMaskEntity::getWorkId, workId));
-    }
-
-    @Override
-    public void deleteByNavigationIds(List<Long> navigationIds) {
-        this.remove(new LambdaQueryWrapper<WorkCustomMaskEntity>().in(WorkCustomMaskEntity::getNavigationId, navigationIds));
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkLogoServiceImpl.java

@@ -1,27 +0,0 @@
-package com.gis.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.entity.WorkLogoEntity;
-import com.gis.mapper.WorkLogoMapper;
-import com.gis.service.WorkLogoService;
-import org.springframework.stereotype.Service;
-
-/**
- * logo表 服务实现类
- *
- * @author Xiewj
- * @since 2023-09-06 10:21
- */
-@Service
-public class WorkLogoServiceImpl extends ServiceImpl<WorkLogoMapper, WorkLogoEntity> implements WorkLogoService {
-    @Override
-    public WorkLogoEntity getByWorkId(String workId) {
-        return getOne(new LambdaQueryWrapper<WorkLogoEntity>().eq(WorkLogoEntity::getWorkId, workId));
-    }
-
-    @Override
-    public void removeByWorkId(String workId) {
-        remove(new LambdaQueryWrapper<WorkLogoEntity>().eq(WorkLogoEntity::getWorkId, workId));
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkNavigationServiceImpl.java

@@ -1,79 +0,0 @@
-package com.gis.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.constant.NavigationTypeEnum;
-import com.gis.entity.WorkNavigationEntity;
-import com.gis.entity.WorkNavigationVo;
-import com.gis.mapper.WorkNavigationMapper;
-import com.gis.service.WorkNavigationService;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 作品导航表 服务实现类
- *
- * @author Xiewj
- * @since 2023-09-08 18:13
- */
-@Service
-public class WorkNavigationServiceImpl extends ServiceImpl<WorkNavigationMapper, WorkNavigationEntity> implements WorkNavigationService {
-
-    /**
-     * 得到子节点列表
-     */
-    private List<WorkNavigationVo> getChildList(List<WorkNavigationVo> list, WorkNavigationVo t) {
-        List<WorkNavigationVo> tlist = new ArrayList<WorkNavigationVo>();
-        Iterator<WorkNavigationVo> it = list.iterator();
-        while (it.hasNext()) {
-            WorkNavigationVo n = it.next();
-            if (n.getParentId().longValue() == t.getId().longValue()) {
-                tlist.add(n);
-            }
-        }
-        return tlist;
-    }
-
-    /**
-     * 判断是否有子节点
-     */
-    private boolean hasChild(List<WorkNavigationVo> list, WorkNavigationVo t) {
-        return getChildList(list, t).size() > 0;
-    }
-
-    @Override
-    public List<WorkNavigationEntity> selectByParentId(long parentId) {
-        return this.list(new LambdaQueryWrapper<WorkNavigationEntity>().eq(WorkNavigationEntity::getParentId, parentId));
-    }
-
-    @Override
-    public List<WorkNavigationEntity> selectScenes(String workId) {
-        List<WorkNavigationEntity> list = this.list(new LambdaQueryWrapper<WorkNavigationEntity>()
-                .eq(WorkNavigationEntity::getWorkId, workId)
-                .in(WorkNavigationEntity::getType, NavigationTypeEnum.FDKK.code(), NavigationTypeEnum.PANO.code()));
-        return list;
-    }
-
-    @Override
-    public List<WorkNavigationEntity> selectByWorkId(String workId) {
-        return this.list(new LambdaQueryWrapper<WorkNavigationEntity>().eq(WorkNavigationEntity::getWorkId, workId));
-    }
-
-    @Override
-    public void reSetFistSceneByWorkId(String workId) {
-        this.update(new LambdaUpdateWrapper<WorkNavigationEntity>().set(WorkNavigationEntity::getIsFirstScene, 0).eq(WorkNavigationEntity::getWorkId, workId));
-    }
-
-    @Override
-    public List<Long> getDeleteIdList(String workId, List<Long> ids) {
-        return this.list(new LambdaQueryWrapper<WorkNavigationEntity>()
-                .select(WorkNavigationEntity::getId)
-                .eq(WorkNavigationEntity::getWorkId, workId)
-                .notIn(WorkNavigationEntity::getId, ids)).stream().map(v->v.getId()).collect(Collectors.toList());
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkNavigationSettingServiceImpl.java

@@ -1,38 +0,0 @@
-package com.gis.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-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.constant.NavigationTypeEnum;
-import com.gis.dto.WorkNavigationDTO;
-import com.gis.entity.WorkNavigationEntity;
-import com.gis.entity.WorkNavigationVo;
-import com.gis.mapper.WorkNavigationMapper;
-import com.gis.service.WorkNavigationService;
-import com.gis.service.WorkNavigationSettingService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class WorkNavigationSettingServiceImpl  implements WorkNavigationSettingService {
-    @Autowired
-    private WorkNavigationService workNavigationService;
-    @Override
-    public WorkNavigationVo addGroup(WorkNavigationDTO dto) {
-
-        WorkNavigationEntity entity = BeanUtil.toBean(dto, WorkNavigationEntity.class);
-        entity.setType(NavigationTypeEnum.GROUP.code());
-        workNavigationService.save(entity);
-
-        return BeanUtil.toBean(entity, WorkNavigationVo.class);
-    }
-
-    @Override
-    public void removeByWorkId(String workId) {
-        LambdaQueryWrapper<WorkNavigationEntity> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(WorkNavigationEntity::getWorkId, workId);
-        wrapper.eq(WorkNavigationEntity::getIsDelete, 0);
-        workNavigationService.remove(wrapper);
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkOpeningAnimationServiceImpl.java

@@ -1,27 +0,0 @@
-package com.gis.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.entity.WorkOpeningAnimationEntity;
-import com.gis.mapper.WorkOpeningAnimationMapper;
-import com.gis.service.WorkOpeningAnimationService;
-import org.springframework.stereotype.Service;
-
-/**
- * 开场动画表 服务实现类
- *
- * @author Xiewj
- * @since 2023-09-05 19:35
- */
-@Service
-public class WorkOpeningAnimationServiceImpl extends ServiceImpl<WorkOpeningAnimationMapper, WorkOpeningAnimationEntity> implements WorkOpeningAnimationService {
-    @Override
-    public WorkOpeningAnimationEntity getByWorkId(String workId) {
-        return this.getOne(new LambdaQueryWrapper<WorkOpeningAnimationEntity>().eq(WorkOpeningAnimationEntity::getWorkId, workId));
-    }
-
-    @Override
-    public void removeByWorkId(String workId) {
-        remove(new LambdaQueryWrapper<WorkOpeningAnimationEntity>().eq(WorkOpeningAnimationEntity::getWorkId, workId));
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkOpeningTipServiceImpl.java

@@ -1,29 +0,0 @@
-package com.gis.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gis.entity.WorkOpeningTipEntity;
-import com.gis.mapper.WorkOpeningTipMapper;
-import com.gis.service.WorkOpeningTipService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- */
-@Service
-public class WorkOpeningTipServiceImpl extends ServiceImpl<WorkOpeningTipMapper, WorkOpeningTipEntity> implements WorkOpeningTipService {
-
-    @Override
-    public WorkOpeningTipEntity getByWorkId(String workId) {
-        return getOne(new LambdaQueryWrapper<WorkOpeningTipEntity>().eq(WorkOpeningTipEntity::getWorkId, workId));
-    }
-
-    @Override
-    public void removeByWorkId(String workId) {
-        remove(new LambdaQueryWrapper<WorkOpeningTipEntity>().eq(WorkOpeningTipEntity::getWorkId, workId));
-    }
-}
-
-
-
-

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -1,79 +0,0 @@
-package com.gis.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-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.constant.ConfigConstant;
-import com.gis.dto.SceneQueueDTO;
-import com.gis.entity.WorkEntity;
-import com.gis.mapper.WorkMapper;
-import com.gis.oss.util.FileAndOssUtil;
-import com.gis.service.WorkService;
-import com.gis.util.QrCodeUtils;
-import com.gis.util.SnowFlakeUUidUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:16
- */
-@Slf4j
-@Service
-public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implements WorkService {
-    @Autowired
-    ConfigConstant configConstant;
-
-    @Autowired
-    private WorkMapper entityMapper;
-    @Autowired
-    FileAndOssUtil fileAndOssUtil;
-    @Autowired
-    QrCodeUtils qrCodeUtils;
-
-    @Override
-    public WorkEntity findByNum(String num) {
-        LambdaQueryWrapper<WorkEntity> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(WorkEntity::getNum, num);
-        return getOne(wrapper);
-    }
-
-    @Override
-    public WorkEntity entityAdd(SceneQueueDTO sceneQueueDTO) {
-
-        WorkEntity entity = new WorkEntity();
-        entity.setId(SnowFlakeUUidUtils.getUuid("WK"));
-        entity.setUserId(sceneQueueDTO.getPhoneNum());
-        entity.setStatus(1);
-        Date date = new Date();
-        entity.setCreateTime(date);
-        entity.setUpdateTime(date);
-        entity.setCalcStatus(sceneQueueDTO.getStatus());
-        entity.setNum(sceneQueueDTO.getSceneCode());
-        entity.setType("pro");
-        entity.setName(sceneQueueDTO.getSceneName());
-        entity.setSnCode(sceneQueueDTO.getSnCode());
-        entity.setLocation(sceneQueueDTO.getLocation());
-        entity.setSceneSource(sceneQueueDTO.getSceneSource());
-        if (ObjectUtil.isNotEmpty(sceneQueueDTO.getPwd())){
-            entity.setPassword(sceneQueueDTO.getPwd());
-            entity.setIsPassword(1);
-        }
-        if (ObjectUtil.isNotEmpty(sceneQueueDTO.getPayStatus())){
-            entity.setPayStatus(sceneQueueDTO.getPayStatus());
-        }
-        entity.setShootTime(sceneQueueDTO.getCreateTime());
-        entity.setCreateTime(sceneQueueDTO.getCreateTime());
-        entity.setUpdateTime(sceneQueueDTO.getCreateTime());
-        save(entity);
-        String id = entity.getId();
-        log.info("创建对象完成： {}", id);
-
-        return entity;
-    }
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/CmdUtils.java

@@ -1,138 +0,0 @@
-package com.gis.util;
-
-import cn.hutool.core.util.RuntimeUtil;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * Created by owen on 2021/1/4 0004 14:53
- */
-@Slf4j
-public class CmdUtils {
-
-
-    /**
-     * 调用算法 xx.sh 脚本
-     * @param command
-     */
-    public static void callshell(String command){
-        try {
-            String[] cmd = new String[]{"/bin/sh", "-c", command};
-            Process process = Runtime.getRuntime().exec(cmd);
-            StreamGobbler errorGobbler = new StreamGobbler(process.getErrorStream(), "ERROR");
-            errorGobbler.start();
-            StreamGobbler outGobbler = new StreamGobbler(process.getInputStream(), "STDOUT");
-            outGobbler.start();
-            process.waitFor();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-
-    /**
-     * 命令运行结果 1：失败， 0：成功
-     * @return
-     * @throws IOException
-     * @throws InterruptedException
-     */
-    public static int cmdPano(String command) throws IOException, InterruptedException {
-        log.info("cmd: {}", command);
-//        String[] cmd = new String[]{"/bin/sh", "-c", command};
-//        Process exec = Runtime.getRuntime().exec(cmd);
-
-        // 使用 bin/sh 这个方法会报错
-        Process exec = RuntimeUtil.exec(command);
-
-        BufferedReader br = new BufferedReader(new InputStreamReader(exec.getInputStream()));
-        BufferedReader errorBuf = new BufferedReader(new InputStreamReader(exec.getErrorStream()));
-
-        String errorLine;
-        while ((errorLine = errorBuf.readLine()) != null) {
-            log.error("errorLine: {}", errorLine);
-        }
-
-        // success ，没有获取到信息
-        String line;
-        int i = 1;
-        while ((line = br.readLine()) != null) {
-
-            // 查看执行日志
-            if (i % 200 == 0) {
-                log.info("line, i=" + i +", " +line);
-            }
-
-            if (line.contains("done.")) {
-                log.info("line: {}", line);
-            }
-            i++;
-        }
-        log.info("执行总行数：" +i);
-
-        // 结束命令行
-        int isCmd = exec.waitFor();
-
-        // 关闭流
-        br.close();
-        errorBuf.close();
-
-        return isCmd;
-
-    }
-
-
-    /**
-     * 调用算法 xx.sh 脚本
-     * @param command
-     */
-//    public static void callPano(String command){
-//        log.info("cmd: " + command);
-//        try {
-//            Process process = Runtime.getRuntime().exec(command);
-//            StreamGobblerLine errorGobbler = new StreamGobblerLine(process.getErrorStream(), "ERROR");
-//            errorGobbler.start();
-//            // 200行打印一次日志
-//            StreamGobblerLine outGobbler = new StreamGobblerLine(process.getInputStream(), "STDOUT", 200);
-//            outGobbler.start();
-//            process.waitFor();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-
-
-    public static void callLine(String command){
-        callLine(command, null);
-
-    }
-
-    /**
-     *
-     * @param command 命令
-     * @param lineSize 日志输出行数 ，可以为null
-     */
-    public static void callLine(String command, Integer lineSize){
-        log.info("cmd: " + command);
-        try {
-            Process process = Runtime.getRuntime().exec(command);
-            log.info("开始运行");
-            StreamGobbler errorGobbler = new StreamGobbler(process.getErrorStream(), "ERROR");
-            errorGobbler.start();
-            // 200行打印一次日志
-            StreamGobblerLine outGobbler = new StreamGobblerLine(process.getInputStream(), "STDOUT", lineSize);
-            outGobbler.start();
-            process.waitFor();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/FileUtils.java

@@ -1,131 +0,0 @@
-package com.gis.util;
-
-import cn.hutool.core.io.FileUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.stereotype.Component;
-
-import java.io.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by owen on 2020/5/12 0012 17:21
- */
-@Slf4j
-@Component
-public class FileUtils {
-
-
-
-    /***
-     * 遍历每一个文件路径
-     * dirPath ：目录路径
-     * eachFile
-     * 作用上传oss
-     */
-    public  Map eachFile(String dirPath, String sceneCode, String ossBasePath, String houseId)  {
-        if (!FileUtil.isDirectory(dirPath)) {
-            log.error("目录不存在, dirPath: " + dirPath);
-//            new BaseRuntimeException("文件不存在");
-
-        }
-        File file = new File(dirPath);
-
-        HashMap<String, String> result = new HashMap<>();
-        dfs(file, sceneCode, ossBasePath, result, houseId);
-        return result;
-    }
-
-    /**
-     * 递归解析
-     * @param file
-     * @param sceneCode
-     * @param ossBasePath
-     * @return
-     * @throws IOException
-     */
-    public void dfs(File file, String sceneCode, String ossBasePath, HashMap<String, String> result, String houseId) {
-
-        File[] files = file.listFiles();
-        for (File every : files) {
-            // 是文件
-            if (every.isFile()) {
-                String filePath = every.getAbsolutePath();
-
-//                String ossPath = StringUtils.substringAfterLast(filePath, sceneCode);
-                String ossPath = StringUtils.substringAfter(filePath, sceneCode);
-                ossPath = ossBasePath + houseId + "/" + sceneCode + ossPath;
-                result.put(filePath, ossPath);
-
-                // 是目录
-            } else {
-                dfs(every, sceneCode, ossBasePath, result, houseId);
-            }
-        }
-    }
-
-    @Test
-    public void test1(){
-        String dirPath = "F:\\test\\bigScene\\";
-        if (!FileUtil.isDirectory(dirPath)) {
-            log.warn("文件不存在, dirPath: " + dirPath);
-        }
-    }
-
-    // jar包运行，只能用文件流的形式获取文件
-    public static InputStream getResource(String path){
-        ClassPathResource classPathResource = new ClassPathResource(path);
-        InputStream inputStream = null;
-        try {
-            inputStream = classPathResource.getInputStream();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return inputStream;
-    }
-    /**
-     * 读取资源文内容
-     * @param resourcePath : data/someData.json
-     * @return
-     */
-    public static String getResourceContent(String resourcePath){
-        InputStream resource = FileUtils.getResource(resourcePath);
-        StringBuilder sb = new StringBuilder();
-        String line;
-        String str = null ;
-        BufferedReader br = new BufferedReader(new InputStreamReader(resource));
-        while (true) {
-            try {
-                if ((line = br.readLine()) == null) break;
-                sb.append(line);
-                str = sb.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return str;
-    }
-
-    public static boolean checkFileExtend(final String file,int count){
-        int i=0;
-        while (i<=count){
-            final boolean exist = FileUtil.exist(file);
-            log.info("文件={}，第-{}-次检测,检测结果={}",file,i,exist);
-            if (!exist&&i==count){
-                return false;
-            }else if (exist){
-                return true;
-            }
-            i++;
-            try {
-                Thread.sleep(5000);
-            } catch (final InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return false;
-    }}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/QrCodeUtils.java

@@ -1,197 +0,0 @@
-package com.gis.util;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import com.gis.constant.ConfigConstant;
-import com.gis.oss.util.FileAndOssUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.iherus.codegen.qrcode.SimpleQrcodeGenerator;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-
-/**
- * Created by owen on 2020/12/17 0017 16:49
- *
- * 二维码
- */
-@Component
-@Slf4j
-public class QrCodeUtils {
-
-    @Autowired
-    FileAndOssUtil fileAndOssUtil;
-    @Autowired
-    ConfigConstant configConstant;
-
-    @Test
-    public void test(){
-        try {
-            new SimpleQrcodeGenerator().generate("http://ossxiaoan.4dage.com/cms_zhen/image/20201218_142627638.png?123").toFile("F:\\test\\ngin\\cms_wuhu_gov_data\\qrCode\\3.jpg");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 创建普通二维码
-     */
-    @Test
-    public  void generateQrCode(){
-        String url = "www.baidu.com";
-        String savePath = "E:\\cache\\";
-        // 保存地址
-        String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS") + ".jpg";
-        String dirType = "qrCode/";
-        savePath = savePath + dirType;
-
-        // 创建目录
-        if (!FileUtil.isDirectory(savePath)) {
-            FileUtil.mkdir(savePath);
-        }
-        savePath = savePath + time;
-        log.info("savePath: {}", savePath);
-        // 创建二维码tpt
-        try {
-            new SimpleQrcodeGenerator().generate(url).toFile(savePath);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-    /**
-     * 附带logo小图标二维码
-     */
-    public String generateLogoQrCode(String url, String serverBasePath, String ossBasePath, String ossDomain, String id){
-        // 保存地址
-        String savePath = serverBasePath + id;
-
-        String logoPath = serverBasePath + "img/kankan_icon.png";
-        if (!FileUtil.isFile(logoPath)) {
-            InputStream resource = FileUtils.getResource("img/kankan_icon.png");
-            FileUtil.writeFromStream(resource, logoPath);
-            log.info("logo写入完成");
-        }
-        log.info("logoPath: {}", logoPath);
-
-        // 创建目录
-        if (!FileUtil.isDirectory(savePath)) {
-            FileUtil.mkdir(savePath);
-        }
-        savePath = savePath + "/qrCode.jpg";
-//        log.info("savePath: {}", savePath);
-        // 创建二维码tpt
-        try {
-            new SimpleQrcodeGenerator().setLogo(logoPath).generate(url).toFile(savePath);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        // 二维码上传oss
-        String ossPath = ossBasePath + id + "/qrCode.jpg";
-        fileAndOssUtil.upload(savePath, ossPath);
-        String ossUrl = ossDomain + ossPath;
-        log.info("ossUrl: {}", ossUrl);
-
-        // 删除服务器临时文件
-
-        return ossUrl;
-    }
-
-
-    /**
-     * 自定义logo小图标二维码
-     * @param url 二维码内容url
-     * @param serverBasePath
-     * @param ossBasePath
-     * @param ossDomain
-     * @param id 目录
-     * @param logoPath 小logo图片地址
-     * @return
-     */
-    public String diyLogoQrCode(String url, String serverBasePath, String ossBasePath, String ossDomain, String id, String logoPath){
-
-        String savePath = serverBasePath + id;
-
-        // 创建目录
-        if (!FileUtil.isDirectory(savePath)) {
-            FileUtil.mkdir(savePath);
-        }
-        savePath = savePath + "/qrCode.jpg";
-//        log.info("savePath: {}", savePath);
-        // 创建二维码tpt
-        try {
-            new SimpleQrcodeGenerator().setLogo(logoPath).generate(url).toFile(savePath);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        // 二维码上传oss
-        String ossPath = ossBasePath + id + "/qrCode.jpg";
-        fileAndOssUtil.upload(savePath, ossPath);
-        String ossUrl = ossDomain + ossPath;
-        log.info("ossUrl: {}", ossUrl);
-
-        return ossUrl;
-    }
-    /**
-     * 附带logo小图标二维码
-     */
-    public String generateLogoQrCodeBase64(String logo,String text){
-        String serverBasePath=configConstant.serverBasePath;
-
-        String savePath =  serverBasePath +File.separator+"gerQrcode"+File.separator+ IdUtil.getSnowflakeNextId()+File.separator;
-        // 创建目录
-        if (!FileUtil.isDirectory(savePath)) {
-            FileUtil.mkdir(savePath);
-        }
-        String logoPath = serverBasePath + "img/kankan_icon.png";
-        if (StrUtil.isNotEmpty(logo)){
-            File file = HttpUtil.downloadFileFromUrl(logo, savePath);
-                 logoPath=file.getPath();
-                log.info("diy_logoPath{}",logoPath);
-
-        }else {
-             if (!FileUtil.isFile(logoPath)) {
-                InputStream resource = FileUtils.getResource("img/kankan_icon.png");
-                FileUtil.writeFromStream(resource, logoPath);
-                log.info("logo写入完成");
-            }
-        }
-        log.info("logoPath: {}", logoPath);
-        BufferedImage test = new SimpleQrcodeGenerator().setLogo(logoPath).generate(text).getImage();
-        System.out.println(test);
-        String png = ImgUtil.toBase64(test, "jpg");
-        png = "data:image/jpg;base64," + png;
-        if (StrUtil.isNotEmpty(logo)&&!logoPath.contains("kankan_icon.png")){
-            boolean del = FileUtil.del(savePath);
-            log.info("删除logo:{}",del);
-        }
-        return png;
-    }
-    /**
-     * 附带logo小图标二维码
-     */
-    public static void main(String[] args) {
-        String logoPath = "C:\\Users\\4DAGE\\Downloads\\img"+File.separator+ IdUtil.getSnowflakeNextId()+File.separator;
-        String logo="https://ossxiaoan.4dage.com/720yun_fd_manage/fd720_gxqoc32gt/vtour/panos/fd720_gxqoc32gt.tiles/thumb.jpg";
-        if (StrUtil.isNotEmpty(logo)) {
-            if (!FileUtil.isDirectory(logoPath)) {
-                FileUtil.mkdir(logoPath);
-            }
-            File file = HttpUtil.downloadFileFromUrl(logo, logoPath);
-            System.out.println(file.getPath());
-        }
-    }
-
-
- }

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/RandomUtils.java

@@ -1,44 +0,0 @@
-package com.gis.util;
-
-import cn.hutool.core.util.RandomUtil;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by owen on 2020/4/26 0026 10:07
- *
- *
- */
-@Component
-public class RandomUtils {
-
-    public static String randomString(int length){
-        return RandomUtils.getUuid("pano");
-    }
-
-    public static void main(String[] args) {
-        System.out.println(randomString(9));
-    }
-
-    /**
-     * 分布式id
-     * preStr： 8位id前缀
-     * @return
-     */
-    public static String getUuid(String preStr){
-        return SnowFlakeUUidUtils.generaUUid(null, null, preStr);
-    }
-
-    /**
-     * 场景码
-     * @return
-     */
-    public static String getSceneCode(String prefix){
-        String sceneCode = RandomUtils.randomString(9);
-        return  prefix +sceneCode;
-    }
-
-    private static String randowInt(int length){
-        String baseString = "0123456789";
-        return RandomUtil.randomString(baseString, length);
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/Result.java

@@ -1,101 +0,0 @@
-package com.gis.util;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 通用返回类
- *
- * @author
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Result<T> implements Serializable {
-    private static final long serialVersionUID = -1491499610244557029L;
-    public static final String SUCCESS_MSG = "操作成功";
-    public static int CODE_SUCCESS = 0;
-    public static int CODE_FAILURE = -1;
-    public static String[] NOOP = new String[]{};
-
-    /**
-     * 处理状态：0: 成功, 1: 失败
-     */
-    @ApiModelProperty(value = "处理状态：0: 成功, 1: 失败", name = "code")
-    private int code;
-    /**
-     * 消息
-     */
-    @ApiModelProperty(value = "消息", name = "msg")
-    private String msg;
-    /**
-     * 返回数据
-     */
-    @ApiModelProperty(value = "返回数据", name = "data")
-    private T data;
-    /**
-     * 处理成功，并返回数据
-     *
-     * @param data 数据对象
-     * @return data
-     */
-    public static Result success(Object data) {
-        return new Result(CODE_SUCCESS, SUCCESS_MSG, data);
-    }
-    /**
-     * 处理成功
-     *
-     * @return data
-     */
-    public static Result success() {
-        return new Result(CODE_SUCCESS, SUCCESS_MSG, NOOP);
-    }
-    /**
-     * 处理成功
-     *
-     * @param msg 消息
-     * @return data
-     */
-    public static Result success(String msg) {
-        return new Result(CODE_SUCCESS, msg, NOOP);
-    }
-    /**
-     * 处理成功
-     *
-     * @param msg  消息
-     * @param data 数据对象
-     * @return data
-     */
-    public static Result success(String msg, Object data) {
-        return new Result(CODE_SUCCESS, msg, data);
-    }
-    /**
-     * 处理失败，并返回数据（一般为错误信息）
-     *
-     * @param code 错误代码
-     * @param msg  消息
-     * @return data
-     */
-    public static Result failure(int code, String msg) {
-        return new Result(code, msg, NOOP);
-    }
-    /**
-     * 处理失败
-     *
-     * @param msg 消息
-     * @return data
-     */
-    public static Result failure(String msg) {
-        return failure(CODE_FAILURE, msg);
-    }
-
-    @Override
-    public String toString() {
-        return "JsonResult [code=" + code + ", msg=" + msg + ", data="
-                + data + "]";
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/SnowFlakeUUidUtils.java

@@ -1,226 +0,0 @@
-package com.gis.util;
-
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * 2 * @Author: Abner
- * 3 * @Date: 2020/12/9 16:07
- * 4
- */
-@Log4j2
-public class SnowFlakeUUidUtils {
-
-    // 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动）
-    //起始标记点
-    private final static long twepoch = 1288834974657L;
-    // 机器标识位数
-    private final static long workerIdBits = 5L;
-    // 数据中心标识位数
-    private final static long datacenterIdBits = 5L;
-    // 机器ID最大值
-    private final static long maxWorkerId = -1L ^ (-1L << workerIdBits);
-    // 数据中心ID最大值
-    private final static long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
-    // 毫秒内自增位
-    private final static long sequenceBits = 12L;
-    // 机器ID偏左移12位
-    private final static long workerIdShift = sequenceBits;
-    // 数据中心ID左移17位
-    private final static long datacenterIdShift = sequenceBits + workerIdBits;
-    // 时间毫秒左移22位
-    private final static long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
-
-    private final static long sequenceMask = -1L ^ (-1L << sequenceBits);
-
-    private final static Lock myLock = new ReentrantLock();
-    /* 上次生产id时间戳 */
-    private static long lastTimestamp = -1L;
-    // 0，并发控制
-    private long sequence = 0L;
-
-    private final long workerId;
-    // 数据标识id部分
-    private final long datacenterId;
-
-    private static volatile SnowFlakeUUidUtils snowFlakeUUidUtils;
-
-
-    private static SnowFlakeUUidUtils getSingleInstance(Long workerId, Long datacenterId){
-        if(null == snowFlakeUUidUtils){
-            synchronized (SnowFlakeUUidUtils.class){
-                if(null == snowFlakeUUidUtils){
-                    if(null != workerId && null != datacenterId){
-                        snowFlakeUUidUtils = new SnowFlakeUUidUtils(workerId , datacenterId);
-                    }else{
-                        snowFlakeUUidUtils = new SnowFlakeUUidUtils();
-                    }
-                }
-            }
-        }
-        return snowFlakeUUidUtils;
-    }
-
-    /**
-     * @param workerId 自定义的应用所在的服务器的机器ID，使用默认读取本机则无需传，传个NULL即可
-     * @param datacenterId 自定义的应用所在的服务器的数据中心ID，使用默认读取本机则无需传，传个NULL即可
-     * @param preStr 自定义的ID前缀
-     * **/
-    public static String generaUUid(Long workerId, Long datacenterId , String preStr){
-        StringBuilder resultId = new StringBuilder();
-        SnowFlakeUUidUtils snowFlakeUUidUtils = getSingleInstance(workerId , datacenterId);
-        if(StringUtils.isNotBlank(preStr)){
-            return resultId.append(preStr).append(snowFlakeUUidUtils.nextId()).toString();
-        }else{
-            return resultId.append(snowFlakeUUidUtils.nextId()).toString();
-        }
-    }
-
-    public SnowFlakeUUidUtils(){
-        this.datacenterId = getDatacenterId(maxDatacenterId);
-        this.workerId = getMaxWorkerId(datacenterId, maxWorkerId);
-    }
-    /**
-     * @param workerId
-     *            工作机器ID
-     * @param datacenterId
-     *            序列号
-     */
-    public SnowFlakeUUidUtils(long workerId, long datacenterId) {
-        if (workerId > maxWorkerId || workerId < 0) {
-            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
-        }
-        if (datacenterId > maxDatacenterId || datacenterId < 0) {
-            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
-        }
-        this.workerId = workerId;
-        this.datacenterId = datacenterId;
-    }
-    /**
-     * 获取下一个ID
-     * 线程安全
-     * @return NULL 抢锁失败，需要重新调用
-     *         数字串 抢锁成功，则生成20位的数字串
-     */
-    public  Long nextId() {
-        try {
-
-            if(myLock.tryLock(700 , TimeUnit.MILLISECONDS)){
-                try {
-                    long timestamp = timeGen();
-                    if (timestamp < lastTimestamp) {
-                        throw new RuntimeException(String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
-                    }
-
-                    if (lastTimestamp == timestamp) {
-                        // 当前毫秒内，则+1
-                        sequence = (sequence + 1) & sequenceMask;
-                        if (sequence == 0) {
-                            // 当前毫秒内计数满了，则等待下一秒
-                            timestamp = tilNextMillis(lastTimestamp);
-                        }
-                    } else {
-                        sequence = 0L;
-                    }
-                    lastTimestamp = timestamp;
-                    // ID偏移组合生成最终的ID，并返回ID
-                    Long nextId = ((timestamp - twepoch) << timestampLeftShift)
-                            | (datacenterId << datacenterIdShift)
-                            | (workerId << workerIdShift) | sequence;
-
-                    return nextId;
-                }catch (Exception e){
-                    log.info("生成UUID抢锁失败:{}" , e);
-                }finally {
-                    myLock.unlock();
-                }
-            }else{
-                return null;
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return null;
-
-    }
-
-    private long tilNextMillis(final long lastTimestamp) {
-        long timestamp = this.timeGen();
-        while (timestamp <= lastTimestamp) {
-            timestamp = this.timeGen();
-        }
-        return timestamp;
-    }
-
-    private long timeGen() {
-        return System.currentTimeMillis();
-    }
-
-    /**
-     * <p>
-     * 获取 maxWorkerId
-     * </p>
-     */
-    protected static long getMaxWorkerId(long datacenterId, long maxWorkerId) {
-        StringBuffer mpid = new StringBuffer();
-        mpid.append(datacenterId);
-        String name = ManagementFactory.getRuntimeMXBean().getName();
-        if (!name.isEmpty()) {
-            /*
-             * GET jvmPid
-             */
-            mpid.append(name.split("@")[0]);
-        }
-        /*
-         * MAC + PID 的 hashcode 获取16个低位
-         */
-        return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1);
-    }
-
-    /**
-     *
-     * @param prefix 前缀
-     * @return
-     */
-    public static String getUuid(String prefix){
-        String s = prefix.toUpperCase();
-        return generaUUid(null, null, s);
-
-    }
-
-    /**
-     * <p>
-     * 数据标识id部分
-     * </p>
-     */
-    protected static long getDatacenterId(long maxDatacenterId) {
-        long id = 0L;
-        try {
-            InetAddress ip = InetAddress.getLocalHost();
-            NetworkInterface network = NetworkInterface.getByInetAddress(ip);
-            if (network == null) {
-                id = 1L;
-            } else {
-                byte[] mac = network.getHardwareAddress();
-                id = ((0x000000FF & (long) mac[mac.length - 1])
-                        | (0x0000FF00 & (((long) mac[mac.length - 2]) << 8))) >> 6;
-                id = id % (maxDatacenterId + 1);
-            }
-        } catch (Exception e) {
-            System.out.println(" getDatacenterId: " + e.getMessage());
-        }
-        return id;
-    }
-
-    public static void main(String[] args) {
-        System.out.println(SnowFlakeUUidUtils.generaUUid(null, null, null));
-    }
-
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/StreamGobbler.java

@@ -1,61 +0,0 @@
-package com.gis.util;
-
-import java.io.*;
-
-public class StreamGobbler extends Thread {
-
-	InputStream is;  
-    String type;  
-    OutputStream os;  
-
-    public StreamGobbler(InputStream is, String type) {  
-        this(is, type, null);  
-    }  
-
-    StreamGobbler(InputStream is, String type, OutputStream redirect) {  
-        this.is = is;  
-        this.type = type;  
-        this.os = redirect;  
-    }  
-
-    public void run() {  
-        InputStreamReader isr = null;  
-        BufferedReader br = null;  
-        PrintWriter pw = null;  
-        try {  
-            if (os != null)  
-                pw = new PrintWriter(os);  
-
-            isr = new InputStreamReader(is);  
-            br = new BufferedReader(isr);  
-            String line=null;  
-            while ( (line = br.readLine()) != null) {  
-                if (pw != null)  
-                    pw.println(line);  
-                System.out.println(type + ">" + line);      
-            }  
-
-            if (pw != null)  
-                pw.flush();  
-        } catch (IOException ioe) {  
-            ioe.printStackTrace();    
-        } finally{  
-            try {  
-            	if(pw!=null)
-            	{
-            		 pw.close();  
-            	}
-            	if(br!=null)
-            	{
-            		br.close();  
-            	}
-            	if(isr!=null)
-            	{
-            		isr.close();  
-            	}
-            } catch (IOException e) {  
-                e.printStackTrace();  
-            }  
-        }  
-    }  
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/StreamGobblerLine.java

@@ -1,79 +0,0 @@
-package com.gis.util;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.*;
-
-@Slf4j
-public class StreamGobblerLine extends Thread {
-
-	InputStream is;
-    String type;
-    OutputStream os;
-    Integer lineSize;  // 多少行打印日志一次
-
-    public StreamGobblerLine(InputStream is, String type) {
-        this(is, type, null, null);
-    }
-
-    public StreamGobblerLine(InputStream is, String type, Integer lineSize) {
-        this(is, type, null, lineSize);
-    }
-
-    StreamGobblerLine(InputStream is, String type, OutputStream redirect, Integer lineSize) {
-        this.is = is;  
-        this.type = type;  
-        this.os = redirect;
-        this.lineSize = lineSize;
-    }  
-
-    public void run() {
-        log.info("run StreamGobblerLine");
-
-        InputStreamReader isr = null;  
-        BufferedReader br = null;  
-        PrintWriter pw = null;  
-        try {  
-            if (os != null)  
-                pw = new PrintWriter(os);  
-
-            isr = new InputStreamReader(is);  
-            br = new BufferedReader(isr);  
-            String line=null;
-            int i = 1;
-            while ( (line = br.readLine()) != null) {
-                if (lineSize != null) {
-                    if (i % lineSize == 0) {
-                        log.info(type + "," + i +" : >" + line);
-                    }
-                } else {
-                    log.info(type + ","  + i +" : >" + line);
-                }
-                i++;
-
-            }
-
-            if (pw != null)  
-                pw.flush();  
-        } catch (IOException ioe) {  
-            ioe.printStackTrace();    
-        } finally{  
-            try {  
-            	if(pw!=null)
-            	{
-            		 pw.close();  
-            	}
-            	if(br!=null)
-            	{
-            		br.close();  
-            	}
-            	if(isr!=null)
-            	{
-            		isr.close();  
-            	}
-            } catch (IOException e) {  
-                e.printStackTrace();  
-            }  
-        }  
-    }  
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/testUtil.java

@@ -1,18 +0,0 @@
-package com.gis.util;
-
-import com.alibaba.fastjson.JSONObject;
-import com.gis.dto.SceneQueueDTO;
-
-/**
- * @author Xiewj
- * @date 2025/3/21
- */
-public class testUtil {
-    public static void main(String[] args) {
-        SceneQueueDTO d=new SceneQueueDTO();
-        d.setSceneCode("123");
-        d.setLocation(2);
-        System.out.println(JSONObject.toJSONString(d));
-
-    }
-}

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/vo/WorkCustomMaskVO.java

@@ -1,45 +0,0 @@
-package com.gis.vo;
-
-import com.gis.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 遮罩设置表
- *
- * @author Xiewj
- * @since 2023-09-06 14:37
- */
-@Data
-public class WorkCustomMaskVO extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty("wordid")
-    private String workId;
-
-    @ApiModelProperty("导航id")
-    private Long navigationId;
-
-    @ApiModelProperty("素材id")
-    private Long fodderId;
-
-    @ApiModelProperty("图片地址")
-    private String icon;
-
-    @ApiModelProperty("开关 默认false")
-    private Boolean isShow;
-
-    @ApiModelProperty("类型 earth sky")
-    private String type;
-
-    @ApiModelProperty("随着场景转动")
-    private Boolean antidistorted;
-
-    @ApiModelProperty("缩放")
-    private Double scale;
-
-}

720yun_fd_consumer/gis_consumer_oss/pom.xml

@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>720yun_fd_consumer</artifactId>
-        <groupId>com.gis</groupId>
-        <version>1.0.0</version>
-    </parent>
-
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>gis_consumer_oss</artifactId>
-    <version>1.1.1</version>
-    <packaging>jar</packaging>
-
-
-    <dependencies>
-
-
-
-
-
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
-
-
-
-        <!--springboot-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- JPA -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!--springboot中的redis依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
-        <!-- mysql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!--阿里数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-
-
-        <!-- knife4j aip 包-->
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- 工具类 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-
-
-
-
-
-        <!-- jwt -->
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
-
-        <!--&lt;!&ndash;AliYun sdk&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>com.aliyun</groupId>-->
-            <!--<artifactId>aliyun-java-sdk-core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.aliyun</groupId>-->
-            <!--<artifactId>aliyun-java-sdk-dysmsapi</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.aliyun.oss</groupId>-->
-            <!--<artifactId>aliyun-sdk-oss</artifactId>-->
-        <!--</dependency>-->
-
-
-
-        <!--分页插件-->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-
-        <!--rabbit MQ-->
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-rabbitmq</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-filestorage</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.iherus</groupId>
-            <artifactId>qrext4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
-            <version>${aws.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.qcloud/cos_api -->
-        <dependency>
-            <groupId>com.qcloud</groupId>
-            <artifactId>cos_api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>okio</artifactId>
-                    <groupId>com.squareup.okio</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>okhttp</artifactId>
-                    <groupId>com.squareup.okhttp3</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>tlog-all-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-        </dependency>
-    </dependencies>
-
-
-</project>

720yun_fd_consumer/gis_consumer_oss/src/main/java/com/gis/oss/command/CmdUtils.java

@@ -1,68 +0,0 @@
-package com.gis.oss.command;
-
-import cn.hutool.core.util.RuntimeUtil;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * Created by owen on 2021/1/4 0004 14:53
- */
-@Slf4j
-public class CmdUtils {
-
-
-    /**
-     * 调用算法 xx.sh 脚本
-     * @param command
-     */
-    public static void callShell(String command){
-        log.info("cmd: {}", command);
-        try {
-            String[] cmd = new String[]{"/bin/sh", "-c", command};
-            Process process = Runtime.getRuntime().exec(cmd);
-            StreamGobblerLine errorGobbler = new StreamGobblerLine(process.getErrorStream(), "ERROR");
-            errorGobbler.start();
-            StreamGobblerLine outGobbler = new StreamGobblerLine(process.getInputStream(), "STDOUT");
-            outGobbler.start();
-            process.waitFor();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-
-    public static void callLine(String command){
-        callLine(command, null);
-
-    }
-
-    /**
-     *
-     * @param command 命令
-     * @param lineSize 日志输出行数 ，可以为null
-     */
-    public static void callLine(String command, Integer lineSize){
-        log.info("cmd: " + command);
-        try {
-            Process process = Runtime.getRuntime().exec(command);
-            log.info("开始运行");
-            StreamGobblerLine errorGobbler = new StreamGobblerLine(process.getErrorStream(), "ERROR");
-            errorGobbler.start();
-            // 200行打印一次日志
-            StreamGobblerLine outGobbler = new StreamGobblerLine(process.getInputStream(), "STDOUT", lineSize);
-            outGobbler.start();
-            process.waitFor();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-
-
-}

720yun_fd_consumer/gis_consumer_oss/src/main/java/com/gis/oss/command/StreamGobblerLine.java

@@ -1,79 +0,0 @@
-package com.gis.oss.command;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.*;
-
-@Slf4j
-public class StreamGobblerLine extends Thread {
-
-	InputStream is;
-    String type;
-    OutputStream os;
-    Integer lineSize;  // 多少行打印日志一次
-
-    public StreamGobblerLine(InputStream is, String type) {
-        this(is, type, null, null);
-    }
-
-    public StreamGobblerLine(InputStream is, String type, Integer lineSize) {
-        this(is, type, null, lineSize);
-    }
-
-    StreamGobblerLine(InputStream is, String type, OutputStream redirect, Integer lineSize) {
-        this.is = is;  
-        this.type = type;  
-        this.os = redirect;
-        this.lineSize = lineSize;
-    }  
-
-    public void run() {
-        log.info("run StreamGobblerLine");
-
-        InputStreamReader isr = null;  
-        BufferedReader br = null;  
-        PrintWriter pw = null;  
-        try {  
-            if (os != null)  
-                pw = new PrintWriter(os);  
-
-            isr = new InputStreamReader(is);  
-            br = new BufferedReader(isr);  
-            String line=null;
-            int i = 1;
-            while ( (line = br.readLine()) != null) {
-                if (lineSize != null) {
-                    if (i % lineSize == 0) {
-                        log.info(type + "," + i +" : >" + line);
-                    }
-                } else {
-                    log.info(type + ","  + i +" : >" + line);
-                }
-                i++;
-
-            }
-
-            if (pw != null)  
-                pw.flush();  
-        } catch (IOException ioe) {  
-            ioe.printStackTrace();    
-        } finally{  
-            try {  
-            	if(pw!=null)
-            	{
-            		 pw.close();  
-            	}
-            	if(br!=null)
-            	{
-            		br.close();  
-            	}
-            	if(isr!=null)
-            	{
-            		isr.close();  
-            	}
-            } catch (IOException e) {  
-                e.printStackTrace();  
-            }  
-        }  
-    }  
-}

720yun_fd_consumer/gis_consumer_oss/src/main/java/com/gis/oss/util/FileAndOssUtil.java

@@ -1,91 +0,0 @@
-package com.gis.oss.util;
-
-import com.aliyun.oss.OSSClient;
-import com.fdkankan.filestorage.FileStorageTemplate;
-import com.gis.oss.constant.StorageType;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.*;
-
-@Slf4j
-@Component
-public class FileAndOssUtil {
-	@Resource
-	private FileStorageTemplate ossUtil;
-
-	/**
-	 * oss文件上传命令
-	 * 第一个参数是oss路径，要包含bucket名称
-	 * 第二个参数是本地文件路径
-	 */
-	private static final String UPLOAD_SH = "bash /opt/ossutil/upload.sh %s %s";
-	public void upload(String bucket,byte[] data,String key1) throws IOException{
-//		log.info("开始上传文件 源路径：{},目标路径：{}, type:{}" , new String(data, "UTF-8"), key1, type);
-		log.info("开始上传文件 ,目标路径：{}, type:{}" ,  key1);
-		ossUtil.uploadFileBytes(bucket,key1,data);
-	}
-	//上传的数据是byte[]，key是上传后的文件名
-	public void upload(byte[] data,String key1) throws IOException{
-		log.info("开始上传文件 ,目标路径：{}, type:{}" ,  key1);
-		ossUtil.uploadFileBytes(key1,data);
-	}
-
-	public void upload(String filePath, String key1) {
-		log.info("开始上传文件 源路径：{},目标路径：{}" , filePath, key1);
-		ossUtil.uploadFile(key1,filePath);
-	}
-
-	/**
-	 * 通过脚本上传
-	 * @param filePath
-	 * @param key
-	 */
-	public void uploadBySh(String filePath, String key) {
-		log.info("开始上传文件 源路径：{},目标路径：{}, type:{}" , filePath, key);
-		OssShUtil.yunUpload(filePath,key);
-	}
-	/**
-	 * 通过脚本上传
-	 * @param filePath
-	 * @param key
-	 * @param bucket
-	 * @param active
-	 */
-	public void uploadBySh(String filePath,String key,String bucket,String active) {
-		log.info("开始上传文件 源路径：{},目标路径：{}, type:{}" , filePath, key);
-		OssShUtil.yunUpload(filePath,key,bucket,active);
-	}
-	/**
-	 * 通过脚本上传
-	 * @param filePath
-	 * @param key
-	 * @param bucket
-	 * @param active
-	 */
-	public void downloadBySh(String key,String filePath,String bucket,String active) {
-		log.info("开始上传文件 源路径：{},目标路径：{}, type:{}" , filePath, key);
-		OssShUtil.yunDownloadOther(key,filePath,bucket,active);
-	}
-	/**
-	 * 获取文件内容-阿里云
-	 * @param objectName
-	 * @return
-	 */
-	public boolean existKey(String bucket,String objectName){
-		//创建oss客户端
-		// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
-		try{
-			boolean exist = ossUtil.doesObjectExist(bucket, objectName);
-			return exist;
-		}catch (Exception e){
-			log.error("s4判断是否存在key异常,key=" + objectName, e);
-		}
-		return false;
-	}
-
-	public void downloadFile(String bucket, String ossKey, String filePath) {
-		ossUtil.downloadFile(bucket,ossKey,filePath);
-	}
-}

720yun_fd_consumer/pom.xml

@@ -10,262 +10,12 @@
     <version>1.0.0</version>
     <modules>
         <module>gis_consumer</module>
-        <module>gis_consumer_oss</module>
     </modules>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.4.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>com.gis</groupId>
+        <artifactId>720yun_fd</artifactId>
+        <version>1.0.0</version>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <spring.boot.version>2.3.4.RELEASE</spring.boot.version>
-        <gis.version>1.0.0</gis.version>
-        <fastjson.version>1.2.83</fastjson.version>
-        <druid.version>1.1.14</druid.version>
-        <hutool.version>5.8.22</hutool.version>
-        <lombok.version>1.18.2</lombok.version>
-        <lang3.version>3.7</lang3.version>
-        <mysql.version>8.0.15</mysql.version>
-        <shiro.version>1.3.2</shiro.version>
-        <jwt.version>3.2.0</jwt.version>
-        <jjwt.version>0.6.0</jjwt.version>
-        <pagehelper.version>1.4.6</pagehelper.version>
-        <knife4j.version>3.0.3</knife4j.version>
-        <junit.version>4.12</junit.version>
-        <qrext4j.version>1.3.1</qrext4j.version>
-        <tlog-all-spring-boot-starter.version>1.5.0</tlog-all-spring-boot-starter.version>
-
-
-
-        <minio.version>8.2.2</minio.version>
-        <aws.version>1.12.481</aws.version>
-        <cos.version>5.6.166</cos.version>
-        <aliyun-sdk-oss.version>3.15.1</aliyun-sdk-oss.version>
-
-        <mybatisPlus.version>3.5.2</mybatisPlus.version>
-
-    </properties>
-
-
-    <!--dependencyManagement用于管理依赖版本号, 必须写版本号，不然依赖不上-->
-    <dependencyManagement>
-        <dependencies>
-
-
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_consumer_oss</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_consumer</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-
-            <!-- springboot -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-data-jpa</artifactId>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-web</artifactId>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-test</artifactId>
-                <scope>test</scope>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <!--springboot中的redis依赖-->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-data-redis</artifactId>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-
-            <!--rabbit MQ-->
-            <dependency>
-                <groupId>com.fdkankan</groupId>
-                <artifactId>4dkankan-utils-rabbitmq</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fdkankan</groupId>
-                <artifactId>4dkankan-utils-filestorage</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-            </dependency>
-            <!-- lombok -->
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-            </dependency>
-
-            <!-- fastjson -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-
-            <!--阿里数据库连接池 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>${druid.version}</version>
-            </dependency>
-
-            <!-- mysql -->
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql.version}</version>
-            </dependency>
-
-            <!-- 工具类 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-all</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
-            <!-- StringUtils -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${lang3.version}</version>
-            </dependency>
-
-            <!-- knife4j aip 包-->
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>${knife4j.version}</version>
-            </dependency>
-
-            <!-- shiro -->
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-spring</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
-
-
-            <!-- jwt -->
-            <dependency>
-                <groupId>com.auth0</groupId>
-                <artifactId>java-jwt</artifactId>
-                <version>${jwt.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jjwt.version}</version>
-            </dependency>
-
-
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>${mybatisPlus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-                <version>${mybatisPlus.version}</version>
-            </dependency>
-
-            <!--分页插件-->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.iherus</groupId>
-                <artifactId>qrext4j</artifactId>
-                <version>${qrext4j.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-s3</artifactId>
-                <version>${aws.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/com.qcloud/cos_api -->
-            <dependency>
-                <groupId>com.qcloud</groupId>
-                <artifactId>cos_api</artifactId>
-                <version>${cos.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>okio</artifactId>
-                        <groupId>com.squareup.okio</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>okhttp</artifactId>
-                        <groupId>com.squareup.okhttp3</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.oss</groupId>
-                <artifactId>aliyun-sdk-oss</artifactId>
-                <version>${aliyun-sdk-oss.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.minio</groupId>
-                <artifactId>minio</artifactId>
-                <version>${minio.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib</artifactId>
-                <version>1.3.70</version>
-            </dependency>
-            <dependency>
-                <groupId>com.yomahub</groupId>
-                <artifactId>tlog-all-spring-boot-starter</artifactId>
-                <version>${tlog-all-spring-boot-starter.version}</version>
-            </dependency>
-        </dependencies>
-
-    </dependencyManagement>
-
-    <!--<build>-->
-        <!--<plugins>-->
-            <!--<plugin>-->
-                <!--<groupId>org.springframework.boot</groupId>-->
-                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-            <!--</plugin>-->
-        <!--</plugins>-->
-        <!--<finalName>720yun_fd_consumer</finalName>-->
-    <!--</build>-->
-
-
 </project>

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

@@ -27,27 +27,21 @@ server:
         path: /data/${project.name}_data/
 spring:
     datasource:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        druid:
-            initial-size: 5
-            max-active: 20
-            max-evictable-idle-time-millis: 90000
-            max-wait: 60000
-            min-evictable-idle-time-millis: 30000
-            min-idle: 10
-            password: JK123456%JIK
-            stat-view-servlet:
-                enabled: true
-            test-on-borrow: false
-            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&useSSL=false
-            username: root
-            validation-query: SELECT 1 FROM DUAL
-            web-stat-filter:
-                enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
+        dynamic:
+            primary: db1
+            strict: false
+            datasource:
+                db1:
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://120.25.146.52:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+                    username: root
+                    password: JK123456%JIK
+                db2:
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://120.24.144.164:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+                    username: root
+                    password: 4Dage@4Dage#@168
     rabbitmq:
         host: 120.24.144.164
         port: 5672

720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/CmdConstant.java

@@ -24,4 +24,16 @@ public class CmdConstant {
      * ffmpeg -i bb.mp4 -y -vframes 1 -vf scale=100:100/a thumb.jpg
      */
     public final static String FFMPEG_FIRST = "ffmpeg -i @inPath -ss 00:00:01 -vframes 1 @outPath -y ";
+
+
+    /**
+     * 用脚本的好处会自动结束线程， java直接跑命令容易出问题
+     * 调用oss上传目录脚本
+     * bash /opt/ossutil/ossupload.sh @dir @ossDir
+     *  bash /opt/ossutil/ossupload.sh /mnt/720yun_fd_manage_data/fd720_1A4Tba8mA 720yun_fd_manage/fd720_1A4Tba8mA
+     */
+//    public final static String OSSUTIL_UPLOAD_DIR = "bash /opt/ossutil/ossupload.sh /mnt/720yun_fd_manage_data/@sceneCode 720yun_fd_manage/@sceneCode";
+//    public final static String OSSUTIL_UPLOAD_DIR = "bash /root/user/java/720yun_fd_consumer_8002/ossupload.sh /mnt/720yun_fd_manage_data/@sceneCode 720yun_fd_manage/@sceneCode";
+    public final static String OSSUTIL_UPLOAD_DIR = "bash /mnt/720yun_fd_manage_data/baseData/ossupload.sh /mnt/720yun_fd_manage_data/@sceneCode 720yun_fd_manage/@sceneCode";
+
 }

720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/CmdUtils.java

@@ -145,7 +145,26 @@ public class CmdUtils {
         }
     }
 
+    /**
+     *
+     * @param command 命令
+     * @param lineSize 日志输出行数 ，可以为null
+     */
+    public static void callLine(String command, Integer lineSize) {
+        log.info("cmd: " + command);
+        try {
+            Process process = Runtime.getRuntime().exec(command);
+            log.info("开始运行");
+            StreamGobbler errorGobbler = new StreamGobbler(process.getErrorStream(), "ERROR");
+            errorGobbler.start();
+            // 200行打印一次日志
+            StreamGobblerLine outGobbler = new StreamGobblerLine(process.getInputStream(), "STDOUT", lineSize);
+            outGobbler.start();
+            process.waitFor();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-
+    }
 
 }

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/util/JwtUtil.java

@@ -1,9 +1,9 @@
-package com.gis.util;
+package com.gis.common.util;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.gis.exception.BaseRuntimeException;
+import com.gis.common.exception.BaseRuntimeException;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.Jwts;

720yun_fd_manage/pom.xml

@@ -11,329 +11,23 @@
     <version>1.0.0</version>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <!--<version>2.1.0.RELEASE</version>-->
-        <version>2.3.4.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>com.gis</groupId>
+        <artifactId>720yun_fd</artifactId>
+        <version>1.0.0</version>
     </parent>
 
     <modules>
         <module>gis_common</module>
         <module>gis_web</module>
-        <module>gis_domain</module>
-        <module>gis_service</module>
-        <module>gis_mapper</module>
         <module>gis_application</module>
-        <module>gis_oss</module>
         <module>gis_generate</module>
     </modules>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring.boot.version>2.3.4.RELEASE</spring.boot.version>
-        <gis.version>1.0.0</gis.version>
-        <fastjson.version>1.2.83</fastjson.version>
-        <druid.version>1.1.14</druid.version>
-        <hutool.version>5.8.22</hutool.version>
-        <lombok.version>1.18.2</lombok.version>
-        <lang3.version>3.7</lang3.version>
-        <mysql.version>8.0.15</mysql.version>
-        <shiro.version>1.3.2</shiro.version>
-        <jwt.version>3.2.0</jwt.version>
-        <jjwt.version>0.6.0</jjwt.version>
-
-        <pagehelper.version>1.2.5</pagehelper.version>
-        <knife4j.version>2.0.2</knife4j.version>
-        <mybatisPlus.version>3.5.3.2</mybatisPlus.version>
-        <pagehelper.version>1.4.6</pagehelper.version>
-        <knife4j.version>3.0.3</knife4j.version>
-        <junit.version>4.12</junit.version>
-        <zxing.version>3.3.3</zxing.version>
-
-        <nacos-discovery-spring-boot.version>0.2.1</nacos-discovery-spring-boot.version>
-        <tlog-all-spring-boot-starter.version>1.5.0</tlog-all-spring-boot-starter.version>
-        <forest-spring-boot-starter.version>1.5.30</forest-spring-boot-starter.version>
-
-        <!-- 打包跳过测试用例 -->
-        <skipTests>true</skipTests>
-
-        <qrext4j.version>1.3.1</qrext4j.version>
-
-
-        <minio.version>8.2.2</minio.version>
-        <aws.version>1.12.481</aws.version>
-        <cos.version>5.6.166</cos.version>
-        <aliyun-sdk-oss.version>3.15.1</aliyun-sdk-oss.version>
-
     </properties>
 
 
 
-    <!--dependencyManagement用于管理依赖版本号, 必须写版本号，不然依赖不上-->
-    <dependencyManagement>
-
-        <dependencies>
-
-
-            <!--模块版本管理-->
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_application</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_common</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_domain</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_service</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_mapper</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_web</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.gis</groupId>
-                <artifactId>gis_oss</artifactId>
-                <version>${gis.version}</version>
-            </dependency>
-
-
-            <!-- springboot -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-data-jpa</artifactId>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-web</artifactId>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-test</artifactId>
-                <scope>test</scope>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <!--询资料发现从SpringBoot 2.3.0之后放弃了默认对javax.validation 的支持-->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-validation</artifactId>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <!--springboot中的redis依赖-->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-data-redis</artifactId>
-                <version>${spring.boot.version}</version>
-            </dependency>
-
-            <!-- lombok -->
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-            </dependency>
-
-            <!-- fastjson -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-
-            <!--阿里数据库连接池 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>${druid.version}</version>
-            </dependency>
-
-            <!-- mysql -->
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql.version}</version>
-            </dependency>
-
-            <!-- 工具类 -->
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-all</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
-            <!-- StringUtils -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${lang3.version}</version>
-            </dependency>
-
-            <!-- knife4j aip 包-->
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>${knife4j.version}</version>
-            </dependency>
-
-            <!-- shiro -->
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-spring</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-core</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-web</artifactId>
-                <version>${shiro.version}</version>
-            </dependency>
-
-
-            <!-- jwt -->
-            <dependency>
-                <groupId>com.auth0</groupId>
-                <artifactId>java-jwt</artifactId>
-                <version>${jwt.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jjwt.version}</version>
-            </dependency>
-
-
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>${mybatisPlus.version}</version>
-            </dependency>
-
-            <!--mybatis-plus代码生成器-->
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-generator</artifactId>
-                <scope>compile</scope>
-                <version>${mybatisPlus.version}</version>
-<!--                <version>3.5.1</version>-->
-            </dependency>
-
-
-            <!--分页插件-->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
-
-
-            <!-- 二维码 -->
-            <dependency>
-                <groupId>com.google.zxing</groupId>
-                <artifactId>core</artifactId>
-                <version>${zxing.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.yomahub</groupId>
-                <artifactId>tlog-all-spring-boot-starter</artifactId>
-                <version>${tlog-all-spring-boot-starter.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.dtflys.forest</groupId>
-                <artifactId>forest-spring-boot-starter</artifactId>
-                <version>${forest-spring-boot-starter.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.iherus</groupId>
-                <artifactId>qrext4j</artifactId>
-                <version>${qrext4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fdkankan</groupId>
-                <artifactId>4dkankan-utils-rabbitmq</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fdkankan</groupId>
-                <artifactId>4dkankan-utils-filestorage</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-s3</artifactId>
-                <version>${aws.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/com.qcloud/cos_api -->
-            <dependency>
-                <groupId>com.qcloud</groupId>
-                <artifactId>cos_api</artifactId>
-                <version>${cos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.oss</groupId>
-                <artifactId>aliyun-sdk-oss</artifactId>
-                <version>${aliyun-sdk-oss.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.minio</groupId>
-                <artifactId>minio</artifactId>
-                <version>${minio.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>okio</artifactId>
-                        <groupId>com.squareup.okio</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>okhttp</artifactId>
-                        <groupId>com.squareup.okhttp3</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-
 </project>

720yun_fd_manage/gis_domain/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>720yun_fd_manage</artifactId>
+        <artifactId>720yun_fd</artifactId>
         <groupId>com.gis</groupId>
         <version>1.0.0</version>
     </parent>