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

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/DataModel.java

@@ -18,6 +18,8 @@ import org.springframework.data.annotation.Id;
      time:"" 时间
     ,logType:2 日志类型
     ,caller:"" 调用者
     ,traceId: "" 主流程id
     ,spanId:"" 模块id
     ,data:{
         ,businessType:""  业务类型
         ,patient:"" 居民
@@ -30,6 +32,8 @@ import org.springframework.data.annotation.Id;
  time:"" 时间
 ,logType:1 日志类型
 ,caller:"" 调用者
 ,traceId: "" 主流程id
 ,spanId:"" 模块id
 ,data:{
      responseTime:"" 响应时间
     ,url:"" 接口URL
@@ -40,6 +44,8 @@ import org.springframework.data.annotation.Id;
public class DataModel {
    @Id
    protected String id;
    protected String traceId;//主流程ID
    protected String spanId;//模块Id
    protected String time;//时间
    protected String caller; //调用者
    protected String logType;//日志类型 1接口 2业务
@@ -76,4 +82,20 @@ public class DataModel {
    public void setCaller(String caller) {
        this.caller = caller;
    }
    public String getTraceId() {
        return traceId;
    }
    public void setTraceId(String traceId) {
        this.traceId = traceId;
    }
    public String getSpanId() {
        return spanId;
    }
    public void setSpanId(String spanId) {
        this.spanId = spanId;
    }
}

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/OperatorDataModel.java

@@ -55,7 +55,12 @@ public class OperatorDataModel extends DataModel implements Serializable {
            operatorDataModel.setLogType(String.valueOf(jsonObject.get("logType")));
            operatorDataModel.setCaller(jsonObject.getString("caller"));
            operatorDataModel.setTime(jsonObject.getString("time"));
            if(jsonObject.has("traceId")){
                operatorDataModel.setTraceId(jsonObject.getString("traceId"));
            }
            if(jsonObject.has("spanId")){
                operatorDataModel.setSpanId(jsonObject.getString("spanId"));
            }
            JSONObject chlidren = jsonObject.getJSONObject("data");
            operatorDataModel.setResponseTime(chlidren.get("responseTime").toString());
            operatorDataModel.setUrl(chlidren.getString("url"));

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentDayAllQuotaJob.java

@@ -607,7 +607,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //统计数据 二级维度
            List<Map<String, Map<String, List<ETLModel>>>> level2Data= SpringUtil.getBean(Level2Role.class).elt(returnDatas);
            //保存数据
            SpringUtil.getBean(RedisStorage.class).saveByLevel2(level2Data,null,quotaId,0,4,0);
            SpringUtil.getBean(RedisStorage.class).saveByLevel2(level2Data,null,quotaId,2,6,0);
            allContent.append(JsonUtil.objToStr(etlModels.getLogModel()));
        }catch (Exception e){