Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-analysis/pom.xml

@@ -185,9 +185,9 @@
            <version>${version.joda-time}</version>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>redis.clients</groupId>-->
            <!--<artifactId>jedis</artifactId>-->
            <!--<version>${version.jedis}</version>-->
        <!--<groupId>redis.clients</groupId>-->
        <!--<artifactId>jedis</artifactId>-->
        <!--<version>${version.jedis}</version>-->
        <!--</dependency>-->
        <dependency>
            <groupId>commons-codec</groupId>
@@ -394,9 +394,9 @@
            <version>20151123</version>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.data</groupId>-->
            <!--<artifactId>spring-data-redis</artifactId>-->
            <!--<version>1.7.2.RELEASE</version>-->
        <!--<groupId>org.springframework.data</groupId>-->
        <!--<artifactId>spring-data-redis</artifactId>-->
        <!--<version>1.7.2.RELEASE</version>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework</groupId>
@@ -408,7 +408,6 @@
            <artifactId>json-lib</artifactId>
            <version>2.4</version>
        </dependency>
    </dependencies>
    <build>
@@ -430,10 +429,10 @@
            </plugin>
            <!--打成war包需要的配置-->
            <!--<plugin>-->
                <!--<artifactId>maven-war-plugin</artifactId>-->
                <!--<configuration>-->
                    <!--<failOnMissingWebXml>false</failOnMissingWebXml>-->
                <!--</configuration>-->
            <!--<artifactId>maven-war-plugin</artifactId>-->
            <!--<configuration>-->
            <!--<failOnMissingWebXml>false</failOnMissingWebXml>-->
            <!--</configuration>-->
            <!--</plugin>-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/listener/LabelDataListener.java

@@ -29,18 +29,18 @@ public class LabelDataListener {
    //@Scheduled(cron = "0 0/1 * * * ?") //每分钟执行一次
    @KafkaListener(topics = "flumeLog1")
    public void labelData(ConsumerRecord<?, ?> record) {
        logger.debug("Kafka开始消费");
        logger.info("Kafka开始消费");
        Optional<?> kafkaMessage = Optional.ofNullable(record.value());
        if (kafkaMessage.isPresent()) {
            Object message = kafkaMessage.get();
            try {
                logger.debug("接受到的消息:" + String.valueOf(message));
                logger.info("接受到的消息:" + String.valueOf(message));
                String[] value = String.valueOf(message).split(" - ");
                if (value.length == 5) {
                    mongoTemplate.insert(
                            new LabelDataModel(value[0], value[1], value[2], value[3], value[4]), mongoDbTableName
                    );
                    logger.debug("保存成功,message:" + message);
                    logger.info("保存成功,message:" + message);
                } else {
                    logger.error("数据格式错误,message:" + message);
                }