1. 07 Apr, 2022 2 commits
    • wangjinjing's avatar
      Merge branch 'master' of http://192.168.168.218/videoaiservice/videoaibatchtaskconsumerservice · 197df9f7
      wangjinjing authored
      # Conflicts:
      #	pom.xml
      #	src/main/java/com/cx/cn/cxquartz/bean/GoalStructureParam.java
      #	src/main/java/com/cx/cn/cxquartz/config/PerformedTaskCornChange.java
      #	src/main/java/com/cx/cn/cxquartz/config/RabbitConfig.java
      #	src/main/java/com/cx/cn/cxquartz/config/RestTemplateConfig.java
      #	src/main/java/com/cx/cn/cxquartz/config/SendToDXConfig.java
      #	src/main/java/com/cx/cn/cxquartz/config/SendToVoiceConfig.java
      #	src/main/java/com/cx/cn/cxquartz/config/TaskComsumExchangeConfig.java
      #	src/main/java/com/cx/cn/cxquartz/config/getSnapShotConfig.java
      #	src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
      #	src/main/java/com/cx/cn/cxquartz/dao/LJTMyjcResultMapper.java
      #	src/main/java/com/cx/cn/cxquartz/dao/TraffAlarmRecordMapper.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/QueueConstants.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/BaseConsumer.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/BaseConsumerProxy.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/SendToDXConsumer.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/SendToVoiceConsumer.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/SnapShotConsumer.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/AutoSnapReceiver.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/RTSPorHLSReceiver.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/SendtoDXReceiver.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/SendtoVoiceAlarmReceiver.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/SnapTaskReceiver.java
      #	src/main/java/com/cx/cn/cxquartz/rabbitmq/producer/callback/ConsumerConfirmAndReturnCallback.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/EventWriteService.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/VideoRTSPorURLService.java
      #	src/main/java/com/cx/cn/cxquartz/util/CommonUtil.java
      #	src/main/java/com/cx/cn/cxquartz/util/DateUtils.java
      #	src/main/java/com/cx/cn/cxquartz/util/PointUtil.java
      #	src/main/java/com/cx/cn/cxquartz/util/RestUtil.java
      #	src/main/java/com/cx/cn/cxquartz/vo/Sbtdspsr.java
      #	src/main/java/com/cx/cn/cxquartz/vo/TraffAlarmRecord.java
      #	src/main/java/com/cx/cn/cxquartz/vo/Traffpicture.java
      #	src/main/java/com/cx/cn/cxquartz/vo/VoiceData.java
      #	src/main/resources/application-local.yml
      #	src/main/resources/application.yml
      #	src/main/resources/logback-spring.xml
      #	src/main/resources/mapper/LJTMyjcResultMapper.xml
      #	src/main/resources/mapper/SbtdspsrMapper.xml
      #	src/main/resources/mapper/TraffPictureMapper.xml
      #	src/test/java/com/quartz/cn/com/cx/cn/cxquartz/CXQuartzApplicationTests.java
      197df9f7
    • wangjinjing's avatar
      修改同步 · a53e0467
      wangjinjing authored
      a53e0467
  2. 14 Jan, 2022 5 commits
  3. 03 Dec, 2021 1 commit
  4. 08 Oct, 2021 2 commits
  5. 10 Sep, 2021 3 commits
  6. 09 Sep, 2021 1 commit
  7. 28 Jul, 2021 1 commit
  8. 21 Jul, 2021 1 commit
  9. 20 Jul, 2021 2 commits
  10. 16 Jul, 2021 1 commit
  11. 15 Jul, 2021 1 commit
  12. 01 Jul, 2021 2 commits
  13. 25 Jun, 2021 2 commits
    • yzm's avatar
      Merge remote-tracking branch 'origin/master' · 42a7d921
      yzm authored
      # Conflicts:
      #	pom.xml
      #	src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
      #	src/main/java/com/cx/cn/cxquartz/controller/IndexController.java
      #	src/main/java/com/cx/cn/cxquartz/controller/QuartzController.java
      #	src/main/java/com/cx/cn/cxquartz/controller/SbtdspsrController.java
      #	src/main/java/com/cx/cn/cxquartz/dao/QuartzTaskInformationsMapper.java
      #	src/main/java/com/cx/cn/cxquartz/dao/SbtdspsrMapper.java
      #	src/main/java/com/cx/cn/cxquartz/dao/TraffPictureMapper.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/FtpService.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/QuartzService.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/QuartzTaskInformationsService.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/SbtdspsrService.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/TraffPictureService.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzServiceImpl.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzTaskInformationsServiceImpl.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/SbtdspsrImpl.java
      #	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/TraffpictureServiceImpl.java
      #	src/main/java/com/cx/cn/cxquartz/util/FTPUtil.java
      #	src/main/java/com/cx/cn/cxquartz/util/FileTransferManager.java
      #	src/main/java/com/cx/cn/cxquartz/util/RestTemplateConfig.java
      #	src/main/java/com/cx/cn/cxquartz/vo/ImageList.java
      #	src/main/java/com/cx/cn/cxquartz/vo/ObjectBoundingBox.java
      #	src/main/java/com/cx/cn/cxquartz/vo/Output.java
      #	src/main/java/com/cx/cn/cxquartz/vo/ResultObj.java
      #	src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
      #	src/main/resources/application.yml
      #	src/main/resources/file.properties
      #	src/main/resources/mapper/FaceMapper.xml
      #	src/main/resources/mapper/PedestrianMapper.xml
      #	src/main/resources/mapper/PeopleridebicycMapper.xml
      #	src/main/resources/mapper/QuartzTaskInformationsMapper.xml
      #	src/main/resources/mapper/SbtdspsrMapper.xml
      #	src/main/resources/mapper/TraffAlarmRecordMapper.xml
      #	src/main/resources/mapper/TraffPictureMapper.xml
      #	src/main/resources/templates/addtask.html
      #	src/main/resources/templates/index.html
      #	src/main/resources/templates/updatetask.html
      #	src/test/java/com/quartz/cn/com/cx/cn/cxquartz/CXQuartzApplicationTests.java
      42a7d921
    • yzm's avatar
      修复ftpbug · 385fc38a
      yzm authored
      385fc38a
  14. 09 Jun, 2021 1 commit
    • yzm's avatar
      init · 7ec8ba1d
      yzm authored
      7ec8ba1d
  15. 28 May, 2021 1 commit
  16. 26 May, 2021 2 commits
  17. 25 May, 2021 1 commit
  18. 21 May, 2021 1 commit
  19. 19 May, 2021 1 commit
    • yzm's avatar
      bug · 37a7ec1c
      yzm authored
      37a7ec1c
  20. 17 May, 2021 1 commit
  21. 15 May, 2021 2 commits
  22. 14 May, 2021 3 commits
  23. 07 May, 2021 1 commit
  24. 06 May, 2021 2 commits