Browse Source

国内测试环境 修复modelkind字段

dsx 2 years ago
parent
commit
f91c3d341c

+ 35 - 2
src/main/java/com/fdkankan/job/controller/SceneProController.java

@@ -3,12 +3,20 @@ package com.fdkankan.job.controller;
 
 import com.fdkankan.job.service.IRepairUpXmlUrlService;
 import com.fdkankan.web.response.ResultData;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.GetResponse;
+import org.springframework.amqp.rabbit.core.ChannelCallback;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
 /**
  * <p>
  * pro场景表 前端控制器
@@ -22,12 +30,37 @@ import org.springframework.web.bind.annotation.RestController;
 public class SceneProController {
 
     @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @Autowired
     private IRepairUpXmlUrlService repairUpXmlUrlService;
 
 
     @GetMapping("/test")
-    public ResultData test(){
-        repairUpXmlUrlService.repairSceneUpXmlUrlOfVideos();
+    public ResultData test() throws UnsupportedEncodingException {
+        GetResponse bbbbb = rabbitTemplate.execute(new ChannelCallback<GetResponse>() {
+            public GetResponse doInRabbit(Channel channel) throws Exception {
+                GetResponse get = channel.basicGet("bbbbb", false);
+                return get;
+            }
+        });
+
+        byte[] body = bbbbb.getBody();
+        System.out.println(new String(body, StandardCharsets.UTF_8.name()));
+        return ResultData.ok();
+    }
+
+    @GetMapping("/test2")
+    public ResultData test2() throws UnsupportedEncodingException {
+        GetResponse bbbbb = rabbitTemplate.execute(new ChannelCallback<GetResponse>() {
+            public GetResponse doInRabbit(Channel channel) throws Exception {
+                GetResponse get = channel.basicGet("bbbbb", true);
+                return get;
+            }
+        });
+
+        byte[] body = bbbbb.getBody();
+        System.out.println(new String(body, StandardCharsets.UTF_8.name()));
         return ResultData.ok();
     }
 

+ 57 - 0
src/main/java/com/fdkankan/job/job/ModelKindHandler.java

@@ -0,0 +1,57 @@
+package com.fdkankan.job.job;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.job.entity.ScenePlus;
+import com.fdkankan.job.entity.ScenePlusExt;
+import com.fdkankan.job.mapper.IScenePlusExtMapper;
+import com.fdkankan.job.service.IHouseTypeService;
+import com.fdkankan.job.service.IScenePlusExtService;
+import com.fdkankan.job.service.IScenePlusService;
+import com.fdkankan.model.constants.UploadFilePath;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 修复housetype.json文件数据
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/12/16
+ **/
+@Component
+public class ModelKindHandler {
+
+    @Autowired
+    private IHouseTypeService houseTypeService;
+    @Autowired
+    private IScenePlusService scenePlusService;
+    @Autowired
+    private IScenePlusExtService scenePlusExtService;
+
+    @XxlJob("repairModelKind")
+    private void repairModelKind(){
+        XxlJobHelper.log("repairModelKind start.....");
+
+        List<ScenePlus> list = scenePlusService.list();
+        list.stream().forEach(plus->{
+            String sceneJson = String.format(UploadFilePath.DATA_VIEW_PATH, plus.getNum()) + "scene.json";
+            JSONObject jsonObject = JSON.parseObject(sceneJson);
+            if(Objects.isNull(jsonObject) || Objects.isNull(jsonObject.getString("modelKind")) || !"3dtiles".equals(jsonObject.getString("modelKind"))){
+                ScenePlusExt one = scenePlusExtService.getOne(new LambdaQueryWrapper<ScenePlusExt>().eq(ScenePlusExt::getPlusId, plus.getId()));
+                one.setModelKind("dam");
+            }
+        });
+        XxlJobHelper.log("repairModelKind end.....");
+    }
+
+
+}