格式化

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

@@ -84,50 +84,50 @@ public class ProductOrderController {
     	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(userId);
     	return RespDTO.onSuc(UserAndProdutData);
     }
- 
-    @ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
-    @PostMapping("/startAndendByuserId")
-    @SysLogger("startAndendByuserId")
-    public RespDTO<StartAndendByUserIdVO>  startAndendByuserId(StartAndendByUserIdVO startAndendByUserIdVO){
-    	OpenedProducts openedProducts = new OpenedProducts();
-    	openedProducts.setUserId(startAndendByUserIdVO.getUserId());
-    	openedProducts.setProductId(startAndendByUserIdVO.getProductId());
-    	openedProducts.setCreator("");
-    	openedProducts.setGmtCreate(DateUtil.now());
-    	openedProducts.setServiceStatus(startAndendByUserIdVO.getServiceStatus());
-    	  openedProductsFacade.startAndendByuserId(openedProducts);
-    	return RespDTO.onSuc("");
-    }
-    
-    
-  //TODO
-    @ApiOperation(value = "根据用户id和产品id，删除开通信息", notes = "删除开通信息")
-    @PostMapping("/delInformationAvailable")
-    @SysLogger("delInformationAvailable")
-    public RespDTO  delInformationAvailable(Long userId , Long productId){
-    	OpenedProducts openedProducts = new OpenedProducts();
-    	openedProducts.setUserId(userId);
-    	openedProducts.setProductId(productId);
-    	openedProducts.setCreator("");
-    	openedProducts.setGmtCreate(DateUtil.now());
-    	  openedProductsFacade.delInformationAvailable(openedProducts);
-    	return RespDTO.onSuc("");
-    }
-  //TODO
-   @ApiOperation(value = "根据用户id和产品id，修改开通时间", notes = "修改开通时间")
-   @PostMapping("/modifyOpeningTime")
-   @SysLogger("modifyOpeningTime")
-  public RespDTO<ModifyOpeningTimeVO>  modifyOpeningTime(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.setGmtCreate(DateUtil.now());
-	  openedProductsFacade.modifyOpeningTime(openedProducts);
-	return RespDTO.onSuc("");
-    }
+
+	@ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
+	@PostMapping("/startAndendByuserId")
+	@SysLogger("startAndendByuserId")
+	public RespDTO<StartAndendByUserIdVO> startAndendByuserId(StartAndendByUserIdVO startAndendByUserIdVO) {
+		OpenedProducts openedProducts = new OpenedProducts();
+		openedProducts.setUserId(startAndendByUserIdVO.getUserId());
+		openedProducts.setProductId(startAndendByUserIdVO.getProductId());
+		openedProducts.setCreator("");
+		openedProducts.setGmtCreate(DateUtil.now());
+		openedProducts.setServiceStatus(startAndendByUserIdVO.getServiceStatus());
+		openedProductsFacade.startAndendByuserId(openedProducts);
+		return RespDTO.onSuc("");
+	}
+
+	// TODO
+	@ApiOperation(value = "根据用户id和产品id，删除开通信息", notes = "删除开通信息")
+	@PostMapping("/delInformationAvailable")
+	@SysLogger("delInformationAvailable")
+	public RespDTO delInformationAvailable(Long userId, Long productId) {
+		OpenedProducts openedProducts = new OpenedProducts();
+		openedProducts.setUserId(userId);
+		openedProducts.setProductId(productId);
+		openedProducts.setCreator("");
+		openedProducts.setGmtCreate(DateUtil.now());
+		openedProductsFacade.delInformationAvailable(openedProducts);
+		return RespDTO.onSuc("");
+	}
+
+	// TODO
+	@ApiOperation(value = "根据用户id和产品id，修改开通时间", notes = "修改开通时间")
+	@PostMapping("/modifyOpeningTime")
+	@SysLogger("modifyOpeningTime")
+	public RespDTO<ModifyOpeningTimeVO> modifyOpeningTime(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.setGmtCreate(DateUtil.now());
+		openedProductsFacade.modifyOpeningTime(openedProducts);
+		return RespDTO.onSuc("");
+	}
 
 
 }

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

@@ -19,22 +19,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserAuthentication;
 import com.diagbot.entity.UserOrganization;
-import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.facade.UserOrganizationFacade;
 import com.diagbot.util.DateUtil;
-import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OrganizationVO;
-import com.diagbot.vo.StartAndendByUserIdVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
@@ -61,9 +56,6 @@ public class UserInfoController {
 	@Autowired
 	UserAuthenticationFacade userAuthenticationFacade;
 
-	private final String MSG_SUCCESS = "操作成功!";
-	private final String MSG_ERROR = "操作失败!";
-
 	@ApiOperation(value = "分页查询获取用户信息", notes = "根据每页显示条数，默认 10，和当前页")
 	@PostMapping("/getUserInfoPag")
 	@SysLogger("getUserInfoPag")