111

src/main/java/com/fdkankan/external/schedule/ScheduleJob.java

@@ -20,10 +20,22 @@ public class ScheduleJob {
      * 中国文物信息中心场景推送任务
      * 每隔十分钟推送一次
      */
-    @Scheduled(fixedRate = 10*60*1000)
+    @Scheduled(fixedRate = 30*1000)
     public void scenePush4Zgwwxxzx() {
         log.info("中国文物信息中心场景推送任务开始");
-        sceneOfflinePackagePushService.scenePushScheduleHandler("aaa");
+        sceneOfflinePackagePushService.scenePushScheduleHandler("zgwwxxzx");
         log.info("中国文物信息中心场景推送任务结束");
     }
+
+//    @Scheduled(fixedRate = 30*1000)
+//    public void scenePush4Zgwwxxzx() {
+//        log.info("中国文物信息中心场景推送任务开始");
+//        try {
+//            Thread.sleep(60*1000L);
+//        } catch (InterruptedException e) {
+//            throw new RuntimeException(e);
+//        }
+//        log.info("中国文物信息中心场景推送任务结束");
+//    }
+
 }

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

@@ -15,4 +15,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     List<ScenePlus> listByCameraIdList(List<Long> cameraIdList);
 
+    ScenePlus getByNum(String num);
+
 }

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.CommonSuccessStatus;
 import com.fdkankan.common.constant.SceneSource;
+import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.external.callback.ErrorCallback;
 import com.fdkankan.external.callback.SuccessCallback;
 import com.fdkankan.external.entity.*;
@@ -251,11 +252,15 @@ public class SceneOfflinePackagePushServiceImpl extends ServiceImpl<SceneOffline
 
             //开始推送到第三方服务
             if(StrUtil.isNotEmpty(downloadUrl)){
+                ScenePlus scenePlus = scenePlusService.getByNum(num);
+                ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
                 Map<String, Object> params = new HashMap<>();
                 params.put("num", num);
+                params.put("title", scenePlus.getTitle());
                 params.put("zipType", zipType);
                 params.put("downloadUrl", downloadUrl);
                 params.put("version", push.getVersion());
+                params.put("calcTime", DateExtUtil.format(scenePlusExt.getAlgorithmTime(), DateExtUtil.dateStyle8));
                 ResultData pushRes = httpClient.post2(push.getDestUrl(), params, new SuccessCallback(), new ErrorCallback());
             }
             push.setPushStatus(CommonSuccessStatus.SUCCESS.code());

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

@@ -32,4 +32,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<ScenePlusMapper, ScenePlus
         }
         return this.list(new QueryWrapper().in(ScenePlus::getCameraId, cameraIdList).in(ScenePlus::getSceneStatus, -2, 1).eq(ScenePlus::getPayStatus, 1));
     }
+
+    @Override
+    public ScenePlus getByNum(String num) {
+        return this.getOne(QueryWrapper.create().eq(ScenePlus::getNum, num));
+    }
 }

src/main/resources/application-prod.yml

@@ -8,8 +8,8 @@ account:
   password: Aa123456
 host:
   4dkk:
-    manage: https://v4-uat.4dkankan.com
-    scene: https://test.4dkankan.com
+    manage: https://www.4dkankan.com
+    scene: https://www.4dkankan.com
 api:
   4dkk:
     manage:
@@ -40,17 +40,17 @@ logging:
 mybatis-flex:
   datasource:
     primary:
-      url: jdbc:mysql://120.24.144.164:3306/4dkankan_center_external
+      url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/4dkankan_center_external
       username: root
       password: 4Dage@4Dage#@168
     www:
-      url: jdbc:mysql://120.24.144.164:3306/4dkankan_v4
+      url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/4dkankan_v4_prod
       username: root
       password: 4Dage@4Dage#@168
     laser:
-      url: jdbc:mysql://120.25.146.52:13306/fdkk_laser
-      username: root
-      password: JK123456%JIK
+      url: jdbc:mysql://172.18.157.42:13306/fdkk_laser
+      username: laser
+      password: JK20220120&JIK