江门公安

src/main/java/com/fdkankan/scene/controller/SceneMarkShapeController.java

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class SceneMarkShapeController extends BaseController
 {
-    @Value("${queue.scene.yolov5-detect-queue}")
+    @Value("${queue.scene.yolov5-detect-queue:#{null}}")
     private String yolov5DetectQueue;
     @Autowired
     private ISceneMarkShapeService sceneMarkShapeService;

src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -30,7 +30,7 @@ public class RabbitMqListener {
     @Value("${queue.scene.transfer-tour-video}")
     private String downloadTourVideoQueue;
 
-    @Value("${queue.bodySegment:body-segment}")
+    @Value("${queue.bodySegment:body-segment:#{null}}")
     private String bodySegmentQueueName;
 
     @Autowired
@@ -57,42 +57,42 @@ public class RabbitMqListener {
         log.info("结束消费消息,id:{}", messageId);
     }
 
-    /**
-     * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
-     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
-     * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.bodySegment}"),
-            concurrency = "${maxThread.bodySegment}"
-    )
-    public void bodySegment(Channel channel, Message message) throws Exception {
-        String messageId = message.getMessageProperties().getMessageId();
-        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        log.info("开始消费消息,id:{},queue:{},content:{}", messageId, bodySegmentQueueName, msg);
-        JSONObject jsonObject = JSON.parseObject(msg);
-        sceneService.bodySegmentHandler(jsonObject.getString("imgUrl"), jsonObject.getString("uuid"));
-        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-        log.info("结束消费消息,id:{}", messageId);
-    }
+//    /**
+//     * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
+//     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
+//     * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
+//     */
+//    @RabbitListener(
+//            queuesToDeclare = @Queue("${queue.bodySegment}"),
+//            concurrency = "${maxThread.bodySegment}"
+//    )
+//    public void bodySegment(Channel channel, Message message) throws Exception {
+//        String messageId = message.getMessageProperties().getMessageId();
+//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+//        log.info("开始消费消息,id:{},queue:{},content:{}", messageId, bodySegmentQueueName, msg);
+//        JSONObject jsonObject = JSON.parseObject(msg);
+//        sceneService.bodySegmentHandler(jsonObject.getString("imgUrl"), jsonObject.getString("uuid"));
+//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+//        log.info("结束消费消息,id:{}", messageId);
+//    }
 
-    /**
-     * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
-     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
-     * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
-     */
-    @RabbitListener(
-        queuesToDeclare = @Queue("test_dsx")
-    )
-    public void test(Channel channel, Message message) throws Exception {
-        String messageId = message.getMessageProperties().getMessageId();
-        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-        log.info("开始消费消息,id:{},queue:{},content:{}", messageId, "test_dsx", msg);
-        Thread.sleep(10000L);
-        log.info("deliverTag:" + message.getMessageProperties().getDeliveryTag());
-        log.info("结束消费消息,id:{}", messageId);
-    }
+//    /**
+//     * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
+//     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
+//     * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
+//     */
+//    @RabbitListener(
+//        queuesToDeclare = @Queue("test_dsx")
+//    )
+//    public void test(Channel channel, Message message) throws Exception {
+//        String messageId = message.getMessageProperties().getMessageId();
+//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+//        log.info("开始消费消息,id:{},queue:{},content:{}", messageId, "test_dsx", msg);
+//        Thread.sleep(10000L);
+//        log.info("deliverTag:" + message.getMessageProperties().getDeliveryTag());
+//        log.info("结束消费消息,id:{}", messageId);
+//    }
 
 
 }

src/main/java/com/fdkankan/scene/service/impl/SceneCleanOrigServiceImpl.java

@@ -47,19 +47,19 @@ import java.util.stream.Collectors;
 @Service
 public class SceneCleanOrigServiceImpl extends ServiceImpl<ISceneCleanOrigMapper, SceneCleanOrig> implements ISceneCleanOrigService {
 
-    @Value("${scene.cleanOrig.month}")
+    @Value("${scene.cleanOrig.month:#{120}}")
     private Integer cleanOrigMonth;
-    @Value("${scene.coldStorage.month}")
+    @Value("${scene.coldStorage.month:#{120}}")
     private Integer coldStorageMonth;
-    @Value("${scene.cleanDeleted.month}")
+    @Value("${scene.cleanDeleted.month:#{120}}")
     private Integer cleanDeletedMonth;
     @Value("#{'${scene.cleanTestCamera.snCode:}'.split(',')}")
     private List<String> testSnCodeList;
-    @Value("${scene.cleanTestCamera.month}")
+    @Value("${scene.cleanTestCamera.month:#{120}}")
     private Integer cleanTestCameraMonth;
     @Value("${fyun.bucket}")
     private String bucket;
-    @Value("${fyun.coldBucket}")
+    @Value("${fyun.coldBucket:#{null}}")
     private String coldBucket;
     @Autowired
     private ICameraService cameraService;

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -68,10 +68,10 @@ import org.springframework.util.ObjectUtils;
 @RefreshScope
 public class SceneEditServiceImpl implements ISceneEditService {
 
-    @Value("${4dkk.manageService.basePath}")
+    @Value("${4dkk.manageService.basePath:#{null}}")
     private String manageServiceUrl;
 
-    @Value("${4dkk.manageService.api.getServiceUpTip}")
+    @Value("${4dkk.manageService.api.getServiceUpTip:#{null}}")
     private String getServiceUpTipApi;
 
     @Autowired

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -42,7 +42,7 @@ import java.util.Objects;
 @Service("sceneService")
 public class SceneServiceImpl implements ISceneService {
 
-    @Value("${queue.bodySegment:body-segment}")
+    @Value("${queue.bodySegment:body-segment:#{null}}")
     private String queueName;
     @Value("${oss.bodySegment.bucket:4dkankan-huadong}")
     private String bodySegmentBucket;