提交

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/stocktaking/InvwStocktakingInfoManagerImpl.java

@@ -38,7 +38,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Service
-public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implements InvwStocktakingInfoManager, ResultConverter<InvwStocktakingInfo, InvwStocktakingInfoPageResponseDTO> {
+public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implements InvwStocktakingInfoManager {
 
     @Autowired
     private InvwStocktakingInfoRepo stocktakingInfoRepo;
@@ -68,7 +68,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
     public Pagination page(InvwStocktakingInfoPageRequestDTO req) {
         InvwStocktakingInfoPageRequest request = new InvwStocktakingInfoPageRequest();
         BeanUtils.copyProperties(req, request);
-        return stocktakingInfoRepo.page(request).convertResult(this);
+        return stocktakingInfoRepo.page(request).convertResult(this::convert);
     }
 
     @Override
@@ -604,7 +604,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
         logger.info("{} 盘存完成，id={}", model.getStoreCode(), model.getId());
     }
 
-    @Override
+
     public InvwStocktakingInfoPageResponseDTO convert(InvwStocktakingInfo stocktakingInfo) {
         InvwStocktakingInfoPageResponseDTO vo = new InvwStocktakingInfoPageResponseDTO();
         vo.setId(stocktakingInfo.getId());

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class InvwWarehouseManagerImpl extends AbstractInvwManager implements InvwWarehouseManager, ResultConverter<InvwWarehouse, InvwWarehousePageResponseDTO> {
+public class InvwWarehouseManagerImpl extends AbstractInvwManager implements InvwWarehouseManager {
 
     @Autowired
     private InvwWarehouseRepo warehouseRepo;
@@ -35,7 +35,7 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
     public Pagination page(InvwWarehousePageRequestDTO request) {
         InvwWarehousePageRequest req = new InvwWarehousePageRequest();
         BeanUtils.copyProperties(request, req);
-        return warehouseRepo.page(req).convertResult(this);
+        return warehouseRepo.page(req).convertResult(this::convert);
     }
 
     @Override
@@ -317,7 +317,7 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
         return response;
     }
 
-    @Override
+
     public InvwWarehousePageResponseDTO convert(InvwWarehouse warehouse) {
         InvwWarehousePageResponseDTO vo = new InvwWarehousePageResponseDTO();
         vo.setWarehouse(warehouse);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/coupon/CouponEditRequestDTO.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -45,7 +46,8 @@ public class CouponEditRequestDTO extends AbstractStaffBizRequestDTO {
      */
     @ApiModelProperty(value = "剩余使用时长阈值（单位：小时）", required = true)
     @NotNull
-    @Min(value = 0, message = "剩余使用时长阈值，不能小于0")
+    @Min(value = 0, message = "不能小于0")
+    @Max(value = 999,  message = "不能大于999")
     private Integer remainingUsefulHour;
 
     /**
@@ -53,7 +55,8 @@ public class CouponEditRequestDTO extends AbstractStaffBizRequestDTO {
      */
     @ApiModelProperty(value = "剩余个数阈值", required = true)
     @NotNull
-    @Min(value = 0, message = "剩余个数阈值，不能小于0")
+    @Min(value = 0, message = "不能小于0")
+    @Max(value = 999,message = "不能大于999")
     private Integer thresholdValue;
 
     /**

zhywpt-app-managew/src/main/resources/bootstrap.yml

@@ -36,7 +36,7 @@ spring:
           - data-id: redis.yaml
             refresh: true
 server:
-  port: 8085
+  port: 8073
   servlet:
     context-path: /managew/
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/rbac/RbacRoleMangerImpl.java

@@ -494,7 +494,7 @@ public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger
     @Override
     public GetAccountInfoByRolePageResponseDTO getAccountInfoByRolePage(GetAccountInfoByRolePageRequestDTO request) throws ManagerException {
         //入参校验
-        request.valid();
+        request.validate();
 
         Specification<AccountUserRole> specification = accountUserRoleSpecification(request);
         Pageable pageable = PageRequest.of(request.getPageNo() - 1, request.getPageSize(), Sort.Direction.DESC, "createTime");