|
@@ -2,14 +2,22 @@ package com.diagbot.facade;
|
|
|
|
|
|
import com.diagbot.biz.push.entity.Item;
|
|
import com.diagbot.biz.push.entity.Item;
|
|
import com.diagbot.client.PushNewServiceClient;
|
|
import com.diagbot.client.PushNewServiceClient;
|
|
-import com.diagbot.dto.*;
|
|
|
|
|
|
+import com.diagbot.dto.PushBaseDTO;
|
|
|
|
+import com.diagbot.dto.PushDTO;
|
|
|
|
+import com.diagbot.dto.PushNewDTO;
|
|
|
|
+import com.diagbot.dto.PushPlanDTO;
|
|
|
|
+import com.diagbot.dto.WordCrfDTO;
|
|
import com.diagbot.enums.DiagnoseTypeEnum;
|
|
import com.diagbot.enums.DiagnoseTypeEnum;
|
|
import com.diagbot.enums.RedisEnum;
|
|
import com.diagbot.enums.RedisEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.model.entity.Diag;
|
|
import com.diagbot.model.entity.Diag;
|
|
import com.diagbot.process.PushProcess;
|
|
import com.diagbot.process.PushProcess;
|
|
-import com.diagbot.util.*;
|
|
|
|
|
|
+import com.diagbot.util.CoreUtil;
|
|
|
|
+import com.diagbot.util.ListUtil;
|
|
|
|
+import com.diagbot.util.ParamUtil;
|
|
|
|
+import com.diagbot.util.RedisUtil;
|
|
|
|
+import com.diagbot.util.StringUtil;
|
|
import com.diagbot.vo.PushNewVO;
|
|
import com.diagbot.vo.PushNewVO;
|
|
import com.diagbot.vo.PushPlanVO;
|
|
import com.diagbot.vo.PushPlanVO;
|
|
import com.diagbot.vo.PushVO;
|
|
import com.diagbot.vo.PushVO;
|
|
@@ -20,7 +28,11 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.Iterator;
|
|
|
|
+import java.util.LinkedHashMap;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Description: 推送facade
|
|
* @Description: 推送facade
|
|
@@ -74,13 +86,14 @@ public class PushFacade {
|
|
} else {
|
|
} else {
|
|
return pushNewFac(pushVO, modelType);
|
|
return pushNewFac(pushVO, modelType);
|
|
}
|
|
}
|
|
- default: // 默认使用新版推送
|
|
|
|
- return pushNewFac(pushVO, "0");
|
|
|
|
|
|
+ default: // 默认使用新版推送
|
|
|
|
+ return pushNewFac(pushVO, "0");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 5.0 推送总入口
|
|
* 5.0 推送总入口
|
|
|
|
+ *
|
|
* @param pushVo
|
|
* @param pushVo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -193,6 +206,7 @@ public class PushFacade {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 诊断去重、合并处理
|
|
* 诊断去重、合并处理
|
|
|
|
+ *
|
|
* @param pushDTO
|
|
* @param pushDTO
|
|
*/
|
|
*/
|
|
public void dealDisease(PushDTO pushDTO, WordCrfDTO wordCrfDTO, int length, boolean hasDiseaseFlag) {
|
|
public void dealDisease(PushDTO pushDTO, WordCrfDTO wordCrfDTO, int length, boolean hasDiseaseFlag) {
|
|
@@ -260,7 +274,7 @@ public class PushFacade {
|
|
* 生成新版推送入参
|
|
* 生成新版推送入参
|
|
*
|
|
*
|
|
* @param wordCrfDTO
|
|
* @param wordCrfDTO
|
|
- * @param modelType 模型类型
|
|
|
|
|
|
+ * @param modelType 模型类型
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public PushNewVO generatePushVo(WordCrfDTO wordCrfDTO, String modelType) {
|
|
public PushNewVO generatePushVo(WordCrfDTO wordCrfDTO, String modelType) {
|