Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/dto/TemplateInfoDTO.java

@@ -17,11 +17,11 @@ public class TemplateInfoDTO {
 	 private Long id;//模板id
 	 private Date  gmtCreate;//创建时间
 	 private String creator;//创建人id
-	 private String modeName;//模板名字
+	 private String name;//模板名字
 	 private Long doctorId;//医生id
 	 private Long hospitalId;//医院id
 	 private Long hospitalDeptId;//部门id
-	 private String modeType;//模板类型
+	 private String type;//模板类型
 	 private String  preview;//预览文字
 	 private String dataJson;//模板数据
 	 private String remark;//备注

icss-service/src/main/java/com/diagbot/dto/VersionDetailDTO.java

@@ -25,7 +25,7 @@ public class VersionDetailDTO {
     /**
      * 创建人，0表示无创建人值
      */
-    private String creator;
+   // private String creator;
 
   
     /**
@@ -51,7 +51,7 @@ public class VersionDetailDTO {
     /**
      * 1：启动，0：不启用
      */
-    private String status;
+  //  private String status;
 
     /**
      * 备注

icss-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacaed.java

@@ -6,11 +6,13 @@ import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.entity.DisclaimerInformation;
 import com.diagbot.entity.VersionDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
+import com.diagbot.util.BeanUtil;
 
 /**
  * 
@@ -26,16 +28,14 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
 	 * @return
 	 */
 	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-/*		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
 
-		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey())
-		                     .eq("STATUS", StatusEnum.Enable.getKey())
-				             .eq("version_id", 0)
-				             .orderByAsc("order_no");
-		List<DisclaimerInformation> data = list(disclaimerInformation);*/
-		
-		List<DisclaimerInformationDTO> data =getDisclaimerInformationAll();
-		return data;
+		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
+		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.orderByAsc("order_no");
+		List<DisclaimerInformation> data = list(disclaimerInformation);
+		// getDisclaimerInformationAll();
+		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
+		return datas;
 	}
 
 }

icss-service/src/main/java/com/diagbot/facade/DoctorPageModeFacade.java

@@ -1,5 +1,8 @@
 package com.diagbot.facade;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.validation.Valid;
 
 import org.springframework.stereotype.Component;
@@ -31,13 +34,15 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
 	@Transactional
 	public boolean saveDoctorPageMode(@Valid DoctorPageModeVO doctorPageModeVO) {
 		QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
-		doctorPageModeWrapper.eq("doctor_id", doctorPageModeVO.getDoctorId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("doctor_id", doctorPageModeVO.getDoctorId());
+		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
+		doctorPageModeWrapper.allEq(mapAll);
 		DoctorPageMode datas = getOne(doctorPageModeWrapper);
 		boolean res = false;
 		if (datas != null) {
 			UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();
-			doctorPageModeUpdate.eq("doctor_id", doctorPageModeVO.getDoctorId())
-			               .eq("is_deleted", IsDeleteEnum.N.getKey())
+			doctorPageModeUpdate.allEq(mapAll)
 			               .set("mode_classify",doctorPageModeVO.getModeClassify())
 			               .set("mode_value",doctorPageModeVO.getModeValue() )
 			               .set("modifier",doctorPageModeVO.getDoctorId().toString() )
@@ -64,7 +69,10 @@ public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
 	 */
 	public DoctorPageMode getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
 		QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
-		doctorPageModeWrapper.eq("doctor_id", doctorIdVO.getDoctorId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("doctor_id", doctorIdVO.getDoctorId());
+		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
+		doctorPageModeWrapper.allEq(mapAll);
 		DoctorPageMode doctorPageModeData = getOne(doctorPageModeWrapper);
 		return doctorPageModeData;
 	}

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -1,20 +1,24 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.entity.TemplateInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
-import com.diagbot.util.UserUtils;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
@@ -34,12 +38,38 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 	 * @return 医生病历模板信息
 	 */
 	public List<TemplateInfoDTO> findByDoctorIdTemplates(TemplateInfoVO templateInfoVO) {
-		//根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+		/*//根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
 		TemplateInfo templateInfo = new TemplateInfo();
 		templateInfo.setDoctorId(templateInfoVO.getDoctorId());//医生id
 		templateInfo.setHospitalDeptId(templateInfoVO.getHospitalDeptId());//部门id
 		templateInfo.setHospitalId(templateInfoVO.getHospitalId());//医院id
-		List<TemplateInfoDTO> data = findByDoctorIdTemplate(templateInfo);
+		List<TemplateInfoDTO> data = findByDoctorIdTemplate(templateInfo);*/
+		QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
+		Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("hospital_dept_id", templateInfoVO.getHospitalDeptId() );
+		mapAll.put("doctor_id",templateInfoVO.getDoctorId());
+		mapAll.put("hospital_id",templateInfoVO.getHospitalId());
+		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
+		templateInfoQuery.allEq(mapAll).orderByAsc("gmt_create");;
+		List<TemplateInfoDTO> data = new ArrayList<TemplateInfoDTO>();
+		List<TemplateInfo> datas = list(templateInfoQuery);
+		/*for(TemplateInfo templateInfo :datas){
+			TemplateInfoDTO templateInfoDTO =new TemplateInfoDTO();
+			templateInfoDTO.setId(templateInfo.getId());
+			templateInfoDTO.setCreator(templateInfo.getCreator());
+			templateInfoDTO.setDataJson(templateInfo.getDataJson());
+			templateInfoDTO.setDoctorId(templateInfo.getDoctorId());
+			templateInfoDTO.setGmtCreate(templateInfo.getGmtCreate());
+			templateInfoDTO.setHospitalDeptId(templateInfo.getHospitalDeptId());
+			templateInfoDTO.setHospitalId(templateInfo.getHospitalId());
+			templateInfoDTO.setModeName(templateInfo.getName());
+			templateInfoDTO.setModeType(templateInfo.getType());
+			templateInfoDTO.setPreview(templateInfo.getPreview());
+			templateInfoDTO.setRemark(templateInfo.getRemark());
+			
+			data.add(templateInfoDTO);
+		}*/
+		data = BeanUtil.listCopyTo(datas, TemplateInfoDTO.class);
 		
 		return data;
 	}
@@ -61,11 +91,13 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 		}
 		//2.再判断该医生下模板名是否重复重在
 		QueryWrapper<TemplateInfo> templates = new QueryWrapper<>();
-		       templates.eq("name", templateInfoRevampVO.getModeName())
-		                .eq("doctor_id", templateInfoRevampVO.getDoctorId())
-				        .eq("hospital_dept_id", templateInfoRevampVO.getHospitalDeptId())
-				        .eq("hospital_id", templateInfoRevampVO.getHospitalId())
-				        .eq("is_deleted", IsDeleteEnum.N.getKey());
+		Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("hospital_dept_id", templateInfoRevampVO.getHospitalDeptId() );
+		mapAll.put("doctor_id",templateInfoRevampVO.getDoctorId());
+		mapAll.put("hospital_id",templateInfoRevampVO.getHospitalId());
+		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
+		mapAll.put("name",templateInfoRevampVO.getModeName());
+		templates.allEq(mapAll);
 		TemplateInfo datas = getOne(templates);
 		if (datas != null) {
 			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
@@ -93,11 +125,14 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         //1.判断该医生下是否存在模板名相同的数据
 		TemplateInfo templateInfo = new TemplateInfo();
 		QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
-		templateInfoFand.eq("name", templateInfosVO.getModeName())
-		                .eq("doctor_id", templateInfosVO.getDoctorId())
-				        .eq("hospital_dept_id", templateInfosVO.getHospitalDeptId())
-				        .eq("hospital_id", templateInfosVO.getHospitalId())
-				        .eq("is_deleted", IsDeleteEnum.N.getKey());
+		Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("hospital_dept_id", templateInfosVO.getHospitalDeptId() );
+		mapAll.put("doctor_id",templateInfosVO.getDoctorId());
+		mapAll.put("hospital_id",templateInfosVO.getHospitalId());
+		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
+		mapAll.put("name",templateInfosVO.getModeName());
+		
+		templateInfoFand.allEq(mapAll);
 		TemplateInfo data = getOne(templateInfoFand);
 		if (data != null) {
 			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名存在");

icss-service/src/main/java/com/diagbot/facade/VersionDetailFacaed.java

@@ -10,7 +10,9 @@ import com.diagbot.util.BeanUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 版本详情
@@ -30,16 +32,15 @@ public class VersionDetailFacaed 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");
+        Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("is_deleted",IsDeleteEnum.N.getKey());
+		mapAll.put("version_id",id);
+		mapAll.put("STATUS",StatusEnum.Enable.getKey());
+        versionDetailQuery.allEq(mapAll).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>();
         //过滤字段
         dataNew = BeanUtil.listCopyTo(datas, VersionDetailDTO.class);

icssman-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -33,7 +33,7 @@ public class DisclaimerInformationDTO {
     /**
      * 主表id
      */
-    private Long versionId;
+   // private Long versionId;
 
     /**
      * 标题

icssman-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacaed.java

@@ -77,7 +77,7 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
 			dis.setRemark(disclaimerInformationDTO.getRemark());
 			dis.setStatus(disclaimerInformationDTO.getStatus());
 			dis.setTitle(disclaimerInformationDTO.getTitle());
-			dis.setVersionId(disclaimerInformationDTO.getVersionId());
+			//dis.setVersionId(disclaimerInformationDTO.getVersionId());
 
 			dataNew.add(dis);
 		}
@@ -101,7 +101,7 @@ public class DisclaimerInformationFacaed extends DisclaimerInformationServiceImp
 		disclaimerInformation.setRemark(disclaimerInformationVO.getRemark());
 		disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 		disclaimerInformation.setTitle(disclaimerInformationVO.getTitle());
-		disclaimerInformation.setVersionId(0L);
+		//disclaimerInformation.setVersionId();
 
 		boolean res = save(disclaimerInformation);
 

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

@@ -20,6 +20,7 @@ import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VersionDetailIdVO;
@@ -88,14 +89,9 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 				.in("version_id", ids).orderByAsc("order_no");
 
 		List<VersionDetail> datas = list(versionDetailQuery);
-		// System.out.println("List<VersionDetail>==="+datas.toString());
 		List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-		/*List<String> modifierid = datas.stream().map(ac->ac.getModifier()).collect(Collectors.toList());
-		RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-		Map<String, String> userNames = userNamesDTO.data;*/
 		List<String> modifierid = new ArrayList<>();
 		modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		
 		Map<String, String> userNames = new HashMap<>();
 		if(modifierid.size()>0){
 			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);	
@@ -106,7 +102,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 			userNames = userNamesDTO.data;
 		}
 		
-		// 过滤字段
+	/*	// 过滤字段
 		for (VersionDetail versionData : datas) {
 			VersionDetailDTO versionDTO = new VersionDetailDTO();
 			versionDTO.setId(versionData.getId());
@@ -120,7 +116,9 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
 			versionDTO.setTitle(versionData.getTitle());
 			versionDTO.setVersionId(versionData.getVersionId());
 			dataNew.add(versionDTO);
-		}
+		}*/
+		// 过滤字段
+		dataNew = BeanUtil.listCopyTo(datas, VersionDetailDTO.class);
 		return dataNew;
 
 	}

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

@@ -27,6 +27,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
 import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
@@ -58,28 +59,19 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 	 * @return
 	 */
 	public List<VersionWrapperDTO> getVersionInfoAll(Page page, String name) {
-		// 查询最新的一条版本信息
+		// 模糊查询最新的一条版本信息
 		QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
 		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
 				.like("name", name).orderByDesc("refresh_time");
 
-		// List<VersionInfo> versionInfos =list(versionInfoQuery);//
-		// getOne(versionInfoQuery);
+		// 分页查询
 		IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
-
 		List<VersionInfo> versionInfos = queryUserInformation.getRecords();
-
 		List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
-		/*
-		 * List<String> modifierid =
-		 * versionInfos.stream().map(ac->ac.getModifier()).collect(Collectors.
-		 * toList()); RespDTO<Map<String, String>> userNamesDTO =
-		 * userServiceClient.getUserInfoByIds(modifierid); Map<String, String>
-		 * userNames = userNamesDTO.data;
-		 */
+		// 取出操作人id
 		List<String> modifierid = new ArrayList<>();
 		modifierid = versionInfos.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-
+		// 根据操作人的id获取操作人信息
 		Map<String, String> userNames = new HashMap<>();
 		if (modifierid.size() > 0) {
 			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
@@ -88,10 +80,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			}
 			userNames = userNamesDTO.data;
 		}
-
 		// 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-		// System.out.println(detail.toString());
-		for (VersionInfo versionInfo : versionInfos) {
+		/*for (VersionInfo versionInfo : versionInfos) {
 			VersionWrapperDTO versionList = new VersionWrapperDTO();
 			versionList.setId(versionInfo.getId());
 			versionList.setName(versionInfo.getName());
@@ -99,15 +89,16 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			versionList.setRefreshTime(versionInfo.getRefreshTime());
 			versionList.setStatus(versionInfo.getStatus());
 			versionLists.add(versionList);
-		}
-
+		}*/
+		versionLists = BeanUtil.listCopyTo(versionInfos, VersionWrapperDTO.class);
+		// 取版本id查明细
 		List<Long> ids = new ArrayList<>();
 		if (versionInfos != null) {
 			// 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
 			for (VersionInfo versionInfo : versionInfos) {
 				ids.add(versionInfo.getId());
 			}
-
+			// 获取明细信息
 			List<VersionDetailDTO> details = versionDetailFacade.getByIds(ids);
 			Map<Long, List<VersionDetailDTO>> map = new HashMap<>();
 			// 获取所有用户开通的产品信息
@@ -125,6 +116,12 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 
 	}
 
+	/**
+	 * 保存版本信息
+	 * 
+	 * @param versionInfoVO
+	 * @return
+	 */
 	public boolean saveVersionInfoAll(VersionInfoVO versionInfoVO) {
 		// 1.判断该版本号是否存在名字相同的数据
 		QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
@@ -134,7 +131,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
 		}
 
-		//增加版本数据
+		// 增加版本数据
 		VersionInfo versionInfo = new VersionInfo();
 		versionInfo.setCreator(UserUtils.getCurrentPrincipleID());
 		versionInfo.setGmtCreate(DateUtil.now());
@@ -146,10 +143,10 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 			versionInfo.setRefreshTime(sdf.parse(versionInfoVO.getRefreshTime()));
 		} catch (ParseException e) {
 			throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-			// e.printStackTrace();
 		}
 		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 		versionInfo.setRemark(versionInfoVO.getRemark());
+		// 优先保存版本号，成功后再保存明细信息
 		boolean res = save(versionInfo);
 		if (res) {
 			List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
@@ -165,8 +162,6 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 					versionDetail.setOrderNo(data.getOrderNo());
 					versionDetail.setTitle(data.getTitle());
 					versionDetail.setVersionId(versionInfo.getId());
-					// System.out.println("========versionInfo.getId()======" +
-					// versionInfo.getId());
 					versionDetail.setRemark(data.getRemark());
 					versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 					dataNew.add(versionDetail);
@@ -174,13 +169,12 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 
 				res = versionDetailServiceImpl.saveBatch(dataNew);
 			}
-
-			// System.out.println(res);
 		}
 		return res;
 	}
 
 	/**
+	 * 更新
 	 * 
 	 * @param versionInfoVO
 	 * @return
@@ -193,6 +187,13 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 		if (data == null) {
 			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
 		}
+		// 2.判断该版本号是否存在名字相同的数据
+		QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
+		templateInfoFand.eq("name", versionInfoVO.getName()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		VersionInfo dataInfo = getOne(templateInfoFand);
+		if (dataInfo != null) {
+			throw new CommonException(CommonErrorCode.NOT_EXISTS, "该版本号已存在");
+		}
 		// 3.修改版本信息
 		VersionInfo versionInfo = new VersionInfo();
 		versionInfo.setId(versionInfoVO.getId());// 模板id
@@ -206,7 +207,6 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 				// e.printStackTrace();
 			}
 		}
-
 		versionInfo.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
 		versionInfo.setRemark(versionInfoVO.getRemark());
 		versionInfo.setGmtModified(DateUtil.now());// 修改时间

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationAllVO.java

@@ -1,13 +1,22 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
+/**
+ * 修改免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:33:07
+ */
 @Getter
 @Setter
 public class DisclaimerInformationAllVO {
 	
-	
+	@NotNull(message = "请输入id")
 	private Long id;
     /**
      * 主表id

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationIdVO.java

@@ -1,11 +1,20 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
+/**
+ * 删除免责申明详情,启用免责申明详情,停用免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:34:02
+ */
 @Getter
 @Setter
 public class DisclaimerInformationIdVO {
 
+	@NotNull(message = "请输入id")
 	private Long id;
 }

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationTitleVO.java

@@ -6,6 +6,12 @@ import lombok.Getter;
 import lombok.Setter;
 
 
+/**
+ * 获取免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:33:22
+ */
 @Setter
 @Getter
 public class DisclaimerInformationTitleVO extends Page{

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -1,9 +1,16 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
+
 import lombok.Getter;
 import lombok.Setter;
 
-
+/**
+ * 增加免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:33:36
+ */
 @Getter
 @Setter
 public class DisclaimerInformationVO {
@@ -15,11 +22,13 @@ public class DisclaimerInformationVO {
     /**
      * 标题
      */
+	@NotBlank(message = "请输入标题")
     private String title;
 
     /**
      * 描述
      */
+	@NotBlank(message = "请输入描述")
     private String description;
 
     /**

icssman-service/src/main/java/com/diagbot/vo/VersionDetailIdVO.java

@@ -2,11 +2,20 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
+/**
+ * 删除版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:33
+ */
 @Getter
 @Setter
 public class VersionDetailIdVO {
+	@NotNull(message = "请输入id")
 	private Long id;
 }

icssman-service/src/main/java/com/diagbot/vo/VersionDetailVO.java

@@ -1,10 +1,12 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 
+ * 更新版本详情信息
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月27日 上午10:20:56
@@ -16,6 +18,7 @@ public class VersionDetailVO {
 	   /**
      * 版本主表id
      */
+	@NotNull(message = "请输入id")
     private Long detailId;
 
     /**

icssman-service/src/main/java/com/diagbot/vo/VersionInfoAllVO.java

@@ -2,11 +2,14 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 
+ * 更新版本信息
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月29日 下午4:01:30
@@ -17,6 +20,7 @@ public class VersionInfoAllVO {
 	/**
 	 * 版本id
 	 */
+	@NotNull(message = "请输入id")
 	private Long id;
 	/**
      * 名称

icssman-service/src/main/java/com/diagbot/vo/VersionInfoAndDetailIdVO.java

@@ -2,15 +2,24 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
+/**
+ * 增加版本详情信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:41
+ */
 @Getter
 @Setter
 public class VersionInfoAndDetailIdVO {
 	/**
 	 * 用户id
 	 */
+	@NotNull(message = "请输入id")
 	private Long versionInfoId;
 	
     private List<VersionDetailVO> versionDetail;

icssman-service/src/main/java/com/diagbot/vo/VersionInfoIdVO.java

@@ -1,10 +1,19 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
+/**
+ * 删除版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:35:02
+ */
 @Getter
 @Setter
 public class VersionInfoIdVO {
+	@NotNull(message = "请输入id")
 	private Long id;
 }

icssman-service/src/main/java/com/diagbot/vo/VersionInfoVO.java

@@ -3,12 +3,14 @@ package com.diagbot.vo;
 import java.util.Date;
 import java.util.List;
 
+import javax.validation.constraints.NotBlank;
+
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * 
- * 
+ * 保存版本信息
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月28日 上午10:55:17
@@ -24,11 +26,13 @@ public class VersionInfoVO {
 	/**
      * 名称
      */
+	@NotBlank(message = "请输入名称")
     private String name;
 
     /**
      * 时间
      */
+	@NotBlank(message = "请输入时间")
     private String refreshTime;
 
     /**

icssman-service/src/main/java/com/diagbot/vo/VersionWrapperNameVO.java

@@ -5,6 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
+/**
+ * 获取版本信息
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:34:35
+ */
 @Getter
 @Setter
 public class VersionWrapperNameVO extends Page{

icssman-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -3,6 +3,8 @@ package com.diagbot.web;
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -53,7 +55,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/addDisclaimerInformations")
 	@SysLogger("addDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> addDisclaimerInformations(@RequestBody DisclaimerInformationVO disclaimerInformationVO) {
+	public RespDTO<Boolean> addDisclaimerInformations(@Valid @RequestBody DisclaimerInformationVO disclaimerInformationVO) {
 
 		boolean res = disclaimerInformationFacaed.addDisclaimerInformation(disclaimerInformationVO);
 		
@@ -64,7 +66,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/updateDisclaimerInformations")
 	@SysLogger("updateDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> updateDisclaimerInformations(@RequestBody DisclaimerInformationAllVO disclaimerInformationAllVO) {
+	public RespDTO<Boolean> updateDisclaimerInformations(@Valid @RequestBody DisclaimerInformationAllVO disclaimerInformationAllVO) {
 
 		boolean res = disclaimerInformationFacaed.updateDisclaimerInformation(disclaimerInformationAllVO);
 		
@@ -75,7 +77,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/cancelDisclaimerInformations")
 	@SysLogger("cancelDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> cancelDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
+	public RespDTO<Boolean> cancelDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
 
 		boolean res = disclaimerInformationFacaed.cancelDisclaimerInformation(disclaimerInformationIdVO);
 		
@@ -85,7 +87,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/startDisclaimerInformations")
 	@SysLogger("startDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> startDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
+	public RespDTO<Boolean> startDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
 		
 		boolean res = disclaimerInformationFacaed.startDisclaimerInformations(disclaimerInformationIdVO);
 		
@@ -96,7 +98,7 @@ public class DisclaimerInformationController {
 	@PostMapping("/endDisclaimerInformations")
 	@SysLogger("endDisclaimerInformations")
 	@Transactional
-	public RespDTO<Boolean> endDisclaimerInformations(@RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
+	public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO){
 		
 		boolean res = disclaimerInformationFacaed.endDisclaimerInformations(disclaimerInformationIdVO);
 		

icssman-service/src/main/java/com/diagbot/web/VersionDetailController.java

@@ -1,6 +1,8 @@
 package com.diagbot.web;
 
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +39,7 @@ public class VersionDetailController {
 	@PostMapping("/updateVersionDetails")
 	@SysLogger("updateVersionDetails")
 	@Transactional
-	public RespDTO<Boolean> updateVersionDetails(@RequestBody VersionDetailVO versionDetailVO) {
+	public RespDTO<Boolean> updateVersionDetails(@Valid @RequestBody VersionDetailVO versionDetailVO) {
 
 		boolean res = versionDetailFacade.updateVersionDetail(versionDetailVO);
 
@@ -48,7 +50,7 @@ public class VersionDetailController {
 	@PostMapping("/cancelVersionDetails")
 	@SysLogger("cancelVersionDetails")
 	@Transactional
-	public RespDTO<Boolean> cancelVersionDetails(@RequestBody VersionDetailIdVO versionDetailIdVO) {
+	public RespDTO<Boolean> cancelVersionDetails(@Valid @RequestBody VersionDetailIdVO versionDetailIdVO) {
 
 		boolean res = versionDetailFacade.cancelVersionDetail(versionDetailIdVO);
 
@@ -59,7 +61,7 @@ public class VersionDetailController {
 	@PostMapping("/addVersionDetails")
 	@SysLogger("addVersionDetails")
 	@Transactional
-	public RespDTO<Boolean> addVersionDetails(@RequestBody VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
+	public RespDTO<Boolean> addVersionDetails(@Valid @RequestBody VersionInfoAndDetailIdVO versionInfoAndDetailIdVO) {
 
 		boolean res = versionDetailFacade.addVersionDetail(versionInfoAndDetailIdVO);
 

icssman-service/src/main/java/com/diagbot/web/VersionInfoController.java

@@ -2,6 +2,8 @@ package com.diagbot.web;
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,7 +53,7 @@ public class VersionInfoController {
 	@PostMapping("/saveVersionInfoAlls")
 	@SysLogger("saveVersionInfoAlls")
 	@Transactional
-	public RespDTO<Boolean> saveVersionInfoAlls(@RequestBody VersionInfoVO versionInfoVO) {
+	public RespDTO<Boolean> saveVersionInfoAlls(@Valid @RequestBody VersionInfoVO versionInfoVO) {
 
 		boolean res = versionInfoFacade.saveVersionInfoAll(versionInfoVO);
 
@@ -62,7 +64,7 @@ public class VersionInfoController {
 	@PostMapping("/updateVersionInfoAlls")
 	@SysLogger("updateVersionInfoAlls")
 	@Transactional
-	public RespDTO<Boolean> updateVersionInfoAlls(@RequestBody VersionInfoAllVO versionInfoVO) {
+	public RespDTO<Boolean> updateVersionInfoAlls(@Valid @RequestBody VersionInfoAllVO versionInfoVO) {
 
 		boolean res = versionInfoFacade.updateVersionInfoAll(versionInfoVO);
 
@@ -73,7 +75,7 @@ public class VersionInfoController {
 	@PostMapping("/cancelVersionInfoAlls")
 	@SysLogger("cancelVersionInfoAlls")
 	@Transactional
-	public RespDTO<Boolean> cancelVersionInfoAlls(@RequestBody VersionInfoIdVO versionInfoVO) {
+	public RespDTO<Boolean> cancelVersionInfoAlls(@Valid @RequestBody VersionInfoIdVO versionInfoVO) {
 
 		boolean res = versionInfoFacade.cancelVersionInfoAll(versionInfoVO);
 

icssman-service/src/main/resources/mapper/DisclaimerInformationMapper.xml

@@ -32,7 +32,6 @@
 		remark as remark
 		FROM icss_disclaimer_information
 		WHERE is_deleted = "N"
-		AND version_id =0
 		<if test="disAll.title != null">
 		and title like concat('%',#{disAll.title},'%')
 		</if>