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

user-service/src/main/java/com/diagbot/vo/OrganizationVO.java

@@ -2,6 +2,9 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 /**
@@ -17,18 +20,22 @@ public class OrganizationVO {
 	/**
      * 机构名称
      */
+	@NotBlank(message = "请输入机构名称!")
     private String organizationName;
     /**
      * 机构类型
      */
+	@NotNull(message = "请输入机构类型!")
     private Integer type;
     /**
      * 负责人
      */
+	@NotBlank(message = "请输入机构负责人!")
     private String principal;
     /**
      * 机构地址
      */
+	@NotBlank(message = "请输入机构地址!")
     private String address;
     /**
      * 下属机构数量

user-service/src/main/java/com/diagbot/vo/UserAndOrganizationVO.java

@@ -1,5 +1,9 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,31 +20,37 @@ public class UserAndOrganizationVO {
 	/**
      * 机构id
      */
+	@NotNull(message = "请输入机构id!")
     private Long organizationid;
     
     /**
      * 用户密码
      */
+	@Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$",message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
     private String passWord;
 
     /**
      * 用户名
      */
+	@Pattern(regexp = "^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\\d{8}$",message = "请输入手机号!")
     private String userName;
     
     /**
      * 联系人
      */
+	@NotBlank(message = "请输入联系人!")
     private String linkman;
 
     /**
      * 邮箱
      */
+    @NotBlank(message = "请输入邮箱!")
     private String email;
     
     /**
      * 岗位信息
      */
+    @NotBlank(message = "请输入岗位信息!")
     private String position;
 
 }

user-service/src/main/java/com/diagbot/vo/UserInfoAuditVO.java

@@ -2,6 +2,10 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
 import lombok.Getter;
 import lombok.Setter;
 /**
@@ -14,11 +18,12 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UserInfoAuditVO {
-	
-	 private String isReject;//是否通过认证 N:未通过，Y:已通过
+	  @Pattern(regexp = "[YN]",message = "参数类型 错误")
+	  private String isReject;//是否通过认证 N:未通过，Y:已通过
 	  private Integer rejectType;//未通过类型
 	  private String rejectComment;//认证被拒理由
 	  private String status;//认证状态（0：未认证，1：已认证，2：认证中）
+	  @NotNull(message = "请输入用户id!")
 	  private Long userId;//用户id
 
 }

user-service/src/main/java/com/diagbot/vo/UserInfoOrganizationsVO.java

@@ -3,6 +3,9 @@ package com.diagbot.vo;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,5 +26,6 @@ public class UserInfoOrganizationsVO implements Serializable {
 	  private String address;//单位地址
 	  private Integer type;//机构属性
 	  private String position;//岗位部门
+	  @NotNull(message = "请输入用户id!")
 	  private Long userId;//用户id
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -6,10 +6,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -75,16 +78,19 @@ public class UserInfoController {
 	    @ApiOperation(value = "修改用户信息和机构信息以", notes = "用户信息和机构信息")
 	    @PostMapping("/updateUserInfoAll")
 	    @SysLogger("updateUserInfoAll")
-	    public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll( UserInfoOrganizationsVO userInfo){
+	    public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(@Valid  @RequestBody UserInfoOrganizationsVO userInfo){
 	         int res = userFacade.updateUserInfoAll(userInfo);
 	         
-	        return RespDTO.onSuc("修改成功"+res);
+	         if(res!=0){
+		    		return RespDTO.onSuc("修改用户信息成功！");
+		    	}
+		    	return RespDTO.onSuc("修改用户信息失败！");
 	    }
 	    
 	    @ApiOperation(value = "审核用户信息和机构信息", notes = "审核用户信息和机构信息")
 	    @PostMapping("/auditUserInfoAll")
 	    @SysLogger("auditUserInfoAll")
-	    public RespDTO<UserInfoAuditVO> auditUserInfoAll( UserInfoAuditVO userInfoAuditVO){
+	    public RespDTO<UserInfoAuditVO> auditUserInfoAll(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO){
 	    	Map<String,Object> auditMap = new HashMap<String, Object>();
 	    	auditMap.put("userId", userInfoAuditVO.getUserId());
 	    	//TODO auditMap.put("modifier",UserUtils.getCurrentPrincipleID());
@@ -128,7 +134,7 @@ public class UserInfoController {
 	    @ApiOperation(value = "添加构信息", notes = "机构信息")
 	    @PostMapping("/addOrganization")
 	    @SysLogger("addOrganization")
-	    public RespDTO<OrganizationVO> addOrganization(OrganizationVO  organizationVO){
+	    public RespDTO<OrganizationVO> addOrganization(@Valid @RequestBody OrganizationVO  organizationVO){
 	    	//TODO
 	    	String organizationName = organizationVO.getOrganizationName();
 	    	List<Organization> organizationList = organizationFacade.findOrganization(organizationName);
@@ -157,7 +163,7 @@ public class UserInfoController {
 	    @ApiOperation(value = "添加用户信息和机构信息管理员", notes = "用户信息和机构信息的绑定")
 	    @PostMapping("/addUserInfo")
 	    @SysLogger("addUserInfo")
-	    public RespDTO<UserAndOrganizationVO> addUserInfo(UserAndOrganizationVO  userAndOrganizationVO){
+	    public RespDTO<UserAndOrganizationVO> addUserInfo(@Valid @RequestBody UserAndOrganizationVO  userAndOrganizationVO){
 	    	//TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
 	    	//User user = new User();
 	    	//验证用户是否存在
@@ -210,21 +216,31 @@ public class UserInfoController {
 	         
 	    	 return RespDTO.onSuc("绑定成功");
 	    } 
+	    
 	    //TODO
 /*	    @ApiOperation(value = "根据用户id查询已开通的功能", notes = "已开通信息")
-	    @PostMapping("/addOrganization")
-	    @SysLogger("addOrganization")*/
+	    @PostMapping("/getInformationAvailableByUserId")
+	    @SysLogger("getInformationAvailableByUserId")*/
 	    
 	  //TODO
 	   /* 
 	    @ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
-	    @PostMapping("/addOrganization")
-	    @SysLogger("addOrganization")*/
+	    @PostMapping("/startAndendByuserId")
+	    @SysLogger("startAndendByuserId")*/
 	    
 	  //TODO
-	   /* @ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
-	    @PostMapping("/addOrganization")
-	    @SysLogger("addOrganization")*/
+	   /* @ApiOperation(value = "根据用户id和产品id，删除开通信息", notes = "删除开通信息")
+	    @PostMapping("/delInformationAvailable")
+	    @SysLogger("delInformationAvailable")*/
+	  //TODO
+	/* @ApiOperation(value = "根据用户id和产品id，修改开通时间", notes = "修改开通时间")
+	   @PostMapping("/delInformationAvailable")
+	   @SysLogger("delInformationAvailable")*/
+
+	    
+	    
+	    
+	    
 	    
 	    
 

user-service/src/main/resources/mapper/UserMapper.xml

@@ -189,10 +189,13 @@
 		  ,c.status = #{status}
 		</if> -->
 	<!-- </if> -->
-	WHERE u.id = #{userId} 
+	WHERE 
+	u.is_deleted = "N"
+	AND u.id = #{userId} 
 	AND c.user_id= #{userId} 
 	AND a.user_id = #{userId} 
 	AND a.organization_id =b.id
+	
 </update>