修改 mybatisplus

720yun_fd_manage/.gitignore

@@ -0,0 +1,49 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.sysLog
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+../.idea
+*.iml
+out
+gen
+rebel.xml
+!/target/
+
+
+*.iws
+*.ipr
+!/.gitignore
+!/logs/
+/gis_application/target/
+/gis_common/target/
+/gis_domain/target/
+/gis_mapper/target/
+/gis_oss/target/
+/gis_service/target/
+/gis_web/target/
+target/

720yun_fd_manage/gis_application/src/main/java/com/gis/GisApplication.java

@@ -1,13 +1,15 @@
 package com.gis;
 
 import com.dtflys.forest.springboot.annotation.ForestScan;
+import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
-@SpringBootApplication
 @ForestScan(basePackages = "com.gis.common.httpclient")
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, PageHelperAutoConfiguration.class})
 public class GisApplication {
 
     public static void main(String[] args) {

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

@@ -88,3 +88,21 @@ forest:
     log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
     base-address-scheme: https
     base-address-host: test.4dkankan.com
+# MyBatis配置
+mybatis-plus:
+    configuration:
+        log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+        map-underscore-to-camel-case: true
+        cache-enabled: false
+        call-setters-on-nulls: true
+        jdbc-type-for-null: 'null'
+    global-config:
+        db-config:
+            db-type: mysql
+            field-strategy: not_null
+            id-type: auto
+            logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+            logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+            table-underline: true
+    mapper-locations: classpath*:mapper/**/*Mapper.xml
+    typeAliasesPackage: com.gis.**.domain

720yun_fd_manage/gis_common/pom.xml

@@ -132,13 +132,11 @@
         </dependency>
 
 
-        <!--tk.mybatis 依赖-->
         <dependency>
-            <groupId>tk.mybatis</groupId>
-            <artifactId>mapper-spring-boot-starter</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
-
         <!--分页插件-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>

720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/MyBatisPlusConfig.java

@@ -0,0 +1,48 @@
+package com.gis.common.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_manage/gis_common/src/main/java/com/gis/common/handler/MyMetaObjectHandler.java

@@ -0,0 +1,33 @@
+package com.gis.common.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.time.LocalDateTime;
+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_manage/gis_domain/src/main/java/com/gis/domain/dto/WordAllDto.java

@@ -0,0 +1,38 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Xiewj
+ * @date 2023/9/6
+ */
+@Data
+public class WordAllDto {
+
+    @ApiModelProperty(value = "作品基础信息 作品设置")
+    private WorkNewDto workInfo;
+
+    @ApiModelProperty(value = "开场提示")
+    private WorkOpeningTipDTO workOpeningTipInfo;
+
+    @ApiModelProperty(value = "开场动画")
+    private WorkOpeningAnimationdDto workOpeningAnimationInfo;
+
+    @ApiModelProperty(value = "开场封面")
+    private WorkCoverTypeDto workCoverTypeInfo;
+
+    @ApiModelProperty(value = "背景音乐")
+    private WorkBackgroundMusicDto workBackgroundMusicInfo;
+
+    @ApiModelProperty(value = "自定义logo")
+    private WorkLogoDto workLogoInfo;
+
+    @ApiModelProperty(value = "自定义遮罩")
+    private WorkCustomMaskDTO customMaskInfo;
+
+    @ApiModelProperty(value = "自定义按钮")
+    private WorkCustomButtonDto workCustomButtonInfo;
+
+}

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

@@ -0,0 +1,18 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2021/2/22 0028 16:36
+ */
+@Data
+public class WorkAddDto {
+
+    @ApiModelProperty(value = "封面图")
+    private String icon;
+
+    @ApiModelProperty(value = "场景密码")
+    private String password;
+
+}

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

@@ -0,0 +1,35 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 背景音乐表
+ *
+ * @author Xiewj
+ * @since 2023-09-05 20:57
+ */
+@Data
+@ApiModel("背景音乐表")
+public class WorkBackgroundMusicDto {
+
+    @ApiModelProperty(value = "对象ID")
+    private Long id;
+
+    @ApiModelProperty("wordid")
+    private String workId;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("oss 路径 ")
+    private String ossPath;
+
+    @ApiModelProperty("fodder_id")
+    private String fodderId;
+}

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

@@ -0,0 +1,104 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 开场动画表
+ *
+ * @author Xiewj
+ * @since 2023-09-05 19:21
+ */
+@Data
+@ApiModel("开场封面表")
+public class WorkCoverTypeDto {
+    @ApiModelProperty(value = "对象ID")
+    private Long id;
+    @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 int videoMoId;
+    @ApiModelProperty("关联fodderId")
+    private int cover_mo_id;
+
+    @ApiModelProperty("关联fodderId")
+    private int video_pc_id;
+
+    @ApiModelProperty("关联fodderId")
+    private int cover_pc_id;
+
+    @ApiModelProperty("fodderId集合 ")
+    //string fodderId = string.Join(",", myList.Select(x => x.ToString()).ToArray());
+    private List<String> fodderId;
+
+}

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

@@ -0,0 +1,44 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+/**
+ * 自定义按钮设置表
+ *
+ * @author Xiewj
+ * @since 2023-09-06 14:50
+ */
+@Data
+@ApiModel("自定义按钮设置表")
+public class WorkCustomButtonDto  {
+
+    @ApiModelProperty(value = "对象ID")
+    private Long id;
+
+    @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_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomMaskDTO.java

@@ -0,0 +1,20 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.WorkCustomMaskEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Xiewj
+ * @date 2023/9/6
+ */
+@Data
+@ApiModel("CustomMask")
+public class WorkCustomMaskDTO {
+
+   @ApiModelProperty(value = "下层")
+   WorkCustomMaskEntity earth;
+   @ApiModelProperty(value = "上层")
+   WorkCustomMaskEntity sky;
+}

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

@@ -0,0 +1,39 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+/**
+ * logo表
+ *
+ * @author Xiewj
+ * @since 2023-09-06 10:21
+ */
+@Data
+@ApiModel("logo表")
+public class WorkLogoDto   {
+
+    @ApiModelProperty(value = "对象ID")
+    private Long id;
+
+    @ApiModelProperty(value = "关联作品id")
+    private String workId;
+
+    @ApiModelProperty("wordid")
+    private String logo;
+
+    @ApiModelProperty("开关 默认1")
+    private Integer isLogo;
+
+    @ApiModelProperty(" 默认false")
+    private Boolean logoChange;
+
+}

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

@@ -0,0 +1,66 @@
+package com.gis.domain.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.gis.domain.entity.BaseStrEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 作品表
+ */
+@Data
+public class WorkNewDto    {
+
+    @ApiModelProperty(value = "id, 修改时必须传，新增忽略", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "状态, 0:默认不显示， 1：显示")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建人")
+    private String userId;
+
+
+    @ApiModelProperty(value = "访问量")
+    private Integer visit;
+
+    @JSONField(serialize = false)
+    @ApiModelProperty(value = "作品密码， 默认0：不需要密码")
+    private String password;
+
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
+
+    @ApiModelProperty(value = "二维码英文")
+    private String qrENCode;
+
+    @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 = "简介")
+    private String description;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "封面图")
+    private String icon;
+
+    @ApiModelProperty(value = " 0/1 进入全景图自动巡游开关 默认1")
+    private Integer isAuto;
+}

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

@@ -0,0 +1,35 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+/**
+ * 开场动画表
+ *
+ * @author Xiewj
+ * @since 2023-09-05 19:21
+ */
+@Data
+public class WorkOpeningAnimationdDto   {
+
+    @ApiModelProperty(value = "对象ID")
+    private Long id;
+
+    @ApiModelProperty("显示开场动画按钮 默认 true ")
+    private Integer openingAnimationType;
+
+    @ApiModelProperty("小行星开场:1,小行星巡游开场 :2,小行星缩放开场:3,水平巡游开场:4,水晶球开场:5 默认1")
+    private Boolean isShowOpeningAnimation;
+
+    @ApiModelProperty(value = "关联作品id")
+    private String workId;
+
+}

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

@@ -0,0 +1,42 @@
+package com.gis.domain.dto;
+
+import com.gis.domain.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 作品表
+ */
+@Data
+public class WorkOpeningTipDTO   {
+
+    @ApiModelProperty(value = "对象ID")
+    private Long id;
+
+    @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_manage/gis_domain/src/main/java/com/gis/domain/entity/BaseEntity.java

@@ -1,6 +1,7 @@
 package com.gis.domain.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;
@@ -13,7 +14,7 @@ import java.util.Date;
 public abstract class BaseEntity {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @TableId(value = "id", type = IdType.AUTO)
     @Column(name = "id")
     @ApiModelProperty(value = "对象ID")
     private Long id;
@@ -21,11 +22,13 @@ public abstract class BaseEntity {
     @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;
 
     /**
@@ -34,7 +37,7 @@ public abstract class BaseEntity {
      * 需要使用对象类型
      */
     @JsonIgnore
-    @JSONField(serialize = false)
+    @TableLogic(value = "0",delval = "1")
     private Integer isDelete;
 
 

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/BaseStrEntity.java

@@ -1,6 +1,9 @@
 package com.gis.domain.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;
@@ -20,11 +23,13 @@ public abstract class BaseStrEntity {
     @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;
 
     /**
@@ -34,6 +39,7 @@ public abstract class BaseStrEntity {
      */
     @JsonIgnore
     @JSONField(serialize = false)
+    @TableLogic(value = "0",delval = "1")
     private Integer isDelete;
 
 

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/DirEntity.java

@@ -1,5 +1,6 @@
 package com.gis.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +15,7 @@ import java.util.List;
  */
 @Data
 @Entity
-@Table(name = "tb_dir")
+@TableName( "tb_dir")
 public class DirEntity extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 4942917362578018318L;

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/FodderEntity.java

@@ -1,5 +1,7 @@
 package com.gis.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,7 +12,7 @@ import java.io.Serializable;
 
 @Data
 @Entity
-@Table(name = "tb_fodder")
+@TableName("tb_fodder")
 public class FodderEntity extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -1428200960867373738L;
 
@@ -53,6 +55,7 @@ public class FodderEntity extends BaseEntity implements Serializable {
 
     @Transient
     @ApiModelProperty(value = "该作品下的场景是否已使用")
+    @TableField(exist = false)
     private Integer isUse = 0;
 
     @ApiModelProperty(value = "上传临时用的id, 前端需要用")
@@ -66,6 +69,7 @@ public class FodderEntity extends BaseEntity implements Serializable {
 
     @Transient
     @ApiModelProperty(value = "目录名称")
+    @TableField(exist = false)
     private String dirName;
 
 

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/ReportEntity.java

@@ -1,5 +1,6 @@
 package com.gis.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +14,7 @@ import java.time.LocalDate;
  */
 @Data
 @Entity
-@Table(name = "tb_report")
+@TableName( "tb_report")
 public class ReportEntity extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 220679941563701980L;

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/SysUserEntity.java

@@ -1,6 +1,7 @@
 package com.gis.domain.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @Entity
-@Table(name = "tb_user")
+@TableName( "tb_user")
 public class SysUserEntity extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -853504493430501564L;

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkBackgroundMusicEntity.java

@@ -0,0 +1,36 @@
+package com.gis.domain.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 背景音乐表
+ *
+ * @author Xiewj
+ * @since 2023-09-05 20:57
+ */
+@Data
+@ApiModel("背景音乐表")
+@TableName( "tb_work_background_music")
+public class WorkBackgroundMusicEntity extends BaseEntity  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("wordid")
+    private String workId;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("oss 路径 ")
+    private String ossPath;
+
+    @ApiModelProperty("fodder_id")
+    private String fodderId;
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkCoverTypeEntity.java

@@ -0,0 +1,103 @@
+package com.gis.domain.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;
+import java.util.List;
+
+/**
+ * 开场动画表
+ *
+ * @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 int videoMoId;
+    @ApiModelProperty("关联fodderId")
+    private int cover_mo_id;
+
+    @ApiModelProperty("关联fodderId")
+    private int video_pc_id;
+
+    @ApiModelProperty("关联fodderId")
+    private int cover_pc_id;
+
+    @ApiModelProperty("fodderId集合 ")
+    //string fodderId = string.Join(",", myList.Select(x => x.ToString()).ToArray());
+    private String fodderId;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkCustomButtonEntity.java

@@ -0,0 +1,41 @@
+package com.gis.domain.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 自定义按钮设置表
+ *
+ * @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_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkCustomMaskEntity.java

@@ -0,0 +1,37 @@
+package com.gis.domain.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 遮罩设置表
+ *
+ * @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("图片地址	")
+    private String icon;
+
+    @ApiModelProperty("开关 默认false")
+    private Boolean isShow;
+
+    @ApiModelProperty("类型 earth sky")
+    private String type;
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkEntity.java

@@ -1,6 +1,8 @@
 package com.gis.domain.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,15 +15,11 @@ import java.io.Serializable;
  */
 @Data
 @Entity
-@Table(name = "tb_work")
+@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;
@@ -29,8 +27,7 @@ public class WorkEntity extends BaseStrEntity implements Serializable {
     @ApiModelProperty(value = "创建人")
     private String userId;
 
-    @ApiModelProperty(value = "封面图")
-    private String icon;
+
 
     @ApiModelProperty(value = "访问量")
     private Integer visit;
@@ -43,6 +40,10 @@ public class WorkEntity extends BaseStrEntity implements Serializable {
     @ApiModelProperty(value = "二维码")
     private String qrCode;
 
+    @ApiModelProperty(value = "二维码英文")
+    @TableField(value = "qr_en_Code")
+    private String qrENCode;
+
     @ApiModelProperty(value = "分享地址（二维码扫描后地址）")
     private String share;
 
@@ -56,6 +57,15 @@ public class WorkEntity extends BaseStrEntity implements Serializable {
     @ApiModelProperty(value = "作品类型：pano:全是全景图 | 4dkk: 全是四维看看 ： mix：混合(pano+4dkk), 通过sceneCodes判断")
     private String type;
 
+    @ApiModelProperty(value = "简介")
+    private String description;
 
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "封面图")
+    private String icon;
 
+    @ApiModelProperty(value = " 0/1 进入全景图自动巡游开关 默认1")
+    private Integer isAuto;
 }

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkHotsFodderEntity.java

@@ -1,5 +1,6 @@
 package com.gis.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import javax.persistence.Entity;
@@ -11,7 +12,7 @@ import java.io.Serializable;
  */
 @Data
 @Entity
-@Table(name = "tb_work_hots_fodder")
+@TableName( "tb_work_hots_fodder")
 public class WorkHotsFodderEntity extends BaseEntity implements Serializable {
 
         private String WorkId;

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkLogoEntity.java

@@ -0,0 +1,34 @@
+package com.gis.domain.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 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;
+
+}

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkOpeningAnimationEntity.java

@@ -0,0 +1,34 @@
+package com.gis.domain.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 开场动画表
+ *
+ * @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_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkOpeningTipEntity.java

@@ -0,0 +1,55 @@
+package com.gis.domain.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_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_manage/gis_mapper/src/main/java/com/gis/mapper/DirMapper.java

@@ -1,6 +1,7 @@
 package com.gis.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.common.mapper.provider.BaseProvider;
 import com.gis.domain.entity.DirEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,9 +11,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 
-@Component
+@Component("DirMapper")
 @Mapper
-public interface DirMapper extends IBaseMapper<DirEntity, Long> {
+public interface DirMapper extends BaseMapper<DirEntity> {
 
     @SelectProvider(type = BaseProvider.class, method = "selectSql")
     void updateParentId(String sqlStr);

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

@@ -1,6 +1,7 @@
 package com.gis.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.common.mapper.provider.BaseProvider;
 import com.gis.domain.dto.FodderPageDto;
 import com.gis.domain.dto.PageDto;
@@ -15,9 +16,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 
-@Component
+@Component("FodderMapper")
 @Mapper
-public interface FodderMapper extends IBaseMapper<FodderEntity, Long> {
+public interface FodderMapper extends BaseMapper<FodderEntity> {
 
 
     @SelectProvider(type = FodderProvider.class, method = "search")

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

@@ -1,18 +0,0 @@
-package com.gis.mapper;
-
-import com.gis.domain.entity.BaseEntity;
-import tk.mybatis.mapper.common.BaseMapper;
-import tk.mybatis.mapper.common.ConditionMapper;
-import tk.mybatis.mapper.common.IdsMapper;
-import tk.mybatis.mapper.common.special.InsertListMapper;
-
-
-import java.io.Serializable;
-
-/**
- * Created by owen on 2020/2/18 0018 11:27
- */
-
-public interface IBaseMapper<T extends BaseEntity, ID extends Serializable> extends BaseMapper<T>,
-        ConditionMapper<T>, IdsMapper<T>, InsertListMapper<T> {
-}

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

@@ -1,17 +0,0 @@
-package com.gis.mapper;
-
-import com.gis.domain.entity.BaseStrEntity;
-import tk.mybatis.mapper.common.BaseMapper;
-import tk.mybatis.mapper.common.ConditionMapper;
-import tk.mybatis.mapper.common.IdsMapper;
-import tk.mybatis.mapper.common.special.InsertListMapper;
-
-import java.io.Serializable;
-
-/**
- * Created by owen on 2020/2/18 0018 11:27
- */
-
-public interface IBaseStrMapper<T extends BaseStrEntity, ID extends Serializable> extends BaseMapper<T>,
-        ConditionMapper<T>, IdsMapper<T>, InsertListMapper<T> {
-}

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

@@ -1,6 +1,7 @@
 package com.gis.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.common.mapper.provider.BaseProvider;
 import com.gis.domain.entity.ReportEntity;
 import com.gis.domain.vo.ReportVo;
@@ -12,9 +13,9 @@ import java.util.List;
 import java.util.Map;
 
 
-@Component
+@Component("ReportMapper")
 @Mapper
-public interface ReportMapper extends IBaseMapper<ReportEntity, Long> {
+public interface ReportMapper extends BaseMapper<ReportEntity> {
 
     @SelectProvider(type = BaseProvider.class, method = "selectSql")
     List<Map> listMapSql(String toString);

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

@@ -1,17 +1,15 @@
 package com.gis.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.domain.entity.SysUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
-@Component
+@Component("SysUserMapper")
 @Mapper
-public interface SysUserMapper extends IBaseMapper<SysUserEntity, Long> {
+public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 
 //    @SelectProvider(type = UserProvider.class, method = "findAllBySearchKey")
 //    List<UserResponse> findAllBySearchKey(String searchKey);

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

@@ -0,0 +1,17 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.entity.WorkBackgroundMusicEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+* 背景音乐表 Mapper
+*
+* @author Xiewj
+* @since 2023-09-05 20:57
+*/
+@Component("WorkBackgroundMusicMapper")
+@Mapper
+public interface WorkBackgroundMusicMapper extends BaseMapper<WorkBackgroundMusicEntity> {
+}

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

@@ -0,0 +1,18 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.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_manage/gis_mapper/src/main/java/com/gis/mapper/WorkCustomButtonMapper.java

@@ -0,0 +1,17 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.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_manage/gis_mapper/src/main/java/com/gis/mapper/WorkCustomMaskMapper.java

@@ -0,0 +1,17 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.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_manage/gis_mapper/src/main/java/com/gis/mapper/WorkHotsFodderMapper.java

@@ -1,23 +1,18 @@
 package com.gis.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.common.mapper.provider.BaseProvider;
-import com.gis.domain.dto.FodderPageDto;
 import com.gis.domain.entity.FodderEntity;
 import com.gis.domain.entity.WorkHotsFodderEntity;
-import com.gis.domain.vo.FodderVo;
-import com.gis.mapper.provider.FodderProvider;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 
-
-@Component
+@Component("WorkHotsFodderMapper")
 @Mapper
-public interface WorkHotsFodderMapper extends IBaseMapper<WorkHotsFodderEntity, Long> {
+public interface WorkHotsFodderMapper extends BaseMapper<WorkHotsFodderEntity> {
 
     @SelectProvider(type = BaseProvider.class, method = "selectSql")
     Integer getCountStr(String sqlStr);

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

@@ -0,0 +1,17 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.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_manage/gis_mapper/src/main/java/com/gis/mapper/WorkMapper.java

@@ -1,6 +1,7 @@
 package com.gis.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.common.mapper.provider.BaseProvider;
 import com.gis.domain.dto.AgePageDto;
 import com.gis.domain.entity.WorkEntity;
@@ -12,9 +13,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 
-@Component
+@Component("WorkMapper")
 @Mapper
-public interface WorkMapper extends IBaseStrMapper<WorkEntity, String> {
+public interface WorkMapper extends BaseMapper<WorkEntity> {
 
     @SelectProvider(type = BaseProvider.class, method = "selectSql")
     Integer getCountStr(String sqlStr);

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

@@ -0,0 +1,17 @@
+package com.gis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.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_manage/gis_mapper/src/main/java/com/gis/mapper/WorkOpeningTipMapper.java

@@ -0,0 +1,20 @@
+package com.gis.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gis.domain.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_manage/gis_oss/src/main/java/com/gis/oss/util/QrCodeUtils.java

@@ -56,7 +56,7 @@ public class QrCodeUtils {
     /**
      * 附带logo小图标二维码
      */
-    public String generateLogoQrCode(String url, String serverBasePath, String ossBasePath, String ossDomain, String id){
+    public String generateLogoQrCode(String url, String serverBasePath, String ossBasePath, String ossDomain, String id,String lang){
         // 保存地址
         String savePath = serverBasePath + id;
 
@@ -78,7 +78,7 @@ public class QrCodeUtils {
         QrCodeUtil.generate(url, QrConfig.create().setImg(logoPath).setWidth(300), FileUtil.file(savePath));
 
         // 二维码上传oss
-        String ossPath = ossBasePath + id + "/qrCode.jpg";
+        String ossPath = ossBasePath + id + "/qrCode_"+lang+".jpg";
         fileAndOssUtil.upload(savePath, ossPath);
         String ossUrl = ossDomain + ossPath;
         log.info("ossUrl: {}", ossUrl);

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

@@ -1,5 +1,6 @@
 package com.gis.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.DirDto;
 import com.gis.domain.dto.DirMoveDto;
@@ -10,7 +11,7 @@ import java.util.List;
 /**
  * Created by owen on 2022/12/1 0001 15:22
  */
-public interface DirService extends IBaseService<DirEntity, Long>{
+public interface DirService extends IService<DirEntity> {
     Result saveEntity(DirDto param);
 
     Result getMyTree(String type);

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

@@ -1,6 +1,7 @@
 package com.gis.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.FodderPageDto;
 import com.gis.domain.dto.FodderUploadDto;
@@ -15,7 +16,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/3/11 0011 16:14
  */
-public interface FodderService extends IBaseService<FodderEntity, Long> {
+public interface FodderService extends IService<FodderEntity> {
 
 
 

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

@@ -1,54 +0,0 @@
-package com.gis.service;
-
-import com.gis.domain.dto.PageDto;
-import com.github.pagehelper.PageInfo;
-import tk.mybatis.mapper.entity.Condition;
-
-import java.io.Serializable;
-import java.util.List;
-
-public interface IBaseService<T, ID extends Serializable> {
-
-    public abstract T findById(ID id);
-
-    public abstract T findOne(T entity);
-
-    public abstract List<T> findByIds(String ids);
-
-    public abstract long count();
-
-    public abstract boolean exists(ID id);
-
-    public abstract int save(T entity);
-
-    public abstract int update(T entity);
-
-    public abstract int updateAll(T entity);
-
-    public abstract int deleteById(ID id);
-
-    public abstract int deleteByIds(String ids);
-
-    public abstract int delete(T entity);
-
-    public abstract List<T> findAll(Condition condition, String orderBy);
-
-    public abstract List<T> findAll(Condition condition);
-
-    public abstract List<T> findAll();
-
-    public abstract PageInfo<T> findAll(int pageNum, int pageSize);
-
-    public abstract PageInfo<T> findAll(int pageNum, int pageSize, String orderBy);
-
-    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize);
-
-    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize, String orderBy);
-
-    public abstract void startPage(PageDto param);
-
-    public abstract String getUserNameForToken();
-
-
-
-}

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

@@ -1,54 +0,0 @@
-package com.gis.service;
-
-import com.gis.domain.dto.PageDto;
-import com.github.pagehelper.PageInfo;
-import tk.mybatis.mapper.entity.Condition;
-
-import java.io.Serializable;
-import java.util.List;
-
-public interface IBaseStrService<T, ID extends Serializable> {
-
-    public abstract T findById(ID id);
-
-    public abstract T findOne(T entity);
-
-    public abstract List<T> findByIds(String ids);
-
-    public abstract long count();
-
-    public abstract boolean exists(ID id);
-
-    public abstract int save(T entity);
-
-    public abstract int update(T entity);
-
-    public abstract int updateAll(T entity);
-
-    public abstract int deleteById(ID id);
-
-    public abstract int deleteByIds(String ids);
-
-    public abstract int delete(T entity);
-
-    public abstract List<T> findAll(Condition condition, String orderBy);
-
-    public abstract List<T> findAll(Condition condition);
-
-    public abstract List<T> findAll();
-
-    public abstract PageInfo<T> findAll(int pageNum, int pageSize);
-
-    public abstract PageInfo<T> findAll(int pageNum, int pageSize, String orderBy);
-
-    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize);
-
-    public abstract PageInfo<T> findAll(Condition condition, int pageNum, int pageSize, String orderBy);
-
-    public abstract void startPage(PageDto param);
-
-    public abstract String getUserNameForToken();
-
-
-
-}

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

@@ -1,5 +1,6 @@
 package com.gis.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.DirDto;
 import com.gis.domain.dto.DirMoveDto;
@@ -10,7 +11,7 @@ import com.gis.domain.po.ReportPo;
 /**
  * Created by owen on 2022/12/1 0001 15:22
  */
-public interface ReportService extends IBaseService<ReportEntity, Long>{
+public interface ReportService extends IService<ReportEntity> {
 
 
 

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

@@ -1,6 +1,7 @@
 package com.gis.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.domain.entity.SysUserEntity;
 
 import java.util.List;
@@ -9,7 +10,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/3/11 0011 16:14
  */
-public interface SysUserService extends IBaseService<SysUserEntity, Long> {
+public interface SysUserService extends IService<SysUserEntity> {
 
 
     SysUserEntity findByUserName(String userName);

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

@@ -0,0 +1,14 @@
+package com.gis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gis.domain.entity.WorkBackgroundMusicEntity;
+
+/**
+ * 背景音乐表 服务类接口
+ *
+ * @author Xiewj
+ * @since 2023-09-05 20:57
+ */
+public interface WorkBackgroundMusicService extends IService<WorkBackgroundMusicEntity> {
+
+}

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

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

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

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

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

@@ -0,0 +1,14 @@
+package com.gis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gis.domain.entity.WorkCustomMaskEntity;
+
+/**
+ * 遮罩设置表 服务类接口
+ *
+ * @author Xiewj
+ * @since 2023-09-06 14:37
+ */
+public interface WorkCustomMaskService extends IService<WorkCustomMaskEntity> {
+
+}

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

@@ -1,13 +1,14 @@
 package com.gis.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.domain.entity.WorkHotsFodderEntity;
 
 
 /**
  * Created by owen on 2020/3/11 0011 16:14
  */
-public interface WorkHotsFodderService extends IBaseService<WorkHotsFodderEntity, Long> {
+public interface WorkHotsFodderService extends IService<WorkHotsFodderEntity> {
 
     WorkHotsFodderEntity findBySceneCodeAndWorkIdAndTitleAndNameAndFodderIdAndType(String sceneCode,
                                                                             String workId,

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

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

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

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

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

@@ -0,0 +1,12 @@
+package com.gis.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gis.domain.entity.WorkOpeningTipEntity;
+
+/**
+ *
+ */
+public interface WorkOpeningTipService extends IService<WorkOpeningTipEntity> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.gis.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.WorkEntity;
@@ -14,7 +15,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/3/11 0011 16:14
  */
-public interface WorkService extends IBaseService<WorkEntity, String> {
+public interface WorkService extends IService<WorkEntity> {
 
 
     Result search(AgePageDto param, boolean isAdmin);
@@ -55,4 +56,8 @@ public interface WorkService extends IBaseService<WorkEntity, String> {
     void fixSomeData(String workId,String active);
 
     Result getServiceUpTip();
+
+    Result<WorkEntity> addWork(WorkAddDto workAddDto);
+
+    Result<WorkEntity> editWork(WordAllDto workAddDto);
 }

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

@@ -1,29 +1,28 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.common.constant.ErrorEnum;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.DirDto;
 import com.gis.domain.dto.DirMoveDto;
 import com.gis.domain.entity.DirEntity;
-import com.gis.domain.entity.WorkEntity;
 import com.gis.mapper.DirMapper;
-import com.gis.mapper.IBaseMapper;
 import com.gis.service.DirService;
 import com.gis.service.FodderService;
 import com.gis.service.WorkService;
 import com.gis.tree.DirTreeUtil;
+import com.gis.util.UserRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.entity.Condition;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -31,7 +30,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements DirService {
+public class DirServiceImpl extends ServiceImpl<DirMapper, DirEntity> implements DirService {
 
     @Autowired
     DirMapper entityMapper;
@@ -45,19 +44,15 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
     @Autowired
     WorkHotsFodderServiceImpl workHotsFodderService;
 
-
-    @Override
-    public IBaseMapper<DirEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
-
+    @Autowired
+    UserRequest userRequest;
 
     @Override
     public Result saveEntity(DirDto param) {
         Long id = param.getId();
         DirEntity entity = null;
         if (id == null){
-            String phone = getUserNameForToken();
+            String phone = userRequest.getCurrentToken();
             log.info("该用户：{} 创建了新目录, 名字为：{}", phone, param.getName());
             entity = new DirEntity();
             BeanUtils.copyProperties(param, entity);
@@ -73,7 +68,7 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
             }
             this.save(entity);
         } else {
-            entity = this.findById(id);
+            entity = getById(entity);
             BaseRuntimeException.isNull(entity, ErrorEnum.FAILURE_SYS_3001.code(), ErrorEnum.FAILURE_SYS_3001.message());
             BeanUtils.copyProperties(param, entity,"parentId");
             List<DirEntity> dirEntities = findByIdAndNameAndUserId(entity.getParentId(), entity.getName(), entity.getType(),entity.getUserId());
@@ -81,7 +76,7 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
                 log.info("{}",dirEntities);
                 throw new BaseRuntimeException(ErrorEnum.FAILURE_CODE_3104.code(), ErrorEnum.FAILURE_CODE_3104.message());
             }
-            this.update(entity);
+            this.updateById(entity);
         }
         return Result.success(entity);
     }
@@ -97,7 +92,7 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
         if (StrUtil.isNotEmpty(param.getDirIds())) {
             String[] split = param.getDirIds().split(",");
             for (String s : split) {
-                DirEntity byId = this.findById(Long.valueOf(s));
+                DirEntity byId = this.getById(Long.valueOf(s));
                 log.info("文件夹名称查询{}",byId);
                 if (ObjectUtil.isNotNull(byId)){
                     List<DirEntity> byIdAndName = findByIdAndNameAndUserId(param.getParentId(), byId.getName(),byId.getType(), byId.getUserId());
@@ -119,20 +114,20 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
                 String[] split1 = param.getDirIds().split(",");
                 for (String s : split1) {
                     //移动最外层
-                    DirEntity parentDir = findById(Long.valueOf(s));
+                    DirEntity parentDir = getById(Long.valueOf(s));
                     parentDir.setParentId(param.getParentId());
                     parentDir.setAncestors(param.getAncestors());
-                    this.update(parentDir);
+                    this.updateById(parentDir);
                     List<DirEntity> dirEntities = findByParentId(Long.valueOf(s));
                     getChildIdSetAncestors(dirEntities,parentDir);
 
                 }
             }else {
 
-                DirEntity parentDir = findById(Long.valueOf(param.getDirIds()));
+                DirEntity parentDir = getById(Long.valueOf(param.getDirIds()));
                 parentDir.setParentId(param.getParentId());
                 parentDir.setAncestors(param.getAncestors());
-                this.update(parentDir);
+                this.updateById(parentDir);
                 List<DirEntity> dirEntities = findByParentId(Long.valueOf(param.getDirIds()));
                 getChildIdSetAncestors(dirEntities,parentDir);
 
@@ -151,7 +146,7 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
         for (DirEntity dirEntity : dirEntities) {
             //子节点修改为父节点的setAncestors
             dirEntity.setAncestors(parentDir.getAncestors()+","+parentDir.getId());
-            this.update(dirEntity);
+            this.updateById(dirEntity);
             log.info("修改子节点setAncestors 为{}",parentDir.getAncestors()+","+parentDir.getId());
             List<DirEntity> child = findByParentId(dirEntity.getId());
             if (CollectionUtil.isNotEmpty(child)){
@@ -163,30 +158,30 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
 
     @Override
     public List<DirEntity> findByIdAndName(Long parentId, String name,String type) {
-        DirEntity parm=new DirEntity();
-        parm.setName(name);
-        parm.setParentId(parentId);
-        parm.setType(type);
-        parm.setIsDelete(0);
-        return getBaseMapper().select(parm);
+        LambdaQueryWrapper<DirEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(DirEntity::getName, name);
+        wrapper.eq(DirEntity::getParentId, parentId);
+        wrapper.eq(DirEntity::getType, type);
+        wrapper.eq(DirEntity::getIsDelete, 0);
+        return list(wrapper);
     }
 
     @Override
     public List<DirEntity> findByIdAndNameAndUserId(Long parentId, String name, String type, String userId) {
-        DirEntity parm=new DirEntity();
-        parm.setName(name);
-        parm.setParentId(parentId);
-        parm.setType(type);
-        parm.setIsDelete(0);
-        parm.setUserId(userId);
-        return getBaseMapper().select(parm);
+        LambdaQueryWrapper<DirEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(DirEntity::getName, name);
+        wrapper.eq(DirEntity::getParentId, parentId);
+        wrapper.eq(DirEntity::getType, type);
+        wrapper.eq(DirEntity::getIsDelete, 0);
+        wrapper.eq(DirEntity::getUserId, userId);
+        return list(wrapper);
     }
 
     @Override
     public List<DirEntity>  findByParentId(Long parentId) {
-        Condition condition = new Condition(DirEntity.class);
-        condition.createCriteria().andEqualTo("parentId", parentId);
-        return getBaseMapper().selectByCondition(condition);
+        LambdaQueryWrapper<DirEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(DirEntity::getParentId, parentId);
+        return list(wrapper);
     }
 
     /**
@@ -198,7 +193,7 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
      */
     @Override
     public Result remove(Long id) {
-        DirEntity entity = this.findById(id);
+        DirEntity entity = this.getById(id);
         String type = entity.getType();
 //        if ("pano".equals(type)){
 //            // 查询子节点
@@ -287,10 +282,10 @@ public class DirServiceImpl extends IBaseServiceImpl<DirEntity, Long> implements
     }
 
     private List<DirEntity> getMyList(String type){
-        String phone = getUserNameForToken();
-        Condition condition = new Condition(DirEntity.class);
-        condition.and().andEqualTo("userId", phone);
-        condition.and().andEqualTo("type", type);
-        return this.findAll(condition);
+        String phone = userRequest.getCurrentToken();
+        LambdaQueryWrapper<DirEntity> query =  Wrappers.lambdaQuery();
+        query.eq(DirEntity::getUserId,phone);
+        query.eq(DirEntity::getType,type);
+        return list(query);
     }
 }

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

@@ -1,30 +1,31 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.amazonaws.services.dynamodbv2.xspec.S;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.common.config.RabbitConfig;
 import com.gis.common.constant.CmdConstant;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.ErrorEnum;
-import com.gis.common.constant.RedisConstant;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.util.*;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.*;
 import com.gis.domain.vo.FodderVo;
 import com.gis.mapper.FodderMapper;
-import com.gis.mapper.IBaseMapper;
 import com.gis.oss.util.FileAndOssUtil;
 import com.gis.oss.util.FileUtils;
 import com.gis.service.DirService;
 import com.gis.service.FodderService;
-import com.gis.service.SysUserService;
 import com.gis.service.WorkService;
+import com.gis.util.UserRequest;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -35,13 +36,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -50,7 +49,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Service
 @Transactional
-public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> implements FodderService {
+public class FodderServiceImpl extends ServiceImpl<FodderMapper,FodderEntity> implements FodderService {
 
     @Autowired
     FodderMapper entityMapper;
@@ -85,7 +84,8 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
     @Autowired
     RedisUtil redisUtil;
 
-
+    @Autowired
+    UserRequest userRequest;
 
     // 用户最大空间3G
     static int MAX_SIZE = 1024 * 1024 * 3;
@@ -95,16 +95,10 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
 
 
     @Override
-    public IBaseMapper<FodderEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
-
-
-    @Override
     public Result upload(FodderUploadDto param) {
 
         long start = System.currentTimeMillis();
-        String phone = getUserNameForToken();
+        String phone = userRequest.getUserNameForToken();
         log.info("用户名：{}", phone);
         BaseRuntimeException.isBlank(phone, null, "解析token用户失败");
 
@@ -321,8 +315,8 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
 
     @Override
     public Result search(FodderPageDto param) {
-        startPage(param);
-        List<FodderEntity> search = entityMapper.search(param, getUserNameForToken());
+        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
+        List<FodderEntity> search = entityMapper.search(param, userRequest.getUserNameForToken());
         return Result.success(new PageInfo<>(search));
     }
 
@@ -330,13 +324,13 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
 
     @Override
     public Result checkStatus(String ids) {
-        List<FodderEntity> list = entityMapper.checkStatus(ids, getUserNameForToken());
+        List<FodderEntity> list = entityMapper.checkStatus(ids, userRequest.getUserNameForToken());
         return Result.success(list);
     }
 
     @Override
     public Result remove(Long id) {
-        FodderEntity entity = this.findById(id);
+        FodderEntity entity = this.getById(id);
         if (entity == null) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3001.code(), "对象不存在， id: " + id);
         }
@@ -363,7 +357,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
         fileUtils.delAsync(entity.getSceneCode());
         entity.setIsDelete(1);
         entity.setUpdateTime(new Date());
-        this.update(entity);
+        this.updateById(entity);
         return Result.success();
     }
 
@@ -378,14 +372,14 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
 
     @Override
     public List<FodderEntity> findByType(String type) {
-        Condition condition = new Condition(FodderEntity.class);
-        condition.and().andEqualTo("type", type);
-        return this.findAll(condition);
+        LambdaQueryWrapper<FodderEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(FodderEntity::getType, type);
+        return list(wrapper);
     }
 
     @Override
     public Result checkUserSize() {
-        String phone = getUserNameForToken();
+        String phone = userRequest.getUserNameForToken();
         SysUserEntity sysUserEntity = sysUserService.findByPhoneIfNotBeSave(phone);
         // 检查用户空间, 2022-11-16 免检用户
         Map<String ,Integer> space=new HashMap<>();
@@ -409,7 +403,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
     @Override
     public Result listAndDir(FodderPageDto param) {
 
-        String userName = getUserNameForToken();
+        String userName = userRequest.getUserNameForToken();
 //        // 2022-12-20 记录用户登录-数据统计使用
 //        userRecord(userName);
 
@@ -473,7 +467,8 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
         // union 只对最后的order by 起作用
         builder.append(" order By sortType, create_time desc ");
 
-        this.startPage(param);
+        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
+
         List<FodderVo> res = entityMapper.listAndDir(builder.toString());
         PageInfo<FodderVo> pageInfo = new PageInfo<>(res);
 
@@ -563,7 +558,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
         StringBuilder builder = new StringBuilder();
         builder.append("select a.*, b.name as dirName from tb_fodder a left join tb_dir b on b.id=a.dir_id where a.is_delete=0");
 
-        String userName = getUserNameForToken();
+        String userName = userRequest.getUserNameForToken();
         builder.append(" and a.user_id='").append(userName).append("'");
         builder.append(" and a.type='").append(param.getType()).append("'");
         String searchKey = param.getSearchKey();
@@ -580,16 +575,18 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
     private List<FodderEntity> findDirAndConvertEntity(FodderPageDto param){
 
         // 查询目录表
-        String userName = getUserNameForToken();
+        String userName = userRequest.getUserNameForToken();
         String searchKey = param.getSearchKey();
-        Condition condition = new Condition(DirEntity.class);
-        condition.and().andEqualTo("userId", userName);
-        condition.and().andEqualTo("type", param.getType());
+        LambdaQueryWrapper<DirEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(DirEntity::getUserId, userName);
+        wrapper.eq(DirEntity::getType, param.getType());
         if (StrUtil.isNotBlank(searchKey)){
             searchKey = RegexUtil.escapeChar(searchKey);
-            condition.and().andLike("name", "%"+searchKey+"%");
+            wrapper.like(DirEntity::getName, searchKey);
         }
-        List<DirEntity> dirs = dirService.findAll(condition, "create_time desc");
+        wrapper.orderByAsc(DirEntity::getCreateTime);
+
+        List<DirEntity> dirs = dirService.list(wrapper);
         
         // 转换实体数据
         List<FodderEntity> list = new ArrayList<>();
@@ -679,22 +676,21 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
 
     @Override
     public Result handelRemove(Long id) {
-        Condition condition = new Condition(DirEntity.class);
+        LambdaQueryWrapper<FodderEntity> wrapper =  Wrappers.lambdaQuery();
         if (ObjectUtil.isNotNull(id)&&id!=0){
-            condition.and().andEqualTo("id", id);
+            wrapper.eq(FodderEntity::getId, id);
         }
-
         //查询出所有素材，去查询他的最大父节点存在否，不存在设置为删除状态
-        for (FodderEntity fodderEntity : findAll(condition)) {
+        for (FodderEntity fodderEntity : list(wrapper)) {
             if (ObjectUtil.isNotEmpty(fodderEntity.getDirId())&&fodderEntity.getDirId()>1){
                 log.info("此素材需要查询文件夹节点id:{},name{}",fodderEntity.getId(),fodderEntity.getName());
-                DirEntity dir = dirService.findById(fodderEntity.getDirId());
+                DirEntity dir = dirService.getById(fodderEntity.getDirId());
                 if (ObjectUtil.isNotNull(dir) ){
                     if (StrUtil.isNotEmpty(dir.getAncestors())){
                         String[] split = dir.getAncestors().split(",");
                         if (split.length>=2){
                             String s = split[1];
-                            DirEntity byId = dirService.findById(Long.valueOf(s));
+                            DirEntity byId = dirService.getById(Long.valueOf(s));
                             if (byId!=null){
                                 log.info("顶层目录是:{},name{}",Long.valueOf(s),byId.getName());
                             }else {
@@ -711,7 +707,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
     }
     //获取顶层的dir
     DirEntity getDirByParentId( DirEntity dirs){
-        DirEntity dir = dirService.findById(dirs.getParentId());
+        DirEntity dir = dirService.getById(dirs.getParentId());
         if (ObjectUtil.isNull(dir)){
             return dirs;
         }else if (ObjectUtil.isNotNull(dir)&&ObjectUtil.isNotNull(dir.getParentId())&&dir.getParentId()!=1){
@@ -727,9 +723,11 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
 
     @Override
     public void reToQueue() {
-        Condition condition = new Condition(FodderEntity.class);
-        condition.createCriteria().andEqualTo("type", "pano").andEqualTo("status", "1");
-        List<FodderEntity> fodderEntities = getBaseMapper().selectByCondition(condition);
+        LambdaQueryWrapper<FodderEntity> wrapper =  Wrappers.lambdaQuery();
+        wrapper.eq(FodderEntity::getType, "pano");
+        wrapper.eq(FodderEntity::getStatus, 1);
+
+        List<FodderEntity> fodderEntities = list(wrapper);
         log.info("重新入队数量{}",fodderEntities.size());
         for (FodderEntity fodderEntity : fodderEntities) {
             rabbitTemplate.convertAndSend(RabbitConfig.PANO_EXCHANGE, RabbitConfig.PANO_QUEUE_ROUTING, fodderEntity.getId());

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

@@ -1,205 +0,0 @@
-package com.gis.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.gis.common.constant.ConfigConstant;
-import com.gis.common.exception.BaseRuntimeException;
-import com.gis.common.shiro.JwtUtil;
-import com.gis.domain.dto.PageDto;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.gis.mapper.IBaseMapper;
-import com.gis.domain.entity.BaseEntity;
-import com.gis.service.IBaseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.Serializable;
-import java.lang.reflect.ParameterizedType;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by owen on 2020/2/18 0018 11:22
- */
-@Transactional
-public abstract class IBaseServiceImpl<T extends BaseEntity, ID extends Serializable> implements IBaseService<T, ID> {
-
-    @Autowired
-    public ConfigConstant configConstant;
-
-    @Autowired
-    protected HttpServletRequest request;
-
-    public abstract IBaseMapper<T, ID> getBaseMapper();
-
-    private Class<T> entityClass;
-
-    public IBaseServiceImpl(){
-        ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass();
-        entityClass = (Class<T>) pt.getActualTypeArguments()[0];
-    }
-
-    @Override
-    public T findById(ID id){
-        Condition condition = new Condition(entityClass);
-        condition.createCriteria().andEqualTo("id", id);
-        condition.and().andEqualTo("isDelete", 0);
-        List<T> ts = getBaseMapper().selectByCondition(condition);
-        if (ts != null && ts.size() > 0){
-            return ts.get(0);
-        }else{
-            return null;
-        }
-    }
-
-    @Override
-    public T findOne(T entity){
-        entity.setIsDelete(0);
-        return getBaseMapper().selectOne(entity);
-    }
-
-    @Override
-    public List<T> findAll(){
-        Condition condition = new Condition(entityClass);
-        condition.createCriteria().andEqualTo("isDelete", 0);
-        return getBaseMapper().selectByCondition(condition);
-    }
-
-    /**
-     * 根据主键字符串进行查询，类中只有存在一个带有@Id注解的字段
-     *
-     * @param ids 如 "1,2,3,4"
-     * @return
-     */
-    @Override
-    public List<T> findByIds(String ids){
-        return getBaseMapper().selectByIds(ids);
-    }
-
-    @Override
-    public long count(){
-        List<T> all = this.findAll();
-        if (all != null && all.size() > 0){
-            return all.size();
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean exists(ID id){
-        return getBaseMapper().existsWithPrimaryKey(id);
-    }
-
-    @Override
-    public int save(T entity) {
-        //migration之后要删掉判断
-            entity.setCreateTime(new Date());
-            entity.setUpdateTime(new Date());
-        return getBaseMapper().insertSelective(entity);
-    }
-
-    @Override
-    public int update(T entity) {
-        //migration之后要删掉判断
-            entity.setUpdateTime(new Date());
-        return getBaseMapper().updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public int updateAll(T entity) {
-        //migration之后要删掉判断
-            entity.setUpdateTime(new Date());
-        return getBaseMapper().updateByPrimaryKey(entity);
-    }
-
-    @Override
-    public int deleteById(ID id) {
-        return getBaseMapper().deleteByPrimaryKey(id);
-    }
-
-    @Override
-    public int deleteByIds(String ids){
-        return getBaseMapper().deleteByIds(ids);
-    }
-
-    @Override
-    public int delete(T entity){
-        return getBaseMapper().delete(entity);
-    }
-
-    public List<T> findAll(Condition condition){
-        condition.and().andEqualTo("isDelete", 0);
-        return getBaseMapper().selectByCondition(condition);
-    }
-
-    public List<T> findAll(Condition condition, String orderBy){
-        condition.and().andEqualTo("isDelete", 0);
-        if (!StringUtils.isEmpty(orderBy)){
-            PageHelper.orderBy(orderBy);
-        }
-        return getBaseMapper().selectByCondition(condition);
-    }
-
-    public PageInfo<T> findAll(int pageNum, int pageSize){
-        PageHelper.startPage(pageNum, pageSize);
-        return new PageInfo<>(this.findAll());
-    }
-
-    public PageInfo<T> findAll(int pageNum, int pageSize, String orderBy){
-        PageHelper.startPage(pageNum, pageSize);
-        if (!StringUtils.isEmpty(orderBy)){
-            PageHelper.orderBy(orderBy);
-        }
-        return new PageInfo<>(this.findAll());
-    }
-
-    public PageInfo<T> findAll(Condition condition, int pageNum, int pageSize){
-        PageHelper.startPage(pageNum, pageSize);
-        return new PageInfo<>(this.findAll(condition));
-    }
-
-    public PageInfo<T> findAll(Condition condition, int pageNum, int pageSize, String orderBy){
-        PageHelper.startPage(pageNum, pageSize);
-        if (!StringUtils.isEmpty(orderBy)){
-            PageHelper.orderBy(orderBy);
-        }
-        return new PageInfo<>(this.findAll(condition));
-    }
-
-
-    /**
-     * 设置请求分页数据
-     */
-    public void startPage(PageDto param){
-        Integer pageNum = param.getPageNum();
-        Integer pageSize = param.getPageSize();
-        if (pageNum == null || pageNum <= 0) {
-            pageNum = 0;
-        }
-
-        if (pageSize == null || pageSize <= 0) {
-            pageSize = 10;
-        }
-
-        PageHelper.startPage(pageNum, pageSize);
-
-    }
-
-
-    public String getUserNameForToken(){
-        /** 获取header token */
-        String token = request.getHeader("token");
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(token)){
-            return JwtUtil.getUsername(token);
-        }
-        return null;
-    }
-
-    public String getToken(){
-        /** 获取header token */
-        return request.getHeader("token");
-    }
-}

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

@@ -1,214 +0,0 @@
-package com.gis.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.gis.common.constant.ConfigConstant;
-import com.gis.common.shiro.JwtUtil;
-import com.gis.domain.dto.PageDto;
-import com.gis.domain.entity.BaseEntity;
-import com.gis.domain.entity.BaseStrEntity;
-import com.gis.mapper.IBaseMapper;
-import com.gis.mapper.IBaseStrMapper;
-import com.gis.service.IBaseService;
-import com.gis.service.IBaseStrService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.Serializable;
-import java.lang.reflect.ParameterizedType;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by owen on 2020/2/18 0018 11:22
- */
-@Transactional
-public abstract class IBaseStrServiceImpl<T extends BaseStrEntity, ID extends Serializable> implements IBaseStrService<T, ID> {
-
-    @Autowired
-    public ConfigConstant configConstant;
-
-    @Autowired
-    protected HttpServletRequest request;
-
-    public abstract IBaseStrMapper<T, ID> getBaseMapper();
-
-    private Class<T> entityClass;
-
-    public IBaseStrServiceImpl(){
-        ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass();
-        entityClass = (Class<T>) pt.getActualTypeArguments()[0];
-    }
-
-    @Override
-    public T findById(ID id){
-        Condition condition = new Condition(entityClass);
-        condition.createCriteria().andEqualTo("id", id);
-        condition.and().andEqualTo("isDelete", 0);
-        List<T> ts = getBaseMapper().selectByCondition(condition);
-        if (ts != null && ts.size() > 0){
-            return ts.get(0);
-        }else{
-            return null;
-        }
-    }
-
-    @Override
-    public T findOne(T entity){
-        entity.setIsDelete(0);
-        return getBaseMapper().selectOne(entity);
-    }
-
-    @Override
-    public List<T> findAll(){
-        Condition condition = new Condition(entityClass);
-        condition.createCriteria().andEqualTo("isDelete", 0);
-        return getBaseMapper().selectByCondition(condition);
-    }
-
-    /**
-     * 根据主键字符串进行查询，类中只有存在一个带有@Id注解的字段
-     *
-     * @param ids 如 "1,2,3,4"
-     * @return
-     */
-    @Override
-    public List<T> findByIds(String ids){
-        return getBaseMapper().selectByIds(ids);
-    }
-
-    @Override
-    public long count(){
-        List<T> all = this.findAll();
-        if (all != null && all.size() > 0){
-            return all.size();
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean exists(ID id){
-        return getBaseMapper().existsWithPrimaryKey(id);
-    }
-
-    @Override
-    public int save(T entity) {
-        //migration之后要删掉判断
-            entity.setCreateTime(new Date());
-            entity.setUpdateTime(new Date());
-        return getBaseMapper().insertSelective(entity);
-    }
-
-    @Override
-    public int update(T entity) {
-        //migration之后要删掉判断
-            entity.setUpdateTime(new Date());
-        return getBaseMapper().updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public int updateAll(T entity) {
-        //migration之后要删掉判断
-            entity.setUpdateTime(new Date());
-        return getBaseMapper().updateByPrimaryKey(entity);
-    }
-
-    @Override
-    public int deleteById(ID id) {
-        return getBaseMapper().deleteByPrimaryKey(id);
-    }
-
-    @Override
-    public int deleteByIds(String ids){
-        return getBaseMapper().deleteByIds(ids);
-    }
-
-    @Override
-    public int delete(T entity){
-        return getBaseMapper().delete(entity);
-    }
-
-    public List<T> findAll(Condition condition){
-        condition.and().andEqualTo("isDelete", 0);
-        return getBaseMapper().selectByCondition(condition);
-    }
-
-    public List<T> findAll(Condition condition, String orderBy){
-        condition.and().andEqualTo("isDelete", 0);
-        if (!StringUtils.isEmpty(orderBy)){
-            PageHelper.orderBy(orderBy);
-        }
-        return getBaseMapper().selectByCondition(condition);
-    }
-
-    public PageInfo<T> findAll(int pageNum, int pageSize){
-        PageHelper.startPage(pageNum, pageSize);
-        return new PageInfo<>(this.findAll());
-    }
-
-    public PageInfo<T> findAll(int pageNum, int pageSize, String orderBy){
-        PageHelper.startPage(pageNum, pageSize);
-        if (!StringUtils.isEmpty(orderBy)){
-            PageHelper.orderBy(orderBy);
-        }
-        return new PageInfo<>(this.findAll());
-    }
-
-    public PageInfo<T> findAll(Condition condition, int pageNum, int pageSize){
-        PageHelper.startPage(pageNum, pageSize);
-        return new PageInfo<>(this.findAll(condition));
-    }
-
-    public PageInfo<T> findAll(Condition condition, int pageNum, int pageSize, String orderBy){
-        PageHelper.startPage(pageNum, pageSize);
-        if (!StringUtils.isEmpty(orderBy)){
-            PageHelper.orderBy(orderBy);
-        }
-        return new PageInfo<>(this.findAll(condition));
-    }
-
-
-    /**
-     * 设置请求分页数据
-     */
-    public void startPage(PageDto param){
-        Integer pageNum = param.getPageNum();
-        Integer pageSize = param.getPageSize();
-        if (pageNum == null || pageNum <= 0) {
-            pageNum = 0;
-        }
-
-        if (pageSize == null || pageSize <= 0) {
-            pageSize = 10;
-        }
-
-        PageHelper.startPage(pageNum, pageSize);
-
-    }
-
-
-    public String getUserNameForToken(){
-        /** 获取header token */
-        String token = request.getHeader("token");
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(token)){
-            return JwtUtil.getUsername(token);
-        }
-        return null;
-    }
-
-    public String getToken(){
-        /** 获取header token */
-        return request.getHeader("token");
-    }
-
-    public Integer getIsAdmin(){
-        if (StrUtil.isBlank(getToken())){
-            return null;
-        }
-        return JwtUtil.getIsAdmin(getToken());
-    }
-}

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

@@ -1,12 +1,12 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.common.util.Result;
 import com.gis.domain.entity.ReportEntity;
 import com.gis.domain.po.ReportPo;
 import com.gis.domain.vo.ReportVo;
 import com.gis.domain.vo.ReportWorkVo;
-import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.ReportMapper;
 import com.gis.service.FodderService;
 import com.gis.service.ReportService;
@@ -23,10 +23,8 @@ import java.util.*;
  */
 @Slf4j
 @Service
-public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> implements ReportService {
+public class ReportServiceImpl extends ServiceImpl<ReportMapper,ReportEntity> implements ReportService {
 
-    @Autowired
-    ReportMapper entityMapper;
 
     @Autowired
     FodderService fodderService;
@@ -34,11 +32,6 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
     @Autowired
     WorkService workService;
 
-    @Override
-    public IBaseMapper<ReportEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
-
 
     @Override
     public Result userTrend(ReportPo po) {
@@ -57,7 +50,7 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
         }
 
-        List<Map> res = entityMapper.listMapSql(sqlStr);
+        List<Map> res = getBaseMapper().listMapSql(sqlStr);
 
         return Result.success(res);
 
@@ -99,7 +92,7 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
         }
 
 
-        List<Map> res = entityMapper.listMapSql(sqlStr);
+        List<Map> res = getBaseMapper().listMapSql(sqlStr);
 
         return Result.success(res);
 
@@ -180,7 +173,7 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
             sqlStr = workMonthTrentSql(infoType, type, startTime, endTime);
         }
 
-        List<ReportVo> res = entityMapper.listReportVoSql(sqlStr);
+        List<ReportVo> res = getBaseMapper().listReportVoSql(sqlStr);
         return res;
     }
 

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

@@ -1,16 +1,14 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.amazonaws.services.dynamodbv2.xspec.S;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.common.util.RedisUtil;
 import com.gis.domain.entity.SysUserEntity;
-import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysUserMapper;
 import com.gis.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 
@@ -18,18 +16,13 @@ import java.util.concurrent.TimeUnit;
  * Created by owen on 2020/3/11 0011 16:16
  */
 @Service
-public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> implements SysUserService {
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper,SysUserEntity> implements SysUserService {
     @Autowired
     RedisUtil redisUtil;
     @Autowired
     private SysUserMapper entityMapper;
     static final String USER_PHONE_KEY = "720:user:phone:";
 
-    @Override
-    public IBaseMapper<SysUserEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
-
 
     @Override
     public SysUserEntity findByUserName(String userName) {

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

@@ -108,7 +108,7 @@ public class TestServiceImpl implements TestService {
      */
     @Override
     public Result getSceneCode(String ids) {
-        List<WorkEntity> list = workService.findByIds(ids);
+        List<WorkEntity> list = workService.getBaseMapper().selectBatchIds(Arrays.asList(ids.split(",")));
         HashMap<String, String> iconMap = new HashMap<>();
         HashSet<Object> sceneCodes = new HashSet<>();
         for (WorkEntity entity : list) {
@@ -171,7 +171,7 @@ public class TestServiceImpl implements TestService {
             String basePath = "%CURRENTXML%../" + sceneCode + "/vtour/panos/";
             tour = tour.replaceAll("panos/", basePath);
             entity.setTour(tour);
-            fodderService.update(entity);
+            fodderService.updateById(entity);
             log.info("更新第 {} 个场景： {}", i, sceneCode);
         }
 
@@ -250,7 +250,7 @@ public class TestServiceImpl implements TestService {
                 String join = StringUtils.join(codes, ",");
 
                 workEntity.setSceneCodes(join);
-                workService.update(workEntity);
+                workService.updateById(workEntity);
 
                 if (!"1".equals(isAll)) {
                     break;
@@ -292,7 +292,7 @@ public class TestServiceImpl implements TestService {
 
             String workType = getTypeBySceneCodes(sceneCodes);
             workEntity.setType(workType);
-            workService.update(workEntity);
+            workService.updateById(workEntity);
             log.info("更新完成第：{} 个, 作品码为：{}, 处理后的场景码为：{}", n, workEntity.getId(), workType);
 
             if (!"1".equals(isAll)) {
@@ -515,7 +515,7 @@ public class TestServiceImpl implements TestService {
 
                 fodderEntity.setTour(tourXmlScene);
                 fodderEntity.setUpdateTime(new Date());
-                fodderService.update(fodderEntity);
+                fodderService.updateById(fodderEntity);
 
                 log.info("更新完成第：{} 个, 场景码为：{}", n, sceneCode);
 

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

@@ -0,0 +1,18 @@
+package com.gis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.mapper.WorkBackgroundMusicMapper;
+import com.gis.service.WorkBackgroundMusicService;
+import com.gis.domain.entity.WorkBackgroundMusicEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 背景音乐表 服务实现类
+ *
+ * @author Xiewj
+ * @since 2023-09-05 20:57
+ */
+@Service
+public class WorkBackgroundMusicServiceImpl extends ServiceImpl<WorkBackgroundMusicMapper,WorkBackgroundMusicEntity> implements WorkBackgroundMusicService {
+}

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

@@ -0,0 +1,18 @@
+package com.gis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.domain.entity.WorkCoverTypeEntity;
+import com.gis.service.WorkCoverTypeService;
+import com.gis.mapper.WorkCoverTypeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 开场封面表 服务实现类
+ *
+ * @author Xiewj
+ * @since 2023-09-05 20:45
+ */
+@Service
+public class WorkCoverTypeServiceImpl extends ServiceImpl<WorkCoverTypeMapper,WorkCoverTypeEntity > implements WorkCoverTypeService {
+}

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

@@ -0,0 +1,18 @@
+package com.gis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.mapper.WorkCustomButtonMapper;
+import com.gis.service.WorkCustomButtonService;
+import com.gis.domain.entity.WorkCustomButtonEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 自定义按钮设置表 服务实现类
+ *
+ * @author Xiewj
+ * @since 2023-09-06 14:50
+ */
+@Service
+public class WorkCustomButtonServiceImpl extends ServiceImpl<WorkCustomButtonMapper, WorkCustomButtonEntity> implements WorkCustomButtonService {
+}

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

@@ -0,0 +1,18 @@
+package com.gis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.mapper.WorkCustomMaskMapper;
+import com.gis.service.WorkCustomMaskService;
+import com.gis.domain.entity.WorkCustomMaskEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 遮罩设置表 服务实现类
+ *
+ * @author Xiewj
+ * @since 2023-09-06 14:37
+ */
+@Service
+public class WorkCustomMaskServiceImpl extends ServiceImpl<WorkCustomMaskMapper,WorkCustomMaskEntity> implements WorkCustomMaskService {
+}

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

@@ -1,8 +1,10 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.domain.entity.WorkHotsFodderEntity;
-import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.WorkHotsFodderMapper;
 import com.gis.service.WorkHotsFodderService;
 import lombok.extern.slf4j.Slf4j;
@@ -15,45 +17,35 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class WorkHotsFodderServiceImpl extends IBaseServiceImpl<WorkHotsFodderEntity, Long> implements WorkHotsFodderService {
-
-    @Autowired
-    WorkHotsFodderMapper workHotsFodderMapper;
-
-
-    @Override
-    public IBaseMapper<WorkHotsFodderEntity, Long> getBaseMapper() {
-        return this.workHotsFodderMapper;
-    }
+public class WorkHotsFodderServiceImpl extends ServiceImpl<WorkHotsFodderMapper,WorkHotsFodderEntity> implements WorkHotsFodderService {
 
     @Override
     public WorkHotsFodderEntity findBySceneCodeAndWorkIdAndTitleAndNameAndFodderIdAndType(String sceneCode, String workId, String hotspotTitle,String name,long fodderId,String type) {
-        WorkHotsFodderEntity one=new WorkHotsFodderEntity();
-        one.setSceneCode(sceneCode);
-        one.setWorkId(workId);
-        one.setTitle(hotspotTitle);
-        one.setName(name);
-        one.setFodderId(fodderId);
-        one.setIsDelete(0);
-        one.setType(type);
-        return getBaseMapper().selectOne(one);
+        LambdaQueryWrapper<WorkHotsFodderEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkHotsFodderEntity::getSceneCode, sceneCode);
+        wrapper.eq(WorkHotsFodderEntity::getWorkId, workId);
+        wrapper.eq(WorkHotsFodderEntity::getTitle, hotspotTitle);
+        wrapper.eq(WorkHotsFodderEntity::getName, name);
+        wrapper.eq(WorkHotsFodderEntity::getIsDelete, 0);
+        wrapper.eq(WorkHotsFodderEntity::getType, type);
+        return getOne(wrapper);
     }
 
     @Override
     public WorkHotsFodderEntity findByWorkIdAndFodderIdAndType( String workId, long fodderId, String type) {
-        WorkHotsFodderEntity one=new WorkHotsFodderEntity();
-        one.setWorkId(workId);
-        one.setFodderId(fodderId);
-        one.setIsDelete(0);
-        one.setType(type);
-        return getBaseMapper().selectOne(one);
+        LambdaQueryWrapper<WorkHotsFodderEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkHotsFodderEntity::getWorkId, workId);
+        wrapper.eq(WorkHotsFodderEntity::getFodderId, fodderId);
+        wrapper.eq(WorkHotsFodderEntity::getIsDelete, 0);
+        wrapper.eq(WorkHotsFodderEntity::getType, type);
+        return getOne(wrapper);
     }
 
     @Override
     public boolean getCountByDirId(String dirIds) {
         String format = StrUtil.format(" SELECT count(a.id) FROM tb_work_hots_fodder a LEFT JOIN  tb_fodder b on a.fodder_id =b.id WHERE a.is_delete=0 and b.is_delete=0 and b.dir_id in ({})",
                      dirIds);
-            Integer count = workHotsFodderMapper.getCountStr(format);
+            Integer count = getBaseMapper().getCountStr(format);
         return count > 0;
     }
 
@@ -61,44 +53,44 @@ public class WorkHotsFodderServiceImpl extends IBaseServiceImpl<WorkHotsFodderEn
     public boolean getCountByFodderId(Long fodderId) {
         String format = StrUtil.format(" SELECT count(a.id) FROM tb_work_hots_fodder a WHERE a.fodder_id ={}",
                 fodderId);
-        Integer count = workHotsFodderMapper.getCountStr(format);
+        Integer count = getBaseMapper().getCountStr(format);
         return count > 0;
     }
 
     @Override
     public void removeBySceneCodeAndWorkIdAndType(String sceneCode, String workId, String type) {
-        WorkHotsFodderEntity one=new WorkHotsFodderEntity();
-        one.setSceneCode(sceneCode);
-        one.setWorkId(workId);
-        one.setIsDelete(0);
-        one.setType(type);
-        getBaseMapper().delete(one)   ;
+        LambdaQueryWrapper<WorkHotsFodderEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkHotsFodderEntity::getSceneCode, sceneCode);
+        wrapper.eq(WorkHotsFodderEntity::getWorkId, workId);
+        wrapper.eq(WorkHotsFodderEntity::getIsDelete, 0);
+        wrapper.eq(WorkHotsFodderEntity::getType, type);
+        remove(wrapper);
     }
 
     @Override
     public void removeByWorkIdAndType(String workId,  String type) {
-        WorkHotsFodderEntity one=new WorkHotsFodderEntity();
-        one.setWorkId(workId);
-        one.setIsDelete(0);
-        one.setType(type);
-        getBaseMapper().delete(one)   ;
+        LambdaQueryWrapper<WorkHotsFodderEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkHotsFodderEntity::getWorkId, workId);
+        wrapper.eq(WorkHotsFodderEntity::getIsDelete, 0);
+        wrapper.eq(WorkHotsFodderEntity::getType, type);
+        remove(wrapper);
     }
 
     @Override
     public void removeByWorkId(String workId) {
-        WorkHotsFodderEntity one=new WorkHotsFodderEntity();
-        one.setWorkId(workId);
-        one.setIsDelete(0);
-        getBaseMapper().delete(one)   ;
+        LambdaQueryWrapper<WorkHotsFodderEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkHotsFodderEntity::getWorkId, workId);
+        wrapper.eq(WorkHotsFodderEntity::getIsDelete, 0);
+        remove(wrapper);
     }
 
     @Override
     public void removeBySceneCodeWorkIdAndType(String sceneCode, String workId, String type) {
-        WorkHotsFodderEntity one=new WorkHotsFodderEntity();
-        one.setSceneCode(sceneCode);
-        one.setWorkId(workId);
-        one.setIsDelete(0);
-        one.setType(type);
-        getBaseMapper().delete(one)   ;
+        LambdaQueryWrapper<WorkHotsFodderEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkHotsFodderEntity::getSceneCode, sceneCode);
+        wrapper.eq(WorkHotsFodderEntity::getWorkId, workId);
+        wrapper.eq(WorkHotsFodderEntity::getIsDelete, 0);
+        wrapper.eq(WorkHotsFodderEntity::getType, type);
+        remove(wrapper);
     }
 }

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

@@ -0,0 +1,18 @@
+package com.gis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.mapper.WorkLogoMapper;
+import com.gis.service.WorkLogoService;
+import com.gis.domain.entity.WorkLogoEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * logo表 服务实现类
+ *
+ * @author Xiewj
+ * @since 2023-09-06 10:21
+ */
+@Service
+public class WorkLogoServiceImpl extends ServiceImpl<WorkLogoMapper,WorkLogoEntity> implements WorkLogoService {
+}

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

@@ -0,0 +1,18 @@
+package com.gis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.domain.entity.WorkOpeningAnimationEntity;
+import com.gis.mapper.WorkOpeningAnimationMapper;
+import com.gis.service.WorkOpeningAnimationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 开场动画表 服务实现类
+ *
+ * @author Xiewj
+ * @since 2023-09-05 19:35
+ */
+@Service
+public class WorkOpeningAnimationServiceImpl extends ServiceImpl<WorkOpeningAnimationMapper,WorkOpeningAnimationEntity> implements WorkOpeningAnimationService {
+}

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

@@ -0,0 +1,20 @@
+package com.gis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gis.domain.entity.WorkOpeningTipEntity;
+import com.gis.mapper.WorkOpeningTipMapper;
+import com.gis.service.WorkOpeningTipService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class WorkOpeningTipServiceImpl extends ServiceImpl<WorkOpeningTipMapper,WorkOpeningTipEntity> implements WorkOpeningTipService {
+
+}
+
+
+
+

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

@@ -4,10 +4,11 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.amazonaws.services.dynamodbv2.xspec.S;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.ErrorEnum;
 import com.gis.common.constant.RedisConstant;
@@ -16,17 +17,14 @@ import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.httpclient.FdkkClient;
 import com.gis.common.util.*;
 import com.gis.domain.dto.*;
-import com.gis.domain.entity.FodderEntity;
-import com.gis.domain.entity.WorkEntity;
-import com.gis.domain.entity.WorkHotsFodderEntity;
+import com.gis.domain.entity.*;
 import com.gis.domain.vo.ReportWorkVo;
 import com.gis.mapper.*;
 import com.gis.oss.util.FileAndOssUtil;
 import com.gis.oss.util.FileUtils;
 import com.gis.oss.util.QrCodeUtils;
-import com.gis.service.FodderService;
-import com.gis.service.WorkHotsFodderService;
-import com.gis.service.WorkService;
+import com.gis.service.*;
+import com.gis.util.UserRequest;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -53,7 +50,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Slf4j
 @Service
-public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> implements WorkService {
+public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implements WorkService {
 
     @Autowired
     private WorkMapper entityMapper;
@@ -84,16 +81,29 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
     @Resource
     FdkkClient fdkkClient;
 
-    @Override
-    public IBaseStrMapper<WorkEntity, String> getBaseMapper() {
-        return this.entityMapper;
-    }
+    @Autowired
+    WorkOpeningTipService workOpeningTipService;
+
+    @Autowired
+    WorkOpeningAnimationService workOpeningAnimationService;
 
+    @Autowired
+    WorkCoverTypeService workCoverTypeService;
+
+    @Autowired
+    WorkLogoService workLogoService;
+
+    @Autowired
+    WorkCustomMaskService workCustomMaskService;
+    @Autowired
+    WorkCustomButtonService workCustomButtonService;
+    @Autowired
+    UserRequest userRequest;
 
     @Override
     public Result search(AgePageDto param, boolean isAdmin) {
-        startPage(param);
-        String userNameForToken = getUserNameForToken();
+        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
+        String userNameForToken = userRequest.getUserNameForToken();
         if (isAdmin){
             userNameForToken = null;
         }
@@ -134,7 +144,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
     @Override
     public Result<WorkEntity> entitySave(WorkDto param) {
         String id = param.getId();
-        WorkEntity entity = entityMapper.selectByPrimaryKey(id);
+        WorkEntity entity =  getById(id);
 
         if (entity == null) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3001.code(),"对象不存在");
@@ -142,7 +152,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         BeanUtils.copyProperties(param, entity);
 
         entity.setUpdateTime(new Date());
-        this.update(entity);
+        this.updateById(entity);
 
         return Result.success();
     }
@@ -154,7 +164,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
         WorkEntity entity = new WorkEntity();
         entity.setId(SnowFlakeUUidUtils.getUuid("WK"));
-        entity.setUserId(getUserNameForToken());
+        entity.setUserId(userRequest.getUserNameForToken());
         entity.setStatus(0);
         Date date = new Date();
         entity.setCreateTime(date);
@@ -190,7 +200,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
         // 创建二维码、二维码url
         String shareUrl = configConstant.domain4dKK + "/panorama/showMobile.html?id=" + id;
-        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id);
+        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id,"zh");
         jsonObject.put("share", shareUrl);
         jsonObject.put("qrCode", qrCode);
 
@@ -239,7 +249,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
     @Override
     public Result remove(String id) {
-        WorkEntity entity = this.findById(id);
+        WorkEntity entity = getById(id);
         if (entity == null) {
             return Result.success();
         }
@@ -249,7 +259,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         // 删除服务器器文件
         fileUtils.del(entity.getId());
 
-        this.update(entity);
+        this.updateById(entity);
 
         // 删除redis
         redisUtil.delete(RedisConstant.WORK_ID + id);
@@ -277,25 +287,24 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
     @Override
     public List<WorkEntity> findByStatus(int i) {
-        Condition condition = new Condition(WorkEntity.class);
-        condition.and().andEqualTo("status", i);
-
-        return this.findAll(condition);
+        LambdaQueryWrapper<WorkEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkEntity::getStatus, i);
+        return  list(wrapper);
     }
 
     @Override
     public List<WorkEntity> getUserWork() {
-        Condition condition = new Condition(WorkEntity.class);
-        condition.and().andEqualTo("status", 1);
-        condition.and().andEqualTo("userId", this.getUserNameForToken());
-        return this.findAll(condition);
+        LambdaQueryWrapper<WorkEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkEntity::getStatus, 1);
+        wrapper.eq(WorkEntity::getUserId, userRequest.getUserNameForToken());
+        return  list(wrapper);
     }
 
     @Override
     public boolean getUserWorkCountBySceneCodes(List<String> sceneCodes) {
         for (String sceneCode : sceneCodes) {
             String format = StrUtil.format("SELECT count(1) FROM tb_work WHERE is_delete=0 and status={} and   user_id = '{}'  and find_in_set('{}' , scene_codes ) ",
-                    1, this.getUserNameForToken(),sceneCode);
+                    1, userRequest.getUserNameForToken(),sceneCode);
             Integer count = entityMapper.getCountStr(format);
             if (count > 0){
                 return true;
@@ -418,7 +427,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        String userNameForToken = getUserNameForToken();
+        String userNameForToken = userRequest.getUserNameForToken();
         if (!userNameForToken.equals(entity.getUserId())) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
         }
@@ -574,7 +583,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
             }
         }
         entity.setUpdateTime(new Date());
-        this.update(entity);
+        this.updateById(entity);
 
         // 2022-10-28 将更新logoChange重置为false, 防止下次又自动生成logo二维码
         someDataJson.put("logoChange", false);
@@ -587,7 +596,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         if (ObjectUtil.isNotNull(workHotsFodderEntity)){
             workHotsFodderEntity.setFodderId(Long.valueOf(String.valueOf(id)));
             workHotsFodderEntity.setWorkId(entity.getId());
-            workHotsFodderService.update(workHotsFodderEntity);
+            workHotsFodderService.updateById(workHotsFodderEntity);
         }else {
             workHotsFodderEntity=new WorkHotsFodderEntity();
             workHotsFodderEntity.setFodderId(Long.valueOf(String.valueOf(id)));
@@ -655,7 +664,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
                                     entity.setTitle(hotspotTitle);
                                     entity.setName(name);
                                     entity.setType(SomeDataConstant.hot);
-                                    workHotsFodderService.update(entity);
+                                    workHotsFodderService.updateById(entity);
                                 }else {
                                     entity=new WorkHotsFodderEntity();
                                     entity.setSceneCode(sceneCode);
@@ -687,7 +696,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
                         workHotsFodderEntity.setWorkId(workId);
                         workHotsFodderEntity.setName(audioName);
                         workHotsFodderEntity.setType(SomeDataConstant.explanation_audio);
-                        workHotsFodderService.update(workHotsFodderEntity);
+                        workHotsFodderService.updateById(workHotsFodderEntity);
                     }else {
                         workHotsFodderEntity=new WorkHotsFodderEntity();
                         workHotsFodderEntity.setSceneCode(sceneCode);
@@ -827,7 +836,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
     @Override
     public Result select4dkk(PageDto param, String workId) {
-        startPage(param);
+        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
 
         String url = configConstant.domain4dKK + "/api/user/scene/list";
         JSONObject reqParam = new JSONObject();
@@ -842,7 +851,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         reqParam.put("sceneSource", "1,3");
 
         HashMap<String, String> headers = new HashMap<>();
-        String token = getToken();
+        String token = userRequest.getCurrentToken();
         if (StringUtils.isBlank(token)) {
             return Result.failure(ErrorEnum.FAILURE_SYS_5001.code(), "token无空");
         }
@@ -896,7 +905,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
     @Override
     public List<WorkEntity> likeSceneCode(String sceneCode) {
         sceneCode = "%" + sceneCode + "%";
-        return entityMapper.likeSceneCode(sceneCode, getUserNameForToken());
+        return entityMapper.likeSceneCode(sceneCode, userRequest.getUserNameForToken());
     }
 
     @Override
@@ -1037,4 +1046,91 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
             return Result.success();
         }
     }
+
+    @Override
+    public Result addWork(WorkAddDto workAddDto) {
+
+        WorkEntity entity = new WorkEntity();
+        entity.setId(SnowFlakeUUidUtils.getUuid("WK"));
+        entity.setUserId(userRequest.getUserNameForToken());
+        entity.setStatus(1);
+        Date date = new Date();
+        entity.setCreateTime(date);
+        entity.setUpdateTime(date);
+        entity.setIcon(workAddDto.getIcon());
+
+        String id = entity.getId();
+        log.info("创建对象完成： {}", id);
+
+        // 创建二维码、二维码url
+        String shareUrlZH = configConstant.domain4dKK + "/panorama/showMobile.html?lang=zh&id=" + id;
+        String shareUrlEN = configConstant.domain4dKK + "/panorama/showMobile.html?lang=en&id=" + id;
+        String qrZHCode = qrCodeUtils.generateLogoQrCode(shareUrlZH, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id,"zh");
+        String qrENCode = qrCodeUtils.generateLogoQrCode(shareUrlEN, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id,"en");
+        entity.setQrCode(qrZHCode);
+        entity.setQrENCode(qrENCode);
+        this.save(entity);
+
+        WorkOpeningTipEntity workOpeningTipEntity=new WorkOpeningTipEntity();
+        workOpeningTipEntity.setWorkId(entity.getId());
+        workOpeningTipEntity.setIsRemind(1);
+        workOpeningTipEntity.setRemindTime(1);
+        workOpeningTipService.save(workOpeningTipEntity);
+
+        WorkOpeningAnimationEntity workOpeningAnimationEntity=new WorkOpeningAnimationEntity();
+        workOpeningAnimationEntity.setIsShowOpeningAnimation(true);
+        workOpeningAnimationEntity.setOpeningAnimationType(1);
+        workOpeningAnimationEntity.setWorkId(entity.getId());
+        workOpeningAnimationService.save(workOpeningAnimationEntity);
+
+
+        WorkCoverTypeEntity workCoverTypeEntity=new WorkCoverTypeEntity();
+        workCoverTypeEntity.setWorkId(entity.getId());
+        workCoverTypeService.save(workCoverTypeEntity);
+
+        WorkLogoEntity workLogoEntity=new WorkLogoEntity();
+        workLogoEntity.setWorkId(entity.getId());
+        workLogoService.save(workLogoEntity);
+
+        WorkCustomMaskEntity earth=new WorkCustomMaskEntity();
+        earth.setWorkId(entity.getId());
+        earth.setType("earth");
+        workCustomMaskService.save(earth);
+        WorkCustomMaskEntity sky=new WorkCustomMaskEntity();
+        sky.setWorkId(entity.getId());
+        sky.setType("sky");
+        workCustomMaskService.save(sky);
+
+        WorkCustomButtonEntity phone=new WorkCustomButtonEntity();
+        phone.setWorkId(entity.getId());
+        phone.setName("电话");
+        phone.setType("phone");
+        workCustomButtonService.save(phone);
+
+        WorkCustomButtonEntity link=new WorkCustomButtonEntity();
+        link.setWorkId(entity.getId());
+        link.setName("链接");
+        link.setType("link");
+        workCustomButtonService.save(link);
+
+        return Result.success(entity);
+    }
+
+    @Override
+    public Result<WorkEntity> editWork(WordAllDto workAddDto) {
+        if (ObjectUtil.isNotNull(workAddDto.getWorkInfo())){
+            WorkNewDto workInfo = workAddDto.getWorkInfo();
+            WorkEntity workEntity = new WorkEntity();
+            BeanUtils.copyProperties(workInfo, workEntity);
+            updateById(workEntity);
+        }
+        if (ObjectUtil.isNotNull(workAddDto.getWorkOpeningTipInfo())){
+            WorkOpeningTipDTO workOpeningTipInfo = workAddDto.getWorkOpeningTipInfo();
+            WorkOpeningTipEntity workOpeningTipEntity = new WorkOpeningTipEntity();
+            BeanUtils.copyProperties(workOpeningTipInfo, workOpeningTipEntity,"parentId");
+            workOpeningTipService.updateById(workOpeningTipEntity);
+
+        }
+        return null;
+    }
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/util/UserRequest.java

@@ -0,0 +1,32 @@
+package com.gis.util;
+
+import com.gis.common.shiro.JwtUtil;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Xiewj
+ * @date 2023/9/8
+ */
+@Component
+public class UserRequest {
+   public  String getCurrentToken() {
+      HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+              .getRequest();
+      String token = request.getHeader("token");
+      return token;
+   }
+   public  String getUserNameForToken() {
+      HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+              .getRequest();
+      /** 获取header token */
+      String token = request.getHeader("token");
+      if (org.apache.commons.lang3.StringUtils.isNotBlank(token)){
+         return JwtUtil.getUsername(token);
+      }
+      return null;
+   }
+}

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

@@ -38,7 +38,7 @@ public class DirController {
     @ApiOperation(value = "详情")
     @GetMapping("/detail/{id}")
     public Result detail(@PathVariable Long id) {
-        return Result.success(dirService.findById(id));
+        return Result.success(dirService.getById(id));
     }
 
 

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

@@ -105,10 +105,10 @@ public class FodderController extends BaseController {
     @ApiOperation(value = "修改", position = 1)
     @PostMapping("update")
     public Result update(@RequestBody FodderDto param) {
-        FodderEntity entity = fodderService.findById(param.getId());
+        FodderEntity entity = fodderService.getById(param.getId());
         BeanUtils.copyProperties(param, entity);
-        entity.setUpdateTime(new Date());
-        fodderService.update(entity);
+//        entity.setUpdateTime(new Date());
+        fodderService.updateById(entity);
         return Result.success();
     }
 
@@ -122,7 +122,7 @@ public class FodderController extends BaseController {
     @ApiOperation(value = "详情", position = 1)
     @GetMapping("detail/{id}")
     public Result<FodderEntity> detail(@PathVariable Long id) {
-        FodderEntity entity = fodderService.findById(id);
+        FodderEntity entity = fodderService.getById(id);
         if (entity == null) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3001.code(), "对象不存在");
         }

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

@@ -316,7 +316,7 @@ public class TestController extends BaseController {
     @GetMapping("/fixSomeData")
     public Result fixSomeData(String workId,String active) {
         if (workId.equalsIgnoreCase("all")){
-            List<WorkEntity> all = workService.findAll();
+            List<WorkEntity> all = workService.list();
             for (WorkEntity workEntity : all) {
                 workService.fixSomeData(workEntity.getId(),active);
 

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

@@ -69,7 +69,7 @@ public class WebController extends BaseController {
         }
 
         PageHelper.clearPage();
-        WorkEntity entity = workService.findById(workId);
+        WorkEntity entity = workService.getById(workId);
 
         if (entity != null) {
             flag = true;
@@ -90,7 +90,7 @@ public class WebController extends BaseController {
     @PostMapping("checkPwd")
     public Result checkPwd(@Valid @RequestBody WorkPwdDto param) {
         String workId = param.getWorkId();
-        WorkEntity entity = workService.findById(workId);
+        WorkEntity entity = workService.getById(workId);
         if (entity == null) {
             log.error("对象不存在, 场景码：{}", workId);
             return Result.failure(ErrorEnum.FAILURE_SYS_3001.code(), "对象不存在");

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

@@ -67,6 +67,24 @@ public class WorkController extends BaseController {
     }
 
     /**
+     * 创建一个基础someData.json
+     * @return
+     */
+    @ApiOperation(value = "新增作品,初始化数据", position = 1)
+    @PostMapping("addWork")
+    public Result<WorkEntity> addWork(@RequestBody WorkAddDto workAddDto) {
+        return workService.addWork(workAddDto);
+    }
+    /**
+     * 创建一个基础someData.json
+     * @return
+     */
+    @ApiOperation(value = "修改作品", position = 1)
+    @PostMapping("editWork")
+    public Result<WorkEntity> editWork(@RequestBody WordAllDto workAddDto) {
+        return workService.editWork(workAddDto);
+    }
+    /**
      * 获取编辑器版本信息
      * @return
      */
@@ -137,7 +155,7 @@ public class WorkController extends BaseController {
         }
 
         PageHelper.clearPage();
-        WorkEntity entity = workService.findById(workId);
+        WorkEntity entity = workService.getById(workId);
         if (entity == null) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3001.code(), "对象不存在： " + workId);
         }

720yun_fd_manage/pom.xml

@@ -46,9 +46,8 @@
         <aliyun.core.version>4.0.3</aliyun.core.version>
         <aliyun.dysmsapi.version>1.1.0</aliyun.dysmsapi.version>
         <aliyun.oss.version>2.5.0</aliyun.oss.version>
-        <tk.mybatis.version>2.1.5</tk.mybatis.version>
-        <tk.mapper.version>4.0.3</tk.mapper.version>
-        <pagehelper.version>1.2.5</pagehelper.version>
+        <mybatisPlus.version>3.5.3.2</mybatisPlus.version>
+        <pagehelper.version>1.4.6</pagehelper.version>
         <knife4j.version>2.0.2</knife4j.version>
         <junit.version>4.12</junit.version>
         <zxing.version>3.3.3</zxing.version>
@@ -260,18 +259,11 @@
                 <version>${aliyun.oss.version}</version>
             </dependency>
 
-            <!--tk.mybatis 依赖-->
+
             <dependency>
-                <groupId>tk.mybatis</groupId>
-                <artifactId>mapper-spring-boot-starter</artifactId>
-                <version>${tk.mybatis.version}</version>
-                <!-- tk.mybatis 跟springboot jap 包冲突-->
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.persistence</groupId>
-                        <artifactId>persistence-api</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatisPlus.version}</version>
             </dependency>