评分接口迁移到报表服务

security-center/src/main/java/com/lantone/security/client/QcServiceClient.java

@@ -1,9 +1,9 @@
-package com.lantone.security.client;
+package com.lantone.analyze.client;
 
+import com.lantone.analyze.client.hystrx.QcServiceHystrix;
 import com.lantone.common.dto.analyze.OutputInfo;
 import com.lantone.common.dto.analyze.Response;
 import com.lantone.common.vo.analyze.QueryVo;
-import com.lantone.security.client.hystrx.QcServiceHystrix;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 

security-center/src/main/java/com/lantone/security/client/hystrx/QcServiceHystrix.java

@@ -1,10 +1,10 @@
-package com.lantone.security.client.hystrx;
+package com.lantone.analyze.client.hystrx;
 
 
+import com.lantone.analyze.client.QcServiceClient;
 import com.lantone.common.dto.analyze.OutputInfo;
 import com.lantone.common.dto.analyze.Response;
 import com.lantone.common.vo.analyze.QueryVo;
-import com.lantone.security.client.QcServiceClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

security-center/src/main/java/com/lantone/security/facade/analyze/BehospitalInfoManagementFacade.java

@@ -1,29 +1,30 @@
-package com.lantone.security.facade.analyze;
+package com.lantone.analyze.facade.analyze;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.common.dto.analyze.RePlaceData;
-import com.lantone.common.dto.analyze.Response;
-import com.lantone.common.dto.analyze.BehospitalInfoDTO;
-import com.lantone.common.dto.analyze.BasDeptInfoDTO;
-import com.lantone.common.util.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.dto.analyze.AlgorithmDTO;
 import com.lantone.common.dto.analyze.AnalyzeDTO;
+import com.lantone.common.dto.analyze.BasDeptInfoDTO;
+import com.lantone.common.dto.analyze.BehospitalInfoDTO;
 import com.lantone.common.dto.analyze.MedLisResultDTO;
 import com.lantone.common.dto.analyze.MedPacsResultDTO;
 import com.lantone.common.dto.analyze.MedicalRecordDTO;
 import com.lantone.common.dto.analyze.OutputInfo;
 import com.lantone.common.dto.analyze.QcCasesEntryDTO;
 import com.lantone.common.dto.analyze.QcModeDTO;
+import com.lantone.common.dto.analyze.RePlaceData;
 import com.lantone.common.dto.analyze.RecordContentDTO;
+import com.lantone.common.dto.analyze.Response;
+import com.lantone.common.enums.CheckStatusEnum;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.exception.Asserts;
 import com.lantone.common.service.RedisService;
+import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EncrypDES;
 import com.lantone.common.util.EntityUtil;
@@ -31,17 +32,17 @@ import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.MapUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
-import com.lantone.common.vo.analyze.BehospitalInfoVo;
 import com.lantone.common.vo.analyze.AlgorithmVO;
 import com.lantone.common.vo.analyze.AnalyzeVO;
+import com.lantone.common.vo.analyze.BasDeptInfoVO;
+import com.lantone.common.vo.analyze.BehospitalInfoVo;
+import com.lantone.common.vo.analyze.BehospitalPageVO;
 import com.lantone.common.vo.analyze.MedQcresultCasesVO;
 import com.lantone.common.vo.analyze.MedrecVo;
 import com.lantone.common.vo.analyze.QcResultAlgQueryVO;
 import com.lantone.common.vo.analyze.QcResultAlgVO;
 import com.lantone.common.vo.analyze.QueryVo;
 import com.lantone.common.vo.analyze.RecordContentVO;
-import com.lantone.common.vo.analyze.BasDeptInfoVO;
-import com.lantone.common.vo.analyze.BehospitalPageVO;
 import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.analyze.MedBehospitalInfo;
 import com.lantone.dblayermbg.entity.analyze.MedCheckInfo;
@@ -124,7 +125,6 @@ import com.lantone.dblayermbg.facade.analyze.StrWardRecordFacade;
 import com.lantone.dblayermbg.service.impl.analyze.MedQcresultCasesServiceImpl;
 import com.lantone.dblayermbg.service.impl.analyze.MedQcresultDetailServiceImpl;
 import com.lantone.dblayermbg.service.impl.analyze.StrInformedConsentServiceImpl;
-import com.lantone.security.enums.CheckStatusEnum;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

security-center/src/main/java/com/lantone/security/facade/analyze/QcClientFacade.java

@@ -1,6 +1,7 @@
-package com.lantone.security.facade.analyze;
+package com.lantone.analyze.facade.analyze;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.analyze.client.QcServiceClient;
 import com.lantone.common.dto.analyze.OutputInfo;
 import com.lantone.common.dto.analyze.Response;
 import com.lantone.common.enums.IsDeleteEnum;
@@ -9,7 +10,6 @@ import com.lantone.common.util.StringUtil;
 import com.lantone.common.vo.analyze.QueryVo;
 import com.lantone.dblayermbg.entity.HospitalSet;
 import com.lantone.dblayermbg.facade.HospitalSetFacade;
-import com.lantone.security.client.QcServiceClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

security-center/src/main/java/com/lantone/security/facade/UserPagesetManagementFacade.java

@@ -1,4 +1,4 @@
-package com.lantone.security.facade;
+package com.lantone.analyze.facade.analyze;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lantone.common.dto.analyze.SysUserPagesetDTO;

security-center/src/main/java/com/lantone/security/web/BehospitalInfoManagementController.java

@@ -1,6 +1,8 @@
-package com.lantone.security.web;
+package com.lantone.analyze.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.analyze.facade.analyze.BehospitalInfoManagementFacade;
+import com.lantone.analyze.facade.analyze.compute.BehospitalInfoManagementFacade_New;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.analyze.AnalyzeDTO;
 import com.lantone.common.dto.analyze.BasDeptInfoDTO;
@@ -8,8 +10,6 @@ import com.lantone.common.dto.analyze.BehospitalInfoDTO;
 import com.lantone.common.vo.analyze.AnalyzeVO;
 import com.lantone.common.vo.analyze.BasDeptInfoVO;
 import com.lantone.common.vo.analyze.BehospitalPageVO;
-import com.lantone.security.facade.analyze.BehospitalInfoManagementFacade;
-import com.lantone.security.facade.analyze.compute.BehospitalInfoManagementFacade_New;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

security-center/src/main/java/com/lantone/security/web/UserPagesetManagementController.java

@@ -1,11 +1,11 @@
-package com.lantone.security.web;
+package com.lantone.analyze.web;
 
 
+import com.lantone.analyze.facade.analyze.UserPagesetManagementFacade;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.analyze.SysUserPagesetDTO;
 import com.lantone.common.vo.analyze.SysUserPagesetQueryVO;
 import com.lantone.common.vo.analyze.SysUserPagesetSaveVO;
-import com.lantone.security.facade.UserPagesetManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

security-center/src/main/java/com/lantone/security/enums/CheckStatusEnum.java

@@ -1,50 +0,0 @@
-package com.lantone.security.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 下午2:31:42
- */
-public enum CheckStatusEnum implements KeyedNamed {
-    Disable(0, "未核查"),
-    Enable(1, "已核查");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    CheckStatusEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static CheckStatusEnum getEnum(int key) {
-        for (CheckStatusEnum item : CheckStatusEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        CheckStatusEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

security-center/src/main/resources/bootstrap.yml

@@ -33,8 +33,6 @@ management:
     health:
       show-details: always
 
-encrypt:
-  enable: true
 
 feign:
   okhttp: