Преглед на файлове

场景升级 指定rabbitmq处理线程数

dengsixing преди 3 години
родител
ревизия
be89a1fe4f

+ 30 - 0
src/main/java/com/fdkankan/repair/controller/SceneRepairController.java

@@ -9,6 +9,7 @@ import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.common.util.SceneUtil;
 import com.fdkankan.common.util.SceneUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
@@ -73,6 +74,10 @@ public class SceneRepairController {
     private FdkankanMiniClient fdkankanMiniClient;
     private FdkankanMiniClient fdkankanMiniClient;
     @Value("${http.host.4dkankanMini}")
     @Value("${http.host.4dkankanMini}")
     private String fkankanMiniHost;
     private String fkankanMiniHost;
+    @Value("${main.url}")
+    private String mainUrl;
+    @Value("${scene.pro.new.url}")
+    private String sceneProNewUrl;
 
 
     /**
     /**
      * 最大线程数
      * 最大线程数
@@ -80,6 +85,18 @@ public class SceneRepairController {
     @Value("${repair.maxThread:3}")
     @Value("${repair.maxThread:3}")
     private int maxThread;
     private int maxThread;
 
 
+    @GetMapping("/testThread")
+    public ResultData testThread() throws Exception{
+
+        for(int i=1; i<=10; i++){
+            rabbitMqProducer.sendByWorkQueue("upgrade-to-v4-test", i);
+        }
+
+
+        return ResultData.ok();
+    }
+
+
     @GetMapping("/test")
     @GetMapping("/test")
     public ResultData test(String num) throws Exception{
     public ResultData test(String num) throws Exception{
 
 
@@ -103,6 +120,19 @@ public class SceneRepairController {
         return ResultData.ok();
         return ResultData.ok();
     }
     }
 
 
+    @GetMapping("/createQrCode")
+    public ResultData createQrCode(String num) throws Exception{
+        //生成二维码
+        String sceneUrl = mainUrl + "/" + sceneProNewUrl;
+        String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + num + ".png";
+        String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + num + "_en.png";
+        MatrixToImageWriterUtil.createQRCode(sceneUrl + num, outPathZh, false,null);
+        MatrixToImageWriterUtil.createQRCode(sceneUrl + num + "&lang=en", outPathEn, false, null);
+        uploadToOssUtil.upload(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
+        uploadToOssUtil.upload(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");
+        return ResultData.ok();
+    }
+
     @PostMapping("repairPan")
     @PostMapping("repairPan")
     public ResultData repairPan(String num){
     public ResultData repairPan(String num){
         ScenePro scenePro = sceneProService
         ScenePro scenePro = sceneProService

+ 2 - 3
src/main/java/com/fdkankan/repair/listener/RabbitMqListener.java

@@ -35,8 +35,8 @@ public class RabbitMqListener {
      * @throws Exception
      * @throws Exception
      */
      */
     @RabbitListener(
     @RabbitListener(
-        queuesToDeclare = @Queue("${queue.scene.upgrade-to-v4}")
-//        concurrency = "${maxThread.modeling.modeling-pre}"
+        queuesToDeclare = @Queue("${queue.scene.upgrade-to-v4}"),
+        concurrency = "${maxThread.scene.upgrade-to-v4}"
     )
     )
     public void buildScenePreHandler(Channel channel, Message message) throws Exception {
     public void buildScenePreHandler(Channel channel, Message message) throws Exception {
         Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
         Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
@@ -50,5 +50,4 @@ public class RabbitMqListener {
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
     }
 
 
-
 }
 }