多数据源配置，指房宝定时生成场景码

src/main/java/com/fdkankan/task/config/MybatisFlexConfiguration.java

@@ -13,18 +13,18 @@ public class MybatisFlexConfiguration {
     private static Logger logger = LoggerFactory.getLogger("mybatis-flex-sql");
 
 
-    @Bean
-    public FlexGlobalConfig logicDeleteProcessor(){
-        FlexGlobalConfig globalConfig = FlexGlobalConfig.getDefaultConfig();
-
-        //设置数据库正常时的值
-        globalConfig.setNormalValueOfLogicDelete("A");
-
-        //设置数据已被删除时的值
-        globalConfig.setDeletedValueOfLogicDelete("I");
-
-        return globalConfig;
-    }
+//    @Bean
+//    public FlexGlobalConfig logicDeleteProcessor(){
+//        FlexGlobalConfig globalConfig = FlexGlobalConfig.getDefaultConfig();
+//
+//        //设置数据库正常时的值
+//        globalConfig.setNormalValueOfLogicDelete("A");
+//
+//        //设置数据已被删除时的值
+//        globalConfig.setDeletedValueOfLogicDelete("I");
+//
+//        return globalConfig;
+//    }
 
 
     public MybatisFlexConfiguration() {

src/main/java/com/fdkankan/task/controller/TbScene3dNumNewController.java

@@ -0,0 +1,96 @@
+package com.fdkankan.task.controller;
+
+import com.mybatisflex.core.paginate.Page;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.fdkankan.task.entity.TbScene3dNumNew;
+import com.fdkankan.task.service.TbScene3dNumNewService;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  控制层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@RestController
+@RequestMapping("/tbScene3dNumNew")
+public class TbScene3dNumNewController {
+
+    @Autowired
+    private TbScene3dNumNewService tbScene3dNumNewService;
+
+    /**
+     * 添加。
+     *
+     * @param tbScene3dNumNew 
+     * @return {@code true} 添加成功，{@code false} 添加失败
+     */
+    @PostMapping("save")
+    public boolean save(@RequestBody TbScene3dNumNew tbScene3dNumNew) {
+        return tbScene3dNumNewService.save(tbScene3dNumNew);
+    }
+
+    /**
+     * 根据主键删除。
+     *
+     * @param id 主键
+     * @return {@code true} 删除成功，{@code false} 删除失败
+     */
+    @DeleteMapping("remove/{id}")
+    public boolean remove(@PathVariable Serializable id) {
+        return tbScene3dNumNewService.removeById(id);
+    }
+
+    /**
+     * 根据主键更新。
+     *
+     * @param tbScene3dNumNew 
+     * @return {@code true} 更新成功，{@code false} 更新失败
+     */
+    @PutMapping("update")
+    public boolean update(@RequestBody TbScene3dNumNew tbScene3dNumNew) {
+        return tbScene3dNumNewService.updateById(tbScene3dNumNew);
+    }
+
+    /**
+     * 查询所有。
+     *
+     * @return 所有数据
+     */
+    @GetMapping("list")
+    public List<TbScene3dNumNew> list() {
+        return tbScene3dNumNewService.list();
+    }
+
+    /**
+     * 根据主键获取详细信息。
+     *
+     * @param id 主键
+     * @return 详情
+     */
+    @GetMapping("getInfo/{id}")
+    public TbScene3dNumNew getInfo(@PathVariable Serializable id) {
+        return tbScene3dNumNewService.getById(id);
+    }
+
+    /**
+     * 分页查询。
+     *
+     * @param page 分页对象
+     * @return 分页对象
+     */
+    @GetMapping("page")
+    public Page<TbScene3dNumNew> page(Page<TbScene3dNumNew> page) {
+        return tbScene3dNumNewService.page(page);
+    }
+
+}

src/main/java/com/fdkankan/task/controller/TbSceneController.java

@@ -0,0 +1,96 @@
+package com.fdkankan.task.controller;
+
+import com.mybatisflex.core.paginate.Page;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.fdkankan.task.entity.TbScene;
+import com.fdkankan.task.service.TbSceneService;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  控制层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@RestController
+@RequestMapping("/tbScene")
+public class TbSceneController {
+
+    @Autowired
+    private TbSceneService tbSceneService;
+
+    /**
+     * 添加。
+     *
+     * @param tbScene 
+     * @return {@code true} 添加成功，{@code false} 添加失败
+     */
+    @PostMapping("save")
+    public boolean save(@RequestBody TbScene tbScene) {
+        return tbSceneService.save(tbScene);
+    }
+
+    /**
+     * 根据主键删除。
+     *
+     * @param id 主键
+     * @return {@code true} 删除成功，{@code false} 删除失败
+     */
+    @DeleteMapping("remove/{id}")
+    public boolean remove(@PathVariable Serializable id) {
+        return tbSceneService.removeById(id);
+    }
+
+    /**
+     * 根据主键更新。
+     *
+     * @param tbScene 
+     * @return {@code true} 更新成功，{@code false} 更新失败
+     */
+    @PutMapping("update")
+    public boolean update(@RequestBody TbScene tbScene) {
+        return tbSceneService.updateById(tbScene);
+    }
+
+    /**
+     * 查询所有。
+     *
+     * @return 所有数据
+     */
+    @GetMapping("list")
+    public List<TbScene> list() {
+        return tbSceneService.list();
+    }
+
+    /**
+     * 根据主键获取详细信息。
+     *
+     * @param id 主键
+     * @return 详情
+     */
+    @GetMapping("getInfo/{id}")
+    public TbScene getInfo(@PathVariable Serializable id) {
+        return tbSceneService.getById(id);
+    }
+
+    /**
+     * 分页查询。
+     *
+     * @param page 分页对象
+     * @return 分页对象
+     */
+    @GetMapping("page")
+    public Page<TbScene> page(Page<TbScene> page) {
+        return tbSceneService.page(page);
+    }
+
+}

src/main/java/com/fdkankan/task/controller/TbSceneNumController.java

@@ -0,0 +1,96 @@
+package com.fdkankan.task.controller;
+
+import com.mybatisflex.core.paginate.Page;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.fdkankan.task.entity.TbSceneNum;
+import com.fdkankan.task.service.TbSceneNumService;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  控制层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@RestController
+@RequestMapping("/tbSceneNum")
+public class TbSceneNumController {
+
+    @Autowired
+    private TbSceneNumService tbSceneNumService;
+
+    /**
+     * 添加。
+     *
+     * @param tbSceneNum 
+     * @return {@code true} 添加成功，{@code false} 添加失败
+     */
+    @PostMapping("save")
+    public boolean save(@RequestBody TbSceneNum tbSceneNum) {
+        return tbSceneNumService.save(tbSceneNum);
+    }
+
+    /**
+     * 根据主键删除。
+     *
+     * @param id 主键
+     * @return {@code true} 删除成功，{@code false} 删除失败
+     */
+    @DeleteMapping("remove/{id}")
+    public boolean remove(@PathVariable Serializable id) {
+        return tbSceneNumService.removeById(id);
+    }
+
+    /**
+     * 根据主键更新。
+     *
+     * @param tbSceneNum 
+     * @return {@code true} 更新成功，{@code false} 更新失败
+     */
+    @PutMapping("update")
+    public boolean update(@RequestBody TbSceneNum tbSceneNum) {
+        return tbSceneNumService.updateById(tbSceneNum);
+    }
+
+    /**
+     * 查询所有。
+     *
+     * @return 所有数据
+     */
+    @GetMapping("list")
+    public List<TbSceneNum> list() {
+        return tbSceneNumService.list();
+    }
+
+    /**
+     * 根据主键获取详细信息。
+     *
+     * @param id 主键
+     * @return 详情
+     */
+    @GetMapping("getInfo/{id}")
+    public TbSceneNum getInfo(@PathVariable Serializable id) {
+        return tbSceneNumService.getById(id);
+    }
+
+    /**
+     * 分页查询。
+     *
+     * @param page 分页对象
+     * @return 分页对象
+     */
+    @GetMapping("page")
+    public Page<TbSceneNum> page(Page<TbSceneNum> page) {
+        return tbSceneNumService.page(page);
+    }
+
+}

src/main/java/com/fdkankan/task/controller/TbSceneProController.java

@@ -0,0 +1,96 @@
+package com.fdkankan.task.controller;
+
+import com.mybatisflex.core.paginate.Page;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.fdkankan.task.entity.TbScenePro;
+import com.fdkankan.task.service.TbSceneProService;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  控制层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@RestController
+@RequestMapping("/tbScenePro")
+public class TbSceneProController {
+
+    @Autowired
+    private TbSceneProService tbSceneProService;
+
+    /**
+     * 添加。
+     *
+     * @param tbScenePro 
+     * @return {@code true} 添加成功，{@code false} 添加失败
+     */
+    @PostMapping("save")
+    public boolean save(@RequestBody TbScenePro tbScenePro) {
+        return tbSceneProService.save(tbScenePro);
+    }
+
+    /**
+     * 根据主键删除。
+     *
+     * @param id 主键
+     * @return {@code true} 删除成功，{@code false} 删除失败
+     */
+    @DeleteMapping("remove/{id}")
+    public boolean remove(@PathVariable Serializable id) {
+        return tbSceneProService.removeById(id);
+    }
+
+    /**
+     * 根据主键更新。
+     *
+     * @param tbScenePro 
+     * @return {@code true} 更新成功，{@code false} 更新失败
+     */
+    @PutMapping("update")
+    public boolean update(@RequestBody TbScenePro tbScenePro) {
+        return tbSceneProService.updateById(tbScenePro);
+    }
+
+    /**
+     * 查询所有。
+     *
+     * @return 所有数据
+     */
+    @GetMapping("list")
+    public List<TbScenePro> list() {
+        return tbSceneProService.list();
+    }
+
+    /**
+     * 根据主键获取详细信息。
+     *
+     * @param id 主键
+     * @return 详情
+     */
+    @GetMapping("getInfo/{id}")
+    public TbScenePro getInfo(@PathVariable Serializable id) {
+        return tbSceneProService.getById(id);
+    }
+
+    /**
+     * 分页查询。
+     *
+     * @param page 分页对象
+     * @return 分页对象
+     */
+    @GetMapping("page")
+    public Page<TbScenePro> page(Page<TbScenePro> page) {
+        return tbSceneProService.page(page);
+    }
+
+}

src/main/java/com/fdkankan/task/entity/Repair.java

@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
  * @since 2023-11-22
  */
 @Data
-@Table(value = "t_repair")
+@Table(value = "t_repair",dataSource = "sale")
 public class Repair implements Serializable {
 
     /**

src/main/java/com/fdkankan/task/entity/TbScene.java

@@ -0,0 +1,199 @@
+package com.fdkankan.task.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(value = "tb_scene")
+public class TbScene implements Serializable {
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 场景名称
+     */
+    private String sceneName;
+
+    /**
+     * 场景描述
+     */
+    private String sceneDec;
+
+    /**
+     * 公元管道需要的编码
+     */
+    private String workNumber;
+
+    /**
+     * 场景的链接地址
+     */
+    private String website;
+
+    /**
+     * 场景缩略图
+     */
+    private String homepic;
+
+    /**
+     * 生成场景的时间
+     */
+    private Date createTime;
+
+    /**
+     * 0表示未建好，1表示建好，-1表示出错，-2表示私密不要显示
+     */
+    private Integer status;
+
+    /**
+     * 原始的大场景数据（七牛）
+     */
+    private String datasource;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 房源id
+     */
+    private Long houseId;
+
+    /**
+     * 0表示未付款，1表示付款了，-1表示欠费
+     */
+    private Integer pay;
+
+    /**
+     * 相机的用户名
+     */
+    private String childName;
+
+    /**
+     * 手机id
+     */
+    private String phoneId;
+
+    /**
+     * 大场景序号
+     */
+    private String num;
+
+    /**
+     * 大场景的密钥
+     */
+    private String scenekey;
+
+    /**
+     * 0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居
+     */
+    private Integer sceneType;
+
+    /**
+     * 1表示推荐，0表示正常
+     */
+    private Integer recommend;
+
+    /**
+     * 浏览次数
+     */
+    private Integer viewCount;
+
+    /**
+     * 版本
+     */
+    private Integer version;
+
+    /**
+     * 表示缩略图是否存在
+     */
+    private Integer thumbImg;
+
+    /**
+     * 0表示默认，1表示自己上传
+     */
+    private String floorLogo;
+
+    /**
+     * 标记大小
+     */
+    private Integer floorLogoSize;
+
+    /**
+     * 要上传的热点的id集合，用逗号隔开
+     */
+    private String hotsids;
+
+    /**
+     * 表示初始点信息
+     */
+    private String entry;
+
+    /**
+     * 拍摄数量
+     */
+    private Integer shootCount;
+
+    /**
+     * 风格
+     */
+    private Integer style;
+
+    /**
+     * 要gps定位
+     */
+    private String gps;
+
+    /**
+     * 方案：1是双目，2是转台，3是六目
+     */
+    private Integer sceneScheme;
+
+    /**
+     * 背景音乐名称
+     */
+    private String bgMusic;
+
+    private String screencapMusic;
+
+    /**
+     * 录屏文件个数
+     */
+    private Integer screencapLen;
+
+    /**
+     * 算法类型
+     */
+    private String algorithm;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @Column(isLogicDelete = true)
+    private String recStatus;
+
+    private Boolean isShow;
+
+    private String appListPicUrl;
+
+    private Long contactId;
+
+}

src/main/java/com/fdkankan/task/entity/RepairLog.java

@@ -15,54 +15,38 @@ import lombok.NoArgsConstructor;
  *  实体类。
  *
  * @author Admin
- * @since 2023-11-22
+ * @since 2023-12-01
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Table(value = "t_repair_log")
-public class RepairLog implements Serializable {
+@Table(value = "tb_scene_3d_num_new",dataSource = "new-zfb")
+public class TbScene3dNumNew implements Serializable {
 
-    /**
-     * 工单日志
-     */
     @Id(keyType = KeyType.Auto)
-    private Integer repairLogId;
+    private Long id;
 
-    /**
-     * 报修单
-     */
-    private String repairId;
+    private Integer used;
 
-    /**
-     * 报修单状态
-     */
-    private Integer repairStatus;
+    private String folderName;
 
-    /**
-     * 操作人
-     */
-    private Integer sysUserId;
+    private String code;
 
     /**
-     * 备注
+     * 记录的状态，A: 生效，I: 禁用
      */
-    private String info;
-
     @Column(isLogicDelete = true)
     private String recStatus;
 
-    private Date createTime;
-
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
-    private Integer testId;
-
-    private Integer registerLogId;
-
-    private Integer oldRepairStatus;
-
-    private String remark;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
 
 }

src/main/java/com/fdkankan/task/entity/TbSceneNum.java

@@ -0,0 +1,43 @@
+package com.fdkankan.task.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(value = "tb_scene_num")
+public class TbSceneNum implements Serializable {
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 是否使用
+     */
+    private Integer used;
+
+    private String folderName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private String code;
+
+}

src/main/java/com/fdkankan/task/entity/TbScenePro.java

@@ -0,0 +1,211 @@
+package com.fdkankan.task.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(value = "tb_scene_pro",dataSource = "new-zfb")
+public class TbScenePro implements Serializable {
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 场景名称
+     */
+    private String sceneName;
+
+    /**
+     * 场景描述
+     */
+    private String sceneDec;
+
+    /**
+     * 场景的链接地址
+     */
+    private String webSite;
+
+    /**
+     * 场景缩略图
+     */
+    private String thumb;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
+     */
+    private Integer status;
+
+    /**
+     * 原始的大场景数据（七牛）
+     */
+    private String dataSource;
+
+    /**
+     * 用户表t_user的id
+     */
+    private Long userId;
+
+    /**
+     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
+     */
+    private Integer payStatus;
+
+    /**
+     * 相机主表t_camera的id
+     */
+    private Long cameraId;
+
+    /**
+     * 手机id
+     */
+    private String phoneId;
+
+    /**
+     * 场景logo
+     */
+    private String sceneLogo;
+
+    /**
+     * 大场景序号
+     */
+    private String num;
+
+    /**
+     * 0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居,99一件换装虚拟房源
+     */
+    private Integer sceneType;
+
+    /**
+     * 1表示推荐，0表示正常
+     */
+    private Integer recommend;
+
+    /**
+     * 浏览次数
+     */
+    private Integer viewCount;
+
+    /**
+     * 拍摄数量
+     */
+    private Integer shootCount;
+
+    /**
+     * 所有资源文件名
+     */
+    private String filesName;
+
+    /**
+     * 点位视频
+     */
+    private String videos;
+
+    /**
+     * 要gps定位
+     */
+    private String gps;
+
+    /**
+     * 方案：1是双目，2是转台，3是六目,4是八目,10获取4k图，11获取2k，12获取1k
+     */
+    private Integer sceneScheme;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @Column(isLogicDelete = true)
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 算法类型
+     */
+    private String algorithm;
+
+    /**
+     * 服务器的服务商
+     */
+    private String ecs;
+
+    /**
+     * 使用容量
+     */
+    private BigInteger space;
+
+    /**
+     * 固件版本
+     */
+    private String firmwareVersion;
+
+    /**
+     * 调用V2还是V3的算法
+     */
+    private String buildType;
+
+    /**
+     * 计算时间（秒为单位）
+     */
+    private Long computeTime;
+
+    /**
+     * 场景来源，相机拍摄10以内表示，1表示八目，2双目，3转台，其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
+     */
+    private Integer sceneSource;
+
+    /**
+     * 房屋ID
+     */
+    private Long houseId;
+
+    /**
+     * 公元管道需要的编码
+     */
+    private String workNumber;
+
+    /**
+     * 小程序首页封面图
+     */
+    private String appListPicUrl;
+
+    /**
+     * '小程序是否显示'
+     */
+    private Boolean isShow;
+
+    /**
+     * 是否生成了直播间
+     */
+    private Boolean lived;
+
+    private Long contactId;
+
+    private String phoneNum;
+
+}

src/main/java/com/fdkankan/task/generate/AutoGenerate.java

@@ -21,14 +21,17 @@ public class AutoGenerate {
 
         //配置数据源
         HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setJdbcUrl("jdbc:mysql://120.24.144.164:3306/4dkankan_v4_sale?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
+//        dataSource.setJdbcUrl("jdbc:mysql://120.24.144.164:3306/4dkankan_v4_sale?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
+//        dataSource.setUsername("root");
+//        dataSource.setPassword("4Dage@4Dage#@168");
+        dataSource.setJdbcUrl("jdbc:mysql://120.24.202.7:3306/zhi_house?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
         dataSource.setUsername("root");
-        dataSource.setPassword("4Dage@4Dage#@168");
+        dataSource.setPassword("zfb@20210727%");
 
         //创建配置内容，两种风格都可以。
 
         GlobalConfig globalConfig = createGlobalConfigUseStyle1("com.fdkankan.task",new String[]{
-                "t_repair","t_repair_log"
+                "tb_scene_pro",
         });
         //GlobalConfig globalConfig = createGlobalConfigUseStyle2();
 

src/main/java/com/fdkankan/task/jobhandler/sale/SaleXxlJob.java

@@ -40,10 +40,9 @@ public class SaleXxlJob {
         String taskId = UUID.randomUUID().toString().replace("-", "");
         logger.info("saleRepairStatus---------------start,taskId:{}",taskId);
         try {
-            QueryWrapper queryWrapper = QueryWrapper.create()
-                    .where("`status` <80");
             HashMap<Integer,HashMap<String,Integer>> resultMap = new HashMap<>();
-
+            QueryWrapper queryWrapper = QueryWrapper.create()
+                    .where("rec_status = 'A' and `status` <80");
             List<Repair> repairs = repairMapper.selectListByQuery(queryWrapper);
 
             logger.info("saleRepairStatus---------------repairs,sieze:{}",repairs.size());

src/main/java/com/fdkankan/task/jobhandler/zfb/GenSceneNumService.java

@@ -0,0 +1,106 @@
+package com.fdkankan.task.jobhandler.zfb;
+
+import com.fdkankan.task.entity.TbScene;
+import com.fdkankan.task.entity.TbScene3dNumNew;
+import com.fdkankan.task.entity.TbSceneNum;
+import com.fdkankan.task.entity.TbScenePro;
+import com.fdkankan.task.mapper.TbScene3dNumNewMapper;
+import com.fdkankan.task.mapper.TbSceneMapper;
+import com.fdkankan.task.mapper.TbSceneNumMapper;
+import com.fdkankan.task.mapper.TbSceneProMapper;
+import com.fdkankan.task.service.TbSceneService;
+import com.mybatisflex.core.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.logging.SimpleFormatter;
+
+@Service
+public class GenSceneNumService {
+
+    private static Logger logger = LoggerFactory.getLogger(GenSceneNumService.class);
+
+    @Autowired
+    TbSceneNumMapper tbSceneNumMapper;
+    @Autowired
+    TbSceneMapper tbSceneMapper;
+    @Autowired
+    TbScene3dNumNewMapper tbScene3dNumNewMapper;
+    @Autowired
+    TbSceneProMapper tbSceneProMapper;
+
+    public void genOldCode(){
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where("used =0");
+        List<TbSceneNum> tbSceneNumList = tbSceneNumMapper.selectListByQuery(queryWrapper);
+        String time = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+
+        logger.info("旧指房未使用场景码数量是：{}",tbSceneNumList.size());
+        if(tbSceneNumList.size() <10000){
+            HashSet<String> strings = GenerateZfbCode.generateOldZfbCode(10000);
+            for (String code : strings) {
+                QueryWrapper queryWrapper2 = QueryWrapper.create()
+                        .where("code = '" +code+"'");
+                List<TbSceneNum> dbCodes = tbSceneNumMapper.selectListByQuery(queryWrapper2);
+                if(!dbCodes.isEmpty()){
+                    continue;
+                }
+                QueryWrapper queryWrapper3 = QueryWrapper.create()
+                        .where("num = '" +code+"'");
+
+                List<TbScene> tbScenes = tbSceneMapper.selectListByQuery(queryWrapper3);
+                if(!tbScenes.isEmpty()){
+                    continue;
+                }
+                TbSceneNum tbSceneNum = new TbSceneNum();
+                tbSceneNum.setUsed(0);
+                tbSceneNum.setCreateTime(new Date());
+                tbSceneNum.setCode(code);
+                tbSceneNum.setFolderName(time);
+                tbSceneNumMapper.insert(tbSceneNum);
+            }
+            logger.info("旧指房生成数量:{}",strings.size());
+        }
+    }
+
+    public void genNewCode() {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where("used =0");
+        List<TbScene3dNumNew> tbSceneNumList = tbScene3dNumNewMapper.selectListByQuery(queryWrapper);
+        String time = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+        logger.info("新指房未使用场景码数量是：{}",tbSceneNumList.size());
+        if(tbSceneNumList.size() <10000){
+            HashSet<String> strings = GenerateZfbCode.generateOldZfbCode(10000);
+            for (String code : strings) {
+                QueryWrapper queryWrapper2 = QueryWrapper.create()
+                        .where("code = '" +code+"'");
+                List<TbScene3dNumNew> dbCodes = tbScene3dNumNewMapper.selectListByQuery(queryWrapper2);
+                if(!dbCodes.isEmpty()){
+                    continue;
+                }
+                QueryWrapper queryWrapper3 = QueryWrapper.create()
+                        .where("num = '" +code+"'");
+
+                List<TbScenePro> tbScenes = tbSceneProMapper.selectListByQuery(queryWrapper3);
+                if(!tbScenes.isEmpty()){
+                    continue;
+                }
+                TbScene3dNumNew tbSceneNum = new TbScene3dNumNew();
+                tbSceneNum.setUsed(0);
+                tbSceneNum.setCode(code);
+                tbSceneNum.setFolderName(time);
+                tbSceneNum.setRecStatus("A");
+                tbSceneNum.setUpdateTime(new Date());
+                tbSceneNum.setCreateTime(new Date());
+                tbScene3dNumNewMapper.insert(tbSceneNum);
+            }
+            logger.info("新指房生成数量:{}",strings.size());
+        }
+    }
+}

src/main/java/com/fdkankan/task/jobhandler/zfb/GenerateZfbCode.java

@@ -0,0 +1,26 @@
+package com.fdkankan.task.jobhandler.zfb;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.util.HashSet;
+
+public class GenerateZfbCode {
+
+    public static HashSet<String> generateOldZfbCode(Integer count ) {
+        String base = "zh";
+        HashSet<String> codes = new HashSet<>();
+        for (int i =0 ;i <=count ;i++){
+            codes.add(base + RandomStringUtils.random(9,true,true));
+        }
+       return codes;
+    }
+    public static HashSet<String> generateNewZfbCode(Integer count ) {
+        String base = "zfb-";
+        HashSet<String> codes = new HashSet<>();
+        for (int i =0 ;i <=count ;i++){
+            codes.add(base + RandomStringUtils.random(9,true,true));
+        }
+       return codes;
+    }
+
+}

src/main/java/com/fdkankan/task/jobhandler/zfb/ZfbXxlJob.java

@@ -0,0 +1,89 @@
+package com.fdkankan.task.jobhandler.zfb;
+
+import com.fdkankan.dingtalk.DingTalkSendUtils;
+import com.fdkankan.task.entity.Repair;
+import com.fdkankan.task.entity.TbSceneNum;
+import com.fdkankan.task.jobhandler.sale.SaleXxlJobUtil;
+import com.fdkankan.task.mapper.RepairMapper;
+import com.fdkankan.task.mapper.TbSceneNumMapper;
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * XxlJob开发示例（Bean模式）
+ *
+ * 开发步骤：
+ *      1、任务开发：在Spring Bean实例中，开发Job方法；
+ *      2、注解配置：为Job方法添加注解 "@XxlJob(value="自定义jobhandler名称", init = "JobHandler初始化方法", destroy = "JobHandler销毁方法")"，注解value值对应的是调度中心新建任务的JobHandler属性的值。
+ *      3、执行日志：需要通过 "XxlJobHelper.log" 打印执行日志；
+ *      4、任务结果：默认任务结果为 "成功" 状态，不需要主动设置；如有诉求，比如设置任务结果为失败，可以通过 "XxlJobHelper.handleFail/handleSuccess" 自主设置任务结果；
+ *
+ * @author xuxueli 2019-12-11 21:52:51
+ */
+@Component
+public class ZfbXxlJob {
+    private static Logger logger = LoggerFactory.getLogger(ZfbXxlJob.class);
+
+    @Autowired
+    GenSceneNumService genSceneNumService;
+
+    /**
+     * 旧指房宝检测生成场景储备码
+     */
+    @XxlJob("oldZfbGenOldCode")
+    @UseDataSource("old-zfb")
+    public void zfbGenOldCode(){
+        String taskId = UUID.randomUUID().toString().replace("-", "");
+        logger.info("oldZfbGenOldCode---------------start,taskId:{}",taskId);
+        try {
+            genSceneNumService.genOldCode();
+        }catch (Exception e){
+            logger.info("oldZfbGenOldCode-error,taskId:{},{}",taskId,e);
+        }finally {
+            logger.info("oldZfbGenOldCode---------------end,taskId::{}",taskId);
+        }
+
+    }
+
+    @XxlJob("newZfbGenOldCode")
+    @UseDataSource("new-zfb")
+    public void newZfbGenOldCode(){
+        String taskId = UUID.randomUUID().toString().replace("-", "");
+        logger.info("newZfbGenOldCode---------------start,taskId:{}",taskId);
+        try {
+            genSceneNumService.genOldCode();
+        }catch (Exception e){
+            logger.info("newZfbGenOldCode-error,taskId:{},{}",taskId,e);
+        }finally {
+            logger.info("newZfbGenOldCode---------------end,taskId::{}",taskId);
+        }
+
+    }
+
+
+    @XxlJob("newZfbGenNewCode")
+    @UseDataSource("new-zfb")
+    public void newZfbGenNewCode(){
+        String taskId = UUID.randomUUID().toString().replace("-", "");
+        logger.info("newZfbGenNewCode---------------start,taskId:{}",taskId);
+        try {
+            genSceneNumService.genNewCode();
+        }catch (Exception e){
+            logger.info("newZfbGenNewCode-error,taskId:{},{}",taskId,e);
+        }finally {
+            logger.info("zfbGenOldCode---------------end,taskId::{}",taskId);
+        }
+
+    }
+
+
+}

src/main/java/com/fdkankan/task/mapper/RepairLogMapper.java

@@ -1,14 +0,0 @@
-package com.fdkankan.task.mapper;
-
-import com.mybatisflex.core.BaseMapper;
-import com.fdkankan.task.entity.RepairLog;
-
-/**
- *  映射层。
- *
- * @author Admin
- * @since 2023-11-22
- */
-public interface RepairLogMapper extends BaseMapper<RepairLog> {
-
-}

src/main/java/com/fdkankan/task/mapper/TbScene3dNumNewMapper.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.fdkankan.task.entity.TbScene3dNumNew;
+
+/**
+ *  映射层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbScene3dNumNewMapper extends BaseMapper<TbScene3dNumNew> {
+
+}

src/main/java/com/fdkankan/task/mapper/TbSceneMapper.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.fdkankan.task.entity.TbScene;
+
+/**
+ *  映射层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbSceneMapper extends BaseMapper<TbScene> {
+
+}

src/main/java/com/fdkankan/task/mapper/TbSceneNumMapper.java

@@ -0,0 +1,25 @@
+package com.fdkankan.task.mapper;
+
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.BaseMapper;
+import com.fdkankan.task.entity.TbSceneNum;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ *  映射层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbSceneNumMapper extends BaseMapper<TbSceneNum> {
+
+//    @UseDataSource("old-zfb")
+//    @Select("SELECT * FROM tb_scene_num WHERE used =0")
+//    List<TbSceneNum> getNotUsedOldCode();
+//
+//    @UseDataSource("new-zfb")
+//    @Select("SELECT * FROM tb_scene_num WHERE used =0")
+//    List<TbSceneNum> getNotUsedNewCode();
+}

src/main/java/com/fdkankan/task/mapper/TbSceneProMapper.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.fdkankan.task.entity.TbScenePro;
+
+/**
+ *  映射层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbSceneProMapper extends BaseMapper<TbScenePro> {
+
+}

src/main/java/com/fdkankan/task/service/TbScene3dNumNewService.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.service;
+
+import com.mybatisflex.core.service.IService;
+import com.fdkankan.task.entity.TbScene3dNumNew;
+
+/**
+ *  服务层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbScene3dNumNewService extends IService<TbScene3dNumNew> {
+
+}

src/main/java/com/fdkankan/task/service/TbSceneNumService.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.service;
+
+import com.mybatisflex.core.service.IService;
+import com.fdkankan.task.entity.TbSceneNum;
+
+/**
+ *  服务层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbSceneNumService extends IService<TbSceneNum> {
+
+}

src/main/java/com/fdkankan/task/service/TbSceneProService.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.service;
+
+import com.mybatisflex.core.service.IService;
+import com.fdkankan.task.entity.TbScenePro;
+
+/**
+ *  服务层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbSceneProService extends IService<TbScenePro> {
+
+}

src/main/java/com/fdkankan/task/service/RepairLogService.java

@@ -1,15 +1,14 @@
 package com.fdkankan.task.service;
 
 import com.mybatisflex.core.service.IService;
-import com.fdkankan.task.entity.RepairLog;
+import com.fdkankan.task.entity.TbScene;
 
 /**
  *  服务层。
  *
  * @author Admin
- * @since 2023-11-22
+ * @since 2023-12-01
  */
-public interface RepairLogService extends IService<RepairLog> {
-
+public interface TbSceneService extends IService<TbScene> {
 
 }

src/main/java/com/fdkankan/task/service/impl/RepairLogServiceImpl.java

@@ -1,18 +0,0 @@
-package com.fdkankan.task.service.impl;
-
-import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.fdkankan.task.entity.RepairLog;
-import com.fdkankan.task.mapper.RepairLogMapper;
-import com.fdkankan.task.service.RepairLogService;
-import org.springframework.stereotype.Service;
-
-/**
- *  服务层实现。
- *
- * @author Admin
- * @since 2023-11-22
- */
-@Service
-public class RepairLogServiceImpl extends ServiceImpl<RepairLogMapper, RepairLog> implements RepairLogService {
-
-}

src/main/java/com/fdkankan/task/service/impl/TbScene3dNumNewServiceImpl.java

@@ -0,0 +1,18 @@
+package com.fdkankan.task.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.fdkankan.task.entity.TbScene3dNumNew;
+import com.fdkankan.task.mapper.TbScene3dNumNewMapper;
+import com.fdkankan.task.service.TbScene3dNumNewService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Service
+public class TbScene3dNumNewServiceImpl extends ServiceImpl<TbScene3dNumNewMapper, TbScene3dNumNew> implements TbScene3dNumNewService {
+
+}

src/main/java/com/fdkankan/task/service/impl/TbSceneNumServiceImpl.java

@@ -0,0 +1,18 @@
+package com.fdkankan.task.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.fdkankan.task.entity.TbSceneNum;
+import com.fdkankan.task.mapper.TbSceneNumMapper;
+import com.fdkankan.task.service.TbSceneNumService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Service
+public class TbSceneNumServiceImpl extends ServiceImpl<TbSceneNumMapper, TbSceneNum> implements TbSceneNumService {
+
+}

src/main/java/com/fdkankan/task/service/impl/TbSceneProServiceImpl.java

@@ -0,0 +1,18 @@
+package com.fdkankan.task.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.fdkankan.task.entity.TbScenePro;
+import com.fdkankan.task.mapper.TbSceneProMapper;
+import com.fdkankan.task.service.TbSceneProService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Service
+public class TbSceneProServiceImpl extends ServiceImpl<TbSceneProMapper, TbScenePro> implements TbSceneProService {
+
+}

src/main/java/com/fdkankan/task/service/impl/TbSceneServiceImpl.java

@@ -0,0 +1,18 @@
+package com.fdkankan.task.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.fdkankan.task.entity.TbScene;
+import com.fdkankan.task.mapper.TbSceneMapper;
+import com.fdkankan.task.service.TbSceneService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Service
+public class TbSceneServiceImpl extends ServiceImpl<TbSceneMapper, TbScene> implements TbSceneService {
+
+}

src/main/resources/application.yml

@@ -4,23 +4,38 @@ server:
     context-path: /
   tomcat:
     max-http-form-post-size: -1
-spring:
+#spring:
+#  datasource:
+#    type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
+#    driver-class-name: com.mysql.cj.jdbc.Driver          # mysql驱动
+#    #国内正式环境
+#    url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/4dkankan_v4_sale?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+#    username: root
+#    password: D2719bd0cae1a005
+#    hikari:
+#      connection-timeout: 30000         # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒
+#      minimum-idle: 5                   # 最小连接数
+#      maximum-pool-size: 20             # 最大连接数
+#      auto-commit: true                 # 事务自动提交
+#      idle-timeout: 600000              # 连接超时的最大时长（毫秒），超时则被释放（retired），默认:10分钟
+#      pool-name: DateSourceHikariCP     # 连接池名字
+#      max-lifetime: 1800000             # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认:30分钟 1800000ms
+#      connection-test-query: SELECT 1   # 连接测试语句
+
+mybatis-flex:
   datasource:
-    type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
-    driver-class-name: com.mysql.cj.jdbc.Driver          # mysql驱动
-    #国内正式环境
-    url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/4dkankan_v4_sale?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: D2719bd0cae1a005
-    hikari:
-      connection-timeout: 30000         # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒
-      minimum-idle: 5                   # 最小连接数
-      maximum-pool-size: 20             # 最大连接数
-      auto-commit: true                 # 事务自动提交
-      idle-timeout: 600000              # 连接超时的最大时长（毫秒），超时则被释放（retired），默认:10分钟
-      pool-name: DateSourceHikariCP     # 连接池名字
-      max-lifetime: 1800000             # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认:30分钟 1800000ms
-      connection-test-query: SELECT 1   # 连接测试语句
+    sale:
+      url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/4dkankan_v4_sale?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+      username: root
+      password: D2719bd0cae1a005
+    old-zfb:
+      url: jdbc:mysql://47.112.166.173:3306/zhi_house?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+      username: root
+      password: 4dkankan4dage
+    new-zfb:
+      url: jdbc:mysql://120.24.202.7:3306/zhi_house?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+      username: root
+      password: zfb@20210727%
 
 logging:
   config: classpath:logback-spring.xml

src/test/java/com/fdkankan/task/TaskTestApplication.java

@@ -21,5 +21,9 @@ public class TaskTestApplication {
 
     @Test
     void test1() {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where("`status` <80");
+        List<Repair> repairs = repairMapper.selectListByQuery(queryWrapper);
+        System.out.println(repairs);
     }
 }