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

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/LogDataTransform.java

@@ -10,7 +10,7 @@ import java.util.Map;
/**
 * 日志信息分析提取
 * <p>
 *
 * Created by lyr-pc on 2017/2/17.
 */
public class LogDataTransform {
@@ -72,24 +72,31 @@ public class LogDataTransform {
        try {
            logger.info("log transform begin init");
            transforms.clear();
            // 当前文件路径
            String path = LogDataTransform.class.getResource(".").getPath();
            // 当前应用类路径
            String rootPath = LogDataTransform.class.getResource("/").getPath();
            File root = new File(rootPath);
            // 日志清洗类路径
            File fileEtl = new File(path, "transform");
            // 过滤日志清洗类文件
            File[] files = fileEtl.listFiles((pathname) -> {
                return pathname.getName().endsWith("Transform.class");
            });
            ClassLoader classLoader = ClassLoader.getSystemClassLoader();
            for (File file : files) {
                // 获取类名
                String className = file.getAbsolutePath()
                        .replace(root.getAbsolutePath() + "\\", "")
                        .replace("\\", ".")
                        .replace(".class", "");
                Class logClass = classLoader.loadClass(className);
                Object object = logClass.newInstance();
                if (object instanceof ILogTransform) {
                    ILogTransform logTransform = (ILogTransform) object;
                    transforms.put(String.valueOf(logTransform.getLogType()), logTransform);
                if (logClass != null) {
                    Object object = logClass.newInstance();
                    if (object instanceof ILogTransform) {
                        ILogTransform logTransform = (ILogTransform) object;
                        transforms.put(String.valueOf(logTransform.getLogType()), logTransform);
                    }
                }
            }
            logger.info("log transform init success");

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/ConsultLogTransform.java

@@ -11,6 +11,8 @@ import com.yihu.wlyy.analysis.model.DataModel;
 */
public class ConsultLogTransform implements ILogTransform {
    private final BusinessTypeEnum logType = BusinessTypeEnum.consult;
    @Override
    public void transform(DataModel log) {
@@ -18,11 +20,11 @@ public class ConsultLogTransform implements ILogTransform {
    @Override
    public int getLogType() {
        return BusinessTypeEnum.consult.ordinal();
        return logType.ordinal();
    }
    @Override
    public String getLogTypeName() {
        return BusinessTypeEnum.consult.name();
        return logType.name();
    }
}

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/RegisterLogTransform.java

@@ -6,11 +6,13 @@ import com.yihu.wlyy.analysis.model.DataModel;
/**
 * 注册日志信息提取分析
 * <p>
 *
 * Created by lyr-pc on 2017/2/17.
 */
public class RegisterLogTransform implements ILogTransform {
    private final BusinessTypeEnum logType = BusinessTypeEnum.register;
    @Override
    public void transform(DataModel log) {
@@ -18,13 +20,12 @@ public class RegisterLogTransform implements ILogTransform {
    @Override
    public int getLogType() {
        return BusinessTypeEnum.register.ordinal();
        return logType.ordinal();
    }
    @Override
    public String getLogTypeName() {
        return BusinessTypeEnum.register.name();
        return logType.name();
    }
}
}