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

diagbotman-service/src/main/java/com/diagbot/facade/ServiceInfoFacade.java

@@ -128,7 +128,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         serviceInfoVO.setUserId(userId);
         serviceInfoVO.setType(ServiceTypeEnum.User_Create.getKey());
         QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
-        qw.eq("is_deleted", "N").
+        qw.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("type", ServiceTypeEnum.User_Create.getKey()).
                 eq("user_id", userId).
                 orderByDesc("gmt_create");

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 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.RestController;
 
@@ -43,7 +44,7 @@ public class DiagLantoneProductController {
     @PostMapping("/addProducts")
     @SysLogger("addProducts")
     @Transactional
-    public RespDTO<Boolean> addProducts(AddProductsVO addProductsVO) {
+    public RespDTO<Boolean> addProducts(@RequestBody AddProductsVO addProductsVO) {
         return RespDTO.onSuc(lantoneProductFacade.addProducts(addProductsVO));
     }
 
@@ -61,7 +62,7 @@ public class DiagLantoneProductController {
     @PostMapping("/updateProduct")
     @SysLogger("updateProduct")
     @Transactional
-    public RespDTO<Boolean> updateProduct(UpdateProductVO updateProductVO) {
+    public RespDTO<Boolean> updateProduct(@RequestBody UpdateProductVO updateProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.updateProduct(updateProductVO));
     }
 
@@ -70,7 +71,7 @@ public class DiagLantoneProductController {
     @PostMapping("/updateServiceStatus")
     @SysLogger("updateServiceStatus")
     @Transactional
-    public RespDTO<Boolean> updateServiceStatus(UpdateProductVO updateProductVO) {
+    public RespDTO<Boolean> updateServiceStatus(@RequestBody UpdateProductVO updateProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.updateProduct(updateProductVO));
     }
 
@@ -79,7 +80,7 @@ public class DiagLantoneProductController {
     @PostMapping("/deleteProduct")
     @SysLogger("deleteProduct")
     @Transactional
-    public RespDTO<Boolean> deleteProduct(UpdateProductVO updateProductVO) {
+    public RespDTO<Boolean> deleteProduct(@RequestBody UpdateProductVO updateProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.deleteProduct(updateProductVO));
     }
 
@@ -90,7 +91,7 @@ public class DiagLantoneProductController {
     )
     @PostMapping("/opendedProduct")
     @SysLogger("opendedProduct")
-    public RespDTO<List<OpendProductWrapper>> opendedProduct(OppendedProductVO oppendedProductVO) {
+    public RespDTO<List<OpendProductWrapper>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
 
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(oppendedProductVO));
     }

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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.RestController;
 
@@ -36,7 +37,7 @@ public class DiagOrderDetailsController {
                             "status:订单状态（0.未付款1.已付款）")
     @PostMapping("/getAllOrderDetials")
     @SysLogger("getAllOrderDetials")
-    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
+    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
         List<OrderDetailsWapper> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
         return RespDTO.onSuc(list);
     }
@@ -46,7 +47,7 @@ public class DiagOrderDetailsController {
                     "id:订单明细id，根据订单明细id修改审核状态，必填<br>")
     @PostMapping("/auditStatus")
     @SysLogger("auditStatus")
-    public RespDTO<Boolean> auditStatus(AuditStatusVO auditStatusVO) {
+    public RespDTO<Boolean> auditStatus(@RequestBody AuditStatusVO auditStatusVO) {
         return RespDTO.onSuc(orderDetailsFacade.updateAuditStatus(auditStatusVO));
     }
 }

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

@@ -35,7 +35,7 @@ public class MoreServiceController {
     @ApiOperation(value = "用户更多服务——显示产品[by:wangyu]", notes = "根据用户id查询已开通信息")
     @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
-    public RespDTO<IPage<LantoneProduct>> showProductInfo(Page page) {
+    public RespDTO<IPage<LantoneProduct>> showProductInfo(@RequestBody Page page) {
         return lantoneProductFacade.productLine(page);
     }
 

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

@@ -74,7 +74,7 @@ public class ProductOrderController {
     @ApiOperation(value = "控制台-产品立即试用接口[by:rengb]", notes = "控制台-产品立即试用接口")
     @PostMapping("/openUpOnTrial")
     @SysLogger("openUpOnTrial")
-    public RespDTO<OpenUpOnTrialDTO> openUpOnTrial(OpenUpOnTrialVO openUpOnTrialVO) {
+    public RespDTO<OpenUpOnTrialDTO> openUpOnTrial(@RequestBody OpenUpOnTrialVO openUpOnTrialVO) {
         return RespDTO.onSuc(openedProductsFacade.openUpOnTrial(openUpOnTrialVO));
     }
 
@@ -137,7 +137,7 @@ public class ProductOrderController {
                             "status:订单状态（0.未付款1.已付款）")
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
-    public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(ProductOrderVO productOrderVO) {
+    public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
         return productOrderFacade.selectAllProductOrder(productOrderVO);
     }
 

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 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.RestController;
 
@@ -46,7 +47,7 @@ public class ProductServiceController {
     @PostMapping("/genProductService")
     @SysLogger("genProductService")
     @Transactional
-    public RespDTO<ProductServiceDTO> genProductService(ProductServiceSaveVO productServiceSaveVO) {
+    public RespDTO<ProductServiceDTO> genProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
         return RespDTO.onSuc(productServiceDTO);
     }
@@ -64,7 +65,7 @@ public class ProductServiceController {
     @PostMapping("/deleteProductService")
     @SysLogger("deleteProductService")
     @Transactional
-    public RespDTO<Boolean> deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
+    public RespDTO<Boolean> deleteProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
         Boolean isSuccess = productServiceFacade.deleteProductService(productServiceSaveVO);
         return RespDTO.onSuc(isSuccess);
     }
@@ -78,7 +79,7 @@ public class ProductServiceController {
     @ApiOperation(value = "获取当前登录用户产品服务分页列表[by:zhaops]", notes = "获取当前登录用户产品服务分页列表")
     @PostMapping("/getProductServiceByCurrentUser")
     @SysLogger("getProductServiceByCurrentUser")
-    public RespDTO getProductServiceByCurrentUser(Page page) {
+    public RespDTO getProductServiceByCurrentUser(@RequestBody Page page) {
         IPage<ProductServiceWrapper> psPage = productServiceFacade.selectProductServiceByCurrentUserPage(page);
         return RespDTO.onSuc(psPage);
     }

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

@@ -115,7 +115,7 @@ public class ServiceInfoController {
     @PostMapping("/getServiceListPageByCurrentUser")
     @SysLogger("getServiceListPageByCurrentUser")
     @Transactional
-    public RespDTO getServiceListPageByCurrentUser(Page<ServiceInfo> page) {
+    public RespDTO getServiceListPageByCurrentUser(@RequestBody Page<ServiceInfo> page) {
         IPage<ServiceInfo> list = serviceInfoFacade.getServiceListPageByCurrentUser(page);
         return RespDTO.onSuc(list);
     }