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

diagbotman-service/src/main/java/com/diagbot/vo/ModifyOpeningTimeVO.java

@@ -2,6 +2,8 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,9 +17,11 @@ import lombok.Setter;
 @Setter
 public class ModifyOpeningTimeVO {
 	
-	private Date startTime;
-	private Date endTime;
+	private String startTime;
+	private String endTime;
+	@NotNull(message = "请输入用户id!")
 	private Long userId;
+	@NotNull(message = "请输入产品id!")
 	private Long productId;
 
 }

diagbotman-service/src/main/java/com/diagbot/vo/StartAndendByUserIdVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotNull;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,7 +16,9 @@ import lombok.Setter;
 public class StartAndendByUserIdVO {
 	
 	private Integer serviceStatus;
+	@NotNull(message = "请输入用户id!")
 	private Long userId;
+	@NotNull(message = "请输入产品id!")
 	private Long productId;
 
 }

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -2,9 +2,13 @@ package com.diagbot.web;
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
 import com.diagbot.annotation.SysLogger;
@@ -87,10 +91,10 @@ public class ProductOrderController {
 	
 	
 	   
-    @ApiOperation(value = "根据用户id查询已开通的功能", notes = "已开通信息")
+	@ApiOperation(value = "根据用户id查询已开通的功能", notes = "已开通信息")
     @PostMapping("/getInformationAvailableByUserId")
     @SysLogger("getInformationAvailableByUserId")
-    public RespDTO  getInformationAvailableByUserId(Long userId){
+    public RespDTO  getInformationAvailableByUserId(@RequestParam Long userId){
     	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(userId);
     	return RespDTO.onSuc(UserAndProdutData);
     }
@@ -98,45 +102,52 @@ public class ProductOrderController {
 	@ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
 	@PostMapping("/startAndendByuserId")
 	@SysLogger("startAndendByuserId")
-	public RespDTO<StartAndendByUserIdVO> startAndendByuserId(StartAndendByUserIdVO startAndendByUserIdVO) {
+	public RespDTO<StartAndendByUserIdVO> startAndendByuserId(@RequestBody @Valid StartAndendByUserIdVO startAndendByUserIdVO) {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(startAndendByUserIdVO.getUserId());
 		openedProducts.setProductId(startAndendByUserIdVO.getProductId());
-		openedProducts.setCreator("");
+		//TODO wangfeng openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
 		openedProducts.setGmtCreate(DateUtil.now());
 		openedProducts.setServiceStatus(startAndendByUserIdVO.getServiceStatus());
-		openedProductsFacade.startAndendByuserId(openedProducts);
-		return RespDTO.onSuc("");
+		boolean res =openedProductsFacade.startAndendByuserId(openedProducts);
+		if(res !=true  ){
+			return RespDTO.onSuc("操作失败!");
+		}
+		return RespDTO.onSuc("操作成功!");
 	}
 
-	// TODO
 	@ApiOperation(value = "根据用户id和产品id，删除开通信息", notes = "删除开通信息")
 	@PostMapping("/delInformationAvailable")
 	@SysLogger("delInformationAvailable")
-	public RespDTO delInformationAvailable(Long userId, Long productId) {
+	public RespDTO delInformationAvailable(@RequestParam Long userId, Long productId) {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(userId);
 		openedProducts.setProductId(productId);
-		openedProducts.setCreator("");
+		//TODO wangfeng openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
 		openedProducts.setGmtCreate(DateUtil.now());
-		openedProductsFacade.delInformationAvailable(openedProducts);
-		return RespDTO.onSuc("");
+		boolean res =openedProductsFacade.delInformationAvailable(openedProducts);
+		if(res !=true  ){
+			return RespDTO.onSuc("操作失败!");
+		}
+		return RespDTO.onSuc("操作成功!");
 	}
 
-	// TODO
 	@ApiOperation(value = "根据用户id和产品id，修改开通时间", notes = "修改开通时间")
 	@PostMapping("/modifyOpeningTime")
 	@SysLogger("modifyOpeningTime")
-	public RespDTO<ModifyOpeningTimeVO> modifyOpeningTime(ModifyOpeningTimeVO modifyOpeningTimeVO) {
+	public RespDTO<ModifyOpeningTimeVO> modifyOpeningTime(@RequestBody @Valid ModifyOpeningTimeVO modifyOpeningTimeVO) {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(modifyOpeningTimeVO.getUserId());
 		openedProducts.setProductId(modifyOpeningTimeVO.getProductId());
-		openedProducts.setStartTime(modifyOpeningTimeVO.getStartTime());
-		openedProducts.setEndTime(modifyOpeningTimeVO.getEndTime());
-		openedProducts.setCreator("");
+		openedProducts.setStartTime(DateUtil.parseDate(modifyOpeningTimeVO.getStartTime()));
+		openedProducts.setEndTime(DateUtil.parseDate(modifyOpeningTimeVO.getEndTime()));
+		//TODO wangfeng openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
 		openedProducts.setGmtCreate(DateUtil.now());
-		openedProductsFacade.modifyOpeningTime(openedProducts);
-		return RespDTO.onSuc("");
+		boolean res = openedProductsFacade.modifyOpeningTime(openedProducts);
+		if(res !=true  ){
+			return RespDTO.onSuc("操作失败!");
+		}
+		return RespDTO.onSuc("操作成功!");
 	}
 
 

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -30,7 +30,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     IPage<UserInfoDTO> selectUserInfoListPage(Page page,@Param("userInfo") UserInfoDTO userInfo);
     
-    public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);
+    public Integer updateUserInfoAll(@Param("userMap") Map<String, Object> userMap);
     
     public Integer updateDeleted(@Param("map") Map<String,Object> map);
 

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -27,7 +27,7 @@ public interface UserService extends IService<User> {
     
     public IPage<UserInfoDTO>  selectUserInfoListPage(Page<UserInfoDTO> page,UserInfoDTO userInfo);
     
-    public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);
+    public Integer updateUserInfoAll(Map<String, Object> userMap);
 
 	Integer updateDeleted(Map<String,Object> map);
 

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -44,8 +44,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
 	@Override
-	public Integer  updateUserInfoAll(UserInfoOrganizationsVO userInfo) {
-		return baseMapper.updateUserInfoAll(userInfo);
+	public Integer  updateUserInfoAll(Map<String, Object> userMap) {
+		return baseMapper.updateUserInfoAll(userMap);
 		
 	}
 	@Override

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

@@ -19,8 +19,6 @@ import lombok.Setter;
 @Setter
 public class UserInfoOrganizationsVO implements Serializable {
 	
-	  private Date gmtModified;//修改时间
-	  private String modifier;//修改人id
 	  private String email;//邮箱
 	  private String principal;//负责人
 	  private String address;//单位地址

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

@@ -1,5 +1,6 @@
 package com.diagbot.web;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +30,7 @@ import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.facade.UserOrganizationFacade;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
@@ -71,8 +73,19 @@ public class UserInfoController {
 	@ApiOperation(value = "修改用户信息和机构信息", notes = "用户信息和机构信息")
 	@PostMapping("/updateUserInfoAll")
 	@SysLogger("updateUserInfoAll")
-	public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(@Valid @RequestBody UserInfoOrganizationsVO userInfo) {
-		int res = userFacade.updateUserInfoAll(userInfo);
+	public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(
+			@Valid @RequestBody UserInfoOrganizationsVO userInfoOrganizationsVO) {
+		Map<String, Object> userMap = new HashMap<String, Object>();
+		// TODO wangfeng userMap.put("modifier",
+		// UserUtils.getCurrentPrincipleID());
+		userMap.put("gmtModified", DateUtil.now());
+		userMap.put("email", userInfoOrganizationsVO.getEmail());
+		userMap.put("principal", userInfoOrganizationsVO.getPrincipal());
+		userMap.put("address", userInfoOrganizationsVO.getAddress());
+		userMap.put("type", userInfoOrganizationsVO.getType());
+		userMap.put("position", userInfoOrganizationsVO.getPosition());
+		userMap.put("userId", userInfoOrganizationsVO.getUserId());
+		int res = userFacade.updateUserInfoAll(userMap);
 
 		if (res != 0) {
 			return RespDTO.onSuc("修改用户信息成功！");
@@ -86,8 +99,8 @@ public class UserInfoController {
 	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());
-		auditMap.put("modifier", "5");
+		// TODO wangfeng auditMap.put("modifier",
+		// UserUtils.getCurrentPrincipleID());
 		auditMap.put("gmtModified", DateUtil.now());
 		auditMap.put("isReject", userInfoAuditVO.getIsReject());
 		auditMap.put("rejectComment", userInfoAuditVO.getRejectComment());
@@ -107,8 +120,7 @@ public class UserInfoController {
 	public RespDTO updateDeleted(@RequestParam String userId) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("userId", userId);
-		// TODO map.put("modifier",UserUtils.getCurrentPrincipleID());
-		map.put("modifier", "5");
+		// TODO wangfeng map.put("modifier",UserUtils.getCurrentPrincipleID());
 		map.put("gmtModified", DateUtil.now());
 		int res = userFacade.updateDeleted(map);
 		return RespDTO.onSuc("刪除成功" + res);
@@ -128,7 +140,7 @@ public class UserInfoController {
 	@PostMapping("/addOrganization")
 	@SysLogger("addOrganization")
 	public RespDTO<OrganizationVO> addOrganization(@Valid @RequestBody OrganizationVO organizationVO) {
-		// TODO
+
 		String organizationName = organizationVO.getOrganizationName();
 		List<Organization> organizationList = organizationFacade.findOrganization(organizationName);
 		if (organizationList.size() > 0) {
@@ -141,8 +153,9 @@ public class UserInfoController {
 		organization.setSubNum(organizationVO.getSubNum());
 		organization.setAddress(organizationVO.getAddress());
 		organization.setGmtCreate(DateUtil.now());
-		// TODO organization.setModifier(UserUtils.getCurrentPrincipleID());
-		organization.setCreator("5");
+		// TODO wangfeng
+		// organization.setModifier(UserUtils.getCurrentPrincipleID());
+		// organization.setCreator("5");
 
 		boolean res = organizationFacade.save(organization);
 
@@ -176,7 +189,7 @@ public class UserInfoController {
 		}
 
 		User user = new User();
-		user.setCreator("5");
+		// TODO wangfeng user.setCreator("5");
 		user.setUsername(userAndOrganizationVO.getUserName());
 		PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 		String entryPassword = passwordEncoder.encode(userAndOrganizationVO.getPassWord());
@@ -189,7 +202,9 @@ public class UserInfoController {
 			Long userId = user.getId();
 			// 用户信息的认证
 			UserAuthentication userAuthentication = new UserAuthentication();
-			userAuthentication.setCreator("5");// 创建人Id
+			// TODO wangfeng
+			// userAuthentication.setCreator(UserUtils.getCurrentPrincipleID());//
+			// 创建人Id
 			userAuthentication.setGmtCreate(DateUtil.now());// 记录创建时间
 			userAuthentication.setPosition(userAndOrganizationVO.getPosition());// 岗位信息
 			userAuthentication.setUserId(userId);// 用户id
@@ -199,7 +214,9 @@ public class UserInfoController {
 
 			// 用户信息和机构信息的绑定
 			UserOrganization userOrganization = new UserOrganization();
-			userOrganization.setCreator("5");// 创建人Id
+			// TODO wangfeng
+			// userOrganization.setCreator(UserUtils.getCurrentPrincipleID());//
+			// 创建人Id
 			userOrganization.setGmtCreate(DateUtil.now());
 			userOrganization.setOrganizationId(userAndOrganizationVO.getOrganizationid());// 机构id
 			userOrganization.setUserId(userId);// 用户id

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

@@ -135,46 +135,46 @@
 	     ORDER BY  u.gmt_create DESC
 	</select>
 	
-<update id="updateUserInfoAll" parameterType="com.diagbot.vo.UserInfoOrganizationsVO" >
+<update id="updateUserInfoAll" parameterType="java.util.Map" >
 	UPDATE sys_user u ,sys_user_organization a ,
 	sys_organization b ,sys_user_authentication c
 	SET  u.remark = "0" 
-	<if test="email != null">
-	    <if test="gmtModified !=null"> 
-	      ,u.gmt_modified=#{gmtModified}
+	<if test="userMap.email != null">
+	    <if test="userMap.gmtModified !=null"> 
+	      ,u.gmt_modified=#{userMap.gmtModified}
 	   </if>
-	   <if test="modifier != modifier">
-	      ,u.modifier=#{modifier}
+	   <if test="userMap.modifier != null">
+	      ,u.modifier=#{userMap.modifier}
 	   </if>
-	  ,u.email=#{email}
+	  ,u.email=#{userMap.email}
 	</if>
-	<if test="principal != null || address != null || type != null">
-	     <if test="gmtModified !=null"> 
-	       ,b.gmt_modified=#{gmtModified}
+	<if test="userMap.principal != null || userMap.address != null || userMap.type != null">
+	     <if test="userMap.gmtModified !=null"> 
+	       ,b.gmt_modified=#{userMap.gmtModified}
 	     </if>
-	     <if test="modifier != null">
-	      ,b.modifier=#{modifier}
+	     <if test="userMap.modifier != null">
+	      ,b.modifier=#{userMap.modifier}
 	     </if>
-		<if test="principal != null">
-		  ,b.principal=#{principal}
+		<if test="userMap.principal != null">
+		  ,b.principal=#{userMap.principal}
 		</if>
-		<if test="address != null">
-		  ,b.address=#{address}
+		<if test="userMap.address != null">
+		  ,b.address=#{userMap.address}
 		</if>
-		<if test="type != null">
-		  ,b.type=#{type}
+		<if test="userMap.type != null">
+		  ,b.type=#{userMap.type}
 		</if>
 	</if>
 	
 	<!-- <if test="position != null || isReject != null || rejectType !=null || rejectComment !=null || status != null"> -->
-	   <if test="position != null">
-	    <if test="gmtModified !=null">
-		  ,c.gmt_modified=#{gmtModified}
+	   <if test="userMap.position != null">
+	    <if test="userMap.gmtModified !=null">
+		  ,c.gmt_modified=#{userMap.gmtModified}
 		</if>
-		<if test="modifier != null">
-		  ,c.modifier=#{modifier}
+		<if test="userMap.modifier != null">
+		  ,c.modifier=#{userMap.modifier}
 		</if>
-		  ,c.position=#{position}
+		  ,c.position=#{userMap.position}
 		</if>
 		<!-- <if test="isReject != null">
 		 ,c.is_reject=#{isReject}
@@ -191,9 +191,9 @@
 	<!-- </if> -->
 	WHERE 
 	u.is_deleted = "N"
-	AND u.id = #{userId} 
-	AND c.user_id= #{userId} 
-	AND a.user_id = #{userId} 
+	AND u.id = #{userMap.userId} 
+	AND c.user_id= #{userMap.userId} 
+	AND a.user_id = #{userMap.userId} 
 	AND a.organization_id =b.id
 	
 </update>