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

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

@@ -25,7 +25,6 @@ import com.diagbot.vo.ProductServiceSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

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

@@ -18,6 +18,5 @@ public class ProductServiceSaveVO {
     private Long productId;
     @NotNull(message = "请输入服务Id!")
     private Long serviceId;
-    @NotNull(message = "请输入令牌类型!")
     private Integer type;
 }

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

@@ -7,6 +7,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.wrapper.ProductServiceWrapper;
+import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.facade.ProductServiceFacade;
 import com.diagbot.vo.ProductServiceSaveVO;
 import io.swagger.annotations.Api;
@@ -42,12 +43,12 @@ public class ProductServiceController {
      */
     @ApiOperation(value = "服务端关联到产品接口[by:zhaops]",
             notes = "productId：产品Id，必填<br>" +
-                    "serviceId：服务Id，必填<br> " +
-                    "type：令牌类型，必填<br> ")
+                    "serviceId：服务Id，必填<br> ")
     @PostMapping("/genProductService")
     @SysLogger("genProductService")
     @Transactional
     public RespDTO<ProductServiceDTO> genProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
+        productServiceSaveVO.setType(TokenTypeEnum.Manual.getKey());
         ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
         return RespDTO.onSuc(productServiceDTO);
     }
@@ -66,6 +67,7 @@ public class ProductServiceController {
     @SysLogger("deleteProductService")
     @Transactional
     public RespDTO<Boolean> deleteProductService(@RequestBody ProductServiceSaveVO productServiceSaveVO) {
+        productServiceSaveVO.setType(TokenTypeEnum.Manual.getKey());
         Boolean isSuccess = productServiceFacade.deleteProductService(productServiceSaveVO);
         return RespDTO.onSuc(isSuccess);
     }