四川日报压缩包推送

src/main/java/com/fdkankan/external/entity/SceneNotDisplay.java

@@ -0,0 +1,39 @@
+package com.fdkankan.external.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 不在官网展示的场景 实体类。
+ *
+ * @author dsx
+ * @since 2024-12-09
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(value = "t_scene_not_display")
+public class SceneNotDisplay implements Serializable {
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    private String num;
+
+    private String version;
+
+    private Timestamp createTime;
+
+    private Timestamp updateTime;
+
+    private String recStatus;
+
+}

src/main/java/com/fdkankan/external/generate/Codegen.java

@@ -17,7 +17,7 @@ public class Codegen {
         dataSource.setUsername("root");
         dataSource.setPassword("4Dage@4Dage#@168");
 
-        String[] tables = new String[]{"t_camera_detail"};//,"t_scene_offline_package_push","t_department_camera"
+        String[] tables = new String[]{"t_scene_not_display"};//,"t_scene_offline_package_push","t_department_camera"
 
                 //创建配置内容，两种风格都可以。
         GlobalConfig globalConfig = createGlobalConfigUseStyle1(tables);

src/main/java/com/fdkankan/external/mapper/SceneNotDisplayMapper.java

@@ -0,0 +1,14 @@
+package com.fdkankan.external.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.fdkankan.external.entity.SceneNotDisplay;
+
+/**
+ * 不在官网展示的场景 映射层。
+ *
+ * @author dsx
+ * @since 2024-12-09
+ */
+public interface SceneNotDisplayMapper extends BaseMapper<SceneNotDisplay> {
+
+}

src/main/java/com/fdkankan/external/service/ISceneNotDisplayService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.external.service;
+
+import com.mybatisflex.core.service.IService;
+import com.fdkankan.external.entity.SceneNotDisplay;
+
+import java.util.List;
+
+/**
+ * 不在官网展示的场景 服务层。
+ *
+ * @author dsx
+ * @since 2024-12-09
+ */
+public interface ISceneNotDisplayService extends IService<SceneNotDisplay> {
+
+    List<SceneNotDisplay> listByNum(String num);
+
+}

src/main/java/com/fdkankan/external/service/impl/SceneNotDisplayServiceImpl.java

@@ -0,0 +1,27 @@
+package com.fdkankan.external.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.external.entity.Camera;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.fdkankan.external.entity.SceneNotDisplay;
+import com.fdkankan.external.mapper.SceneNotDisplayMapper;
+import com.fdkankan.external.service.ISceneNotDisplayService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 不在官网展示的场景 服务层实现。
+ *
+ * @author dsx
+ * @since 2024-12-09
+ */
+@Service
+public class SceneNotDisplayServiceImpl extends ServiceImpl<SceneNotDisplayMapper, SceneNotDisplay> implements ISceneNotDisplayService {
+
+    @Override
+    public List<SceneNotDisplay> listByNum(String num) {
+        return this.list(new QueryWrapper().eq(SceneNotDisplay::getNum, num));
+    }
+}

src/main/java/com/fdkankan/external/service/impl/ScrbServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.external.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.http.HttpUtil;
@@ -13,6 +14,7 @@ import com.fdkankan.external.util.ScrbObsUtil;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.mybatisflex.core.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Service
 public class ScrbServiceImpl implements IScrbService {
 
@@ -52,10 +55,13 @@ public class ScrbServiceImpl implements IScrbService {
     private ICameraService cameraService;
     @Autowired
     private ICameraDetailService cameraDetailService;
+    @Autowired
+    private ISceneNotDisplayService sceneNotDisplayService;
 
     @Override
     public void packageScene(JSONObject jsonObject) {
 
+        log.info("日川日报推送开始,{}", jsonObject);
         String num = jsonObject.getString("num");
         String path = basePath + num + "/";
         String sourcePath = path + num + "/";
@@ -122,5 +128,15 @@ public class ScrbServiceImpl implements IScrbService {
         param.put("num", num);
         param.put("key", key);
         JSONObject result = httpClient.postJson(url, param);
+
+        //场景推送到四川日报后，在官网个人中心不展示
+        List<SceneNotDisplay> sceneNotDisplays = sceneNotDisplayService.listByNum(num);
+        if(CollUtil.isEmpty(sceneNotDisplays)){
+            SceneNotDisplay sceneNotDisplay = new SceneNotDisplay();
+            sceneNotDisplay.setNum(num);
+            sceneNotDisplayService.save(sceneNotDisplay);
+        }
+
+        log.info("日川日报推送结果,num:{},result：{}", num, result);
     }
 }

src/main/resources/application-test.yml

@@ -1,118 +1,15 @@
-server:
-  port: 10002
 spring:
   application:
-    name: 4dkankan-center-external
-  redis:
-    host: 172.18.156.39
-    port: 6379
-    timeout: 6000ms
-    password: bgh0cae240
-    jedis:
-      pool:
-        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
-        max-idle: 10 # 连接池中的最大空闲连接
-        min-idle: 5 # 连接池中的最小空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-    lettuce:
-      shutdown-timeout: 0ms
-  rabbitmq:
-    host: 172.18.156.39
-    port: 5672
-    username: admin
-    password: adminv41234
-    virtual-host: 4dkankan
-    connection-timeout: 0
-    listener:
-      simple:
-        prefetch: 5
-        max-concurrency: 10
-        acknowledge-mode: manual #开启消费者手动确认
-    #开启消息投递确认机制
-    publisher-confirm-type: correlated
-account:
-  username: super-admin
-  password: Aa123456
-host:
-  4dkk:
-    manage: https://v4-uat.4dkankan.com
-    scene: https://test.4dkankan.com
-  laser: https://uat-laser.4dkankan.com
-api:
-  4dkk:
-    manage:
-      login: /service/manage/login
-      checkDownLoad: /service/manage/scene/checkDownLoad?num=%s
-      downScene: /service/manage/scene/downScene?num=%s
-      downloadProcess: /service/manage/scene/downloadProcess?num=%s
-    scene:
-      getInfo: /service/scene/getInfo?num=%s
-  laser:
-    downOfflineScene: /laser/4dage/downOfflineScene
-
-forest:
-  ## 日志总开关，打开/关闭Forest请求/响应日志（默认为 true）
-  log-enabled: true
-  ## 打开/关闭Forest请求日志（默认为 true）
-  log-request: true
-  ## 打开/关闭Forest响应状态日志（默认为 true）
-  log-response-status: true
-  ## 打开/关闭Forest响应内容日志（默认为 false）
-  log-response-content: true
-  ## 请求超时时间，单位为毫秒, 默认值为3000
-  timeout: 10000
-  ## 连接超时时间，单位为毫秒, 默认值为2000
-  connect-timeout: 10000
-
-logging:
-  path: /home/backend/4dkankan_v4
-
-mybatis-flex:
-  datasource:
-    primary:
-      url: jdbc:mysql://172.18.156.39:3306/4dkankan_center_external
-      username: root
-      password: 4Dage@4Dage#@168
-    www:
-      url: jdbc:mysql://172.18.156.39:3306/4dkankan_v4
-      username: root
-      password: 4Dage@4Dage#@168
-    laser:
-      url: jdbc:mysql://120.25.146.52:13306/fdkk_laser
-      username: root
-      password: JK123456%JIK
-oss:
-  host:
-    laser:
-      old: https://laser-oss.4dkankan.com
-      new: https://zgwwzzzx-laser-download.4dage.com
-    4dkk:
-      old: https://4dkk.4dage.com
-      new: https://zgwwzzzx-download.4dage.com
-fyun:
-  type: oss
-  key: LTAI5tJwboCj3r4vUNkSmbyX
-  secret: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
-  bucket: 4dkankan
-  coldBucket: 4dkk-bak  ##冷归档bucket
-  endPoint: http://oss-cn-shenzhen-internal.aliyuncs.com
-  host: https://4dkk.4dage.com/
-
-file:
-  offlineZip:
-    dir: /mnt/external/temp/
-
-scrb:
-  obs:
-    use: true
-    bucket: djqk-vr
-    endPoint: obsv3.scrb-cd-1.sichuandaily.com.cn
-    ak: AFMVGM5CPSHHQ7UPG3DO
-    sk: IUYocj8qgixoDxhj3JIVKXtyBV3lGDJBDFgRhO21
-    host: http://djqk-vr.obsv3.scrb-cd-1.sichuandaily.com.cn/
-
-
-
-
-
-
+    name: 4dkankan-center-modeling
+  cloud:
+    nacos:
+      server-addr: 120.24.144.164:8848
+      config:
+        file-extension: yaml
+        namespace: 4dkankan-v4-test
+        extension-configs:
+          - data-id: 4dkankan-center-modeling.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        namespace: 4dkankan-v4-test