Explorar o código

修改httpOKUtil请求时长

zhujinghui %!s(int64=4) %!d(string=hai) anos
pai
achega
a53a015c45

+ 0 - 16
src/main/java/com/example/demo/config/ChangingConfig.java

@@ -1,16 +0,0 @@
-package com.example.demo.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Admin
- */
-@Configuration
-@Data
-public class ChangingConfig {
-
-    @Value("${dingding.warning.address}")
-    private String dingdingWarnAddr;
-}

+ 10 - 10
src/main/java/com/example/demo/controller/ManagerController.java

@@ -442,14 +442,16 @@ public class ManagerController {
                 }
             }
 
-            if(renovationPartsDetailEntity.getPartsBrandId() != null){
-                RenovationPartsBrandEntity renovationPartsBrandEntity = renovationPartsBrandService.findById(renovationPartsDetailEntity.getPartsBrandId());
+            if(renovationPartsDetailEntity.getPartsBrandId() == null){
+                renovationPartsDetailEntity.setPartsBrandId(1L);
+            }
+            RenovationPartsBrandEntity renovationPartsBrandEntity = renovationPartsBrandService.findById(renovationPartsDetailEntity.getPartsBrandId());
 
-                if(renovationPartsBrandEntity != null){
-                    responseRenovationPartsDetailManager.setBrandName(renovationPartsBrandEntity.getBrandName());
-                }
+            if(renovationPartsBrandEntity != null){
+                responseRenovationPartsDetailManager.setBrandName(renovationPartsBrandEntity.getBrandName());
             }
 
+
             if(renovationPartsDetailEntity.getCompanyId() != null){
                 CompanyEntity companyEntity = companyService.findById(renovationPartsDetailEntity.getCompanyId());
 
@@ -477,10 +479,12 @@ public class ManagerController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "RequestRenovationPartsDetailManager", value = "json对象里面的参数", dataType = "String")})
     public Result updateModelDetail(@RequestBody RequestRenovationPartsDetailManager param){
-
         if(param.getId() == null){
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
+        if (StringUtils.isBlank(param.getZhName())) {
+            return Result.failure(1, "模型名称不能为空");
+        }
 
         RenovationPartsDetailEntity renovationPartsDetailEntity = new RenovationPartsDetailEntity();
         BeanUtils.copyProperties(param, renovationPartsDetailEntity);
@@ -548,10 +552,6 @@ public class ManagerController {
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
 
-        if (StringUtils.isBlank(param.getName())) {
-            return Result.failure(CodeConstant.FAILURE_CODE_3001, "模型名称为空,不能保存");
-        }
-
         ModelUploadEntity modelUploadEntity = modelUploadService.findById(param.getModelUploadId());
         if(modelUploadEntity == null){
             return Result.failure(CodeConstant.FAILURE_CODE_4009, CodeConstant.FAILURE_MSG_4009);

+ 3 - 0
src/main/java/com/example/demo/vo/response/ResponseRenovationPartsDetailManager.java

@@ -27,6 +27,9 @@ public class ResponseRenovationPartsDetailManager {
     @ApiModelProperty(value = "品牌名称", name = "brandName")
     private String brandName;
 
+    @ApiModelProperty(value = "品牌id", name = "brandId")
+    private Long brandId;
+
     @ApiModelProperty(value = "风格id", name = "partsColorId")
     private Long partsStyleId;