Revert "代码格式1..."

This reverts commit a2dcc61648b35d02ea4663402e0ebfd1ba08936d.

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseQuestionFacade.java

@@ -25,13 +25,10 @@ public class DiagnoseQuestionFacade  {
 	public IPage<DiagnoseQuestionPageDTO> queryQuestionPage(DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
 		
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		diaQuery.like("type",diagnoseQuestionPageVO.getType())
-		        .like("dis_name",diagnoseQuestionPageVO.getDisName())
-		        .like("question_name",diagnoseQuestionPageVO.getQuestionCode())
-		        .eq("is_deleted",IsDeleteEnum.N.getKey())
-		        .orderByDesc("gmt_modified");
-		
-		IPage<DiagnoseQuestionPageDTO> datas = diagnoseQuestionService.page(diagnoseQuestionPageVO, diaQuery);		
+		diaQuery.like("type",diagnoseQuestionPageVO.getType());
+		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
+				
+		IPage<DiagnoseQuestionPageDTO> datas = diagnoseQuestionService.page(diagnoseQuestionPageVO, diaQuery);
 		
 		return datas;
 	}

knowledgeman-service/src/main/java/com/diagbot/facade/EvaluationFacade.java

@@ -86,7 +86,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
     public List<EvaluationModuleAllDTO> getEvaluationModuleList(EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
         QueryWrapper<Evaluation> evaluationModuleQuery = new QueryWrapper<>();
         evaluationModuleQuery.eq("concept_id", evaluationModuleDiseaseIdVO.getDiseaseId())
-                             .eq("is_deleted", IsDeleteEnum.N.getKey());
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
         List<Evaluation> datas = list(evaluationModuleQuery);
         // 过滤
         List<EvaluationModuleAllDTO> data = BeanUtil.listCopyTo(datas, EvaluationModuleAllDTO.class);
@@ -174,10 +174,10 @@ public class EvaluationFacade extends EvaluationServiceImpl {
     public boolean cancelEvaluationModuleAll(EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
         UpdateWrapper<Evaluation> evaluaNew = new UpdateWrapper<>();
         evaluaNew.eq("concept_id", evaluationDiseaseIdVO.getDiseaseId())
-                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                 .set("is_deleted", IsDeleteEnum.Y.getKey())
-                 .set("modifier", UserUtils.getCurrentPrincipleID())
-                 .set("gmt_modified", DateUtil.now());
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
         return update(new Evaluation(), evaluaNew);
     }
 

knowledgeman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -82,8 +82,8 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 	 */
 	public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
 		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
-		IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
-		                .eq("is_deleted",IsDeleteEnum.N.getKey());
+		IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted",
+				IsDeleteEnum.N.getKey());
 		List<IndexConfig> datas = list(IndexConfigQuery);
 		// 过滤
 		List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
@@ -187,22 +187,14 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 	 */
 	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
 		UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
-		if(indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.Y.getKey())){	
-			
-		IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
-		              .eq("is_deleted", IsDeleteEnum.N.getKey())
-				      .set("is_deleted", IsDeleteEnum.Y.getKey())
-				      .set("modifier", UserUtils.getCurrentPrincipleID())
-				      .set("gmt_modified", DateUtil.now());	
-		
+		if(indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.Y.getKey())){		
+		IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());	
 		}else if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.N.getKey())){
-			
-		IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
-			          .eq("is_deleted", IsDeleteEnum.Y.getKey())
-			          .set("is_deleted", IsDeleteEnum.N.getKey())
-			          .set("modifier", UserUtils.getCurrentPrincipleID())
-			          .set("gmt_modified", DateUtil.now());		
-		
+			IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.Y.getKey())
+			.set("is_deleted", IsDeleteEnum.N.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+			.set("gmt_modified", DateUtil.now());		
 		}else{
 			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"state传参有误，应为'Y'或'N'");
 		}

knowledgeman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -57,14 +57,13 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     public List<VersionDetailDTO> getById(Long id) {
         QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
 
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
-                          .eq("STATUS", StatusEnum.Enable.getKey())
-                          .eq("version_id", id)
-                          .orderByAsc("order_no");
+        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .eq("version_id", id).orderByAsc("order_no");
 
         VersionDetail versionDetail = new VersionDetail();
         versionDetail.setVersionId(id);
         List<VersionDetail> datas = list(versionDetailQuery);
+        // System.out.println("List<VersionDetail>==="+datas.toString());
         List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
         // 过滤字段
         for (VersionDetail versionData : datas) {
@@ -117,10 +116,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     public List<VersionDetailDTO> getByIds(List<Long> ids) {
         QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
 
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
-                          .eq("STATUS", StatusEnum.Enable.getKey())
-                          .in("version_id", ids)
-                          .orderByAsc("order_no");
+        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .in("version_id", ids).orderByAsc("order_no");
 
         List<VersionDetail> datas = list(versionDetailQuery);
         List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
@@ -198,10 +195,10 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
         checkExistMain(versionDetailres.getVersionId());
         UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
         versionDetailNew.in("id", versionDetailIdVO.getId())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .set("is_deleted", IsDeleteEnum.Y.getKey())
-                        .set("modifier", UserUtils.getCurrentPrincipleID())
-                        .set("gmt_modified", DateUtil.now());
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
         return update(new VersionDetail(), versionDetailNew);
     }
 
@@ -264,7 +261,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     private void checkExistMain(Long id) {
         // 1.先判断数据是否存在有效
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", id);
         VersionInfo versionInfo = versionInfoServiceImpl.getOne(VersionInfoFand, false);
         if (null == versionInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "主版本号数据不存在");

knowledgeman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -63,7 +63,13 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      * @return
      */
     public IPage<VersionWrapperDTO> getVersionInfoAll(Page page, VersionWrapperNameVO versionWrapperNameVO) {
-
+        // 模糊查询最新的一条版本信息
+       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+                .like("name", name).orderByDesc("refresh_time");
+      
+        // 分页查询
+*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
         IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page, versionWrapperNameVO);
         List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
         List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
@@ -128,8 +134,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         // 1.判断摸个产品该版本号是否存在名字相同的数据
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         templateInfoFand.eq("product_type", versionInfoVO.getProductType())
-                        .eq("name", versionInfoVO.getName())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey());
+                .eq("name", versionInfoVO.getName())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
 
         VersionInfo dataInfo = getOne(templateInfoFand, false);
         if (dataInfo != null) {
@@ -138,11 +144,11 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         //2.把相同产品类型的版本状态修改为0，
         UpdateWrapper<VersionInfo> versionInfoUp = new UpdateWrapper<>();
         versionInfoUp.eq("product_type", versionInfoVO.getProductType())
-	                 .eq("status", StatusEnum.Enable.getKey())
-	                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-	                 .set("status", StatusEnum.Disable.getKey())
-	                 .set("modifier", UserUtils.getCurrentPrincipleID())
-	                 .set("gmt_modified", DateUtil.now());
+                .eq("status", StatusEnum.Enable.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("status", StatusEnum.Disable.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
         update(new VersionInfo(), versionInfoUp);
 
         //3.增加版本数据
@@ -207,8 +213,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         // 2.判断该版本号是否存在名字相同的数据
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
         templateInfoFand.eq("product_type", versionInfoVO.getProductType())
-		                .eq("name", versionInfoVO.getName())
-		                .eq("is_deleted", IsDeleteEnum.N.getKey());
+                .eq("name", versionInfoVO.getName())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
 
         VersionInfo dataInfo = getOne(templateInfoFand, false);
         if (dataInfo != null && !dataInfo.getId().equals(versionInfoVO.getId())) {
@@ -251,10 +257,10 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         checkExist(versionInfoVO.getId());
         UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
         versionInfoNew.in("id", versionInfoVO.getId())
-	                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-	                 .set("is_deleted", IsDeleteEnum.Y.getKey())
-	                 .set("modifier", UserUtils.getCurrentPrincipleID())
-	                 .set("gmt_modified", DateUtil.now());
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
         return update(new VersionInfo(), versionInfoNew);
     }
 
@@ -266,7 +272,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
     private VersionInfo checkExist(Long id) {
         // 1.先判断数据是否存在有效
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", id);
         VersionInfo versionInfo = getOne(VersionInfoFand, false);
         if (null == versionInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
@@ -291,9 +298,9 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         //查询最新的一条版本信息
         QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
         versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
-		                .eq("product_type", versionVO.getProductType())
-		                .eq("STATUS", StatusEnum.Enable.getKey())
-		                .orderByDesc("gmt_modified");
+                .eq("product_type", versionVO.getProductType())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .orderByDesc("gmt_modified");
 
         VersionInfo versionInfo = getOne(versionInfoQuery, false);
         VersionSpecDTO versionList = new VersionSpecDTO();

knowledgeman-service/src/main/java/com/diagbot/web/DiagnoseExportImportController.java

@@ -38,30 +38,30 @@ public class DiagnoseExportImportController {
 	@Autowired
 	DiagnoseImportFacade diagnoseImportFacade;
 
-	@ApiOperation(value = "导入诊断依据数据:[by:wangfeng]", notes = "导入诊断依据数据")
-	@PostMapping(value = "/importDiagnosticBasis", produces = "text/html;charset=utf-8")
-	@ApiIgnore
-	public String importDiagnosticBasis(@RequestParam("uploadfile") MultipartFile file, HttpServletRequest request) {
-		return GsonUtil.toJson(diagnoseImportFacade.importDiagnosticBasisAll(file, request));
-	}
-
-	@ApiOperation(value = "导出诊断依据问题:[by:wangfeng]", notes = "导出诊断依据问题")
-	@PostMapping("/exportDiagnosticBasis")
-	@SysLoggerExport("exportDiagnosticBasis")
-	@ResponseBody
-	public void exportDiagnosticBasis(@RequestBody DiagnosticBasisExportVO diaExportVO, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-		diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
-
-	}
-
-	@ApiOperation(value = "导出诊断依据:[by:wangfeng]", notes = "导出诊断依据")
-	@PostMapping("/exportDiagnosticAll")
-	@SysLoggerExport("exportDiagnosticAll")
-	@ResponseBody
-	public void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-		diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
-
-	}
+    @ApiOperation(value = "导入诊断依据数据:[by:wangfeng]", notes = "导入诊断依据数据")
+    @PostMapping(value = "/importDiagnosticBasis", produces="text/html;charset=utf-8")
+    @ApiIgnore
+    public String importDiagnosticBasis(@RequestParam("uploadfile") MultipartFile file,HttpServletRequest request) {
+        return GsonUtil.toJson(diagnoseImportFacade.importDiagnosticBasisAll(file, request));
+    }
+    
+    @ApiOperation(value = "导出诊断依据问题:[by:wangfeng]", notes = "导出诊断依据问题")
+    @PostMapping("/exportDiagnosticBasis")
+    @SysLoggerExport("exportDiagnosticBasis")
+    @ResponseBody
+    public  void exportDiagnosticBasis(@RequestBody DiagnosticBasisExportVO diaExportVO,HttpServletRequest request,HttpServletResponse response)
+            throws Exception {
+    	diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
+        
+    }
+    
+    @ApiOperation(value = "导出诊断依据:[by:wangfeng]", notes = "导出诊断依据")
+    @PostMapping("/exportDiagnosticAll")
+    @SysLoggerExport("exportDiagnosticAll")
+    @ResponseBody
+    public  void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO,HttpServletRequest request,HttpServletResponse response)
+            throws Exception {
+    	diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
+        
+    }
 }