修改httpOKUtil请求时长

src/main/java/com/example/demo/controller/ManagerController.java

@@ -78,6 +78,9 @@ public class ManagerController {
     private IRenovationPartsSizeService renovationPartsSizeService;
 
     @Autowired
+    private IRenovationPartsBrandService renovationPartsBrandService;
+
+    @Autowired
     private ICompanyService companyService;
 
     @Autowired
@@ -439,6 +442,14 @@ public class ManagerController {
                 }
             }
 
+            if(renovationPartsDetailEntity.getPartsBrandId() != null){
+                RenovationPartsBrandEntity renovationPartsBrandEntity = renovationPartsBrandService.findById(renovationPartsDetailEntity.getPartsBrandId());
+
+                if(renovationPartsBrandEntity != null){
+                    responseRenovationPartsDetailManager.setBrandName(renovationPartsBrandEntity.getBrandName());
+                }
+            }
+
             if(renovationPartsDetailEntity.getCompanyId() != null){
                 CompanyEntity companyEntity = companyService.findById(renovationPartsDetailEntity.getCompanyId());
 

src/main/java/com/example/demo/controller/RenovationController.java

@@ -71,6 +71,9 @@ public class RenovationController {
     @Autowired
     private IRenovationPartsStyleService renovationPartsStyleService;
 
+    @Autowired
+    private IRenovationPartsBrandService renovationPartsBrandService;
+
     /**
      * 获取所有装修配件
      * @return
@@ -276,4 +279,15 @@ public class RenovationController {
     public Result findPartsShapeList(){
         return Result.success(renovationPartsShapeService.findAll());
     }
+
+
+    /**
+     * 获取所有品牌
+     * @return
+     */
+    @ApiOperation("获取所有品牌")
+    @RequestMapping(value = "/findPartsBrandList", method = RequestMethod.POST)
+    public Result findPartsBrandList(){
+        return Result.success(renovationPartsBrandService.findAll());
+    }
 }

src/main/java/com/example/demo/entity/RenovationPartsBrandEntity.java

@@ -0,0 +1,17 @@
+package com.example.demo.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+
+/**
+ * Created by Hb_zzZ on 2020/12/24.
+ */
+@Data
+@Table(name = "tb_renovation_parts_brand")
+public class RenovationPartsBrandEntity extends BaseEntity {
+
+    @Column(name = "brand_name")
+    private String brandName;
+}

src/main/java/com/example/demo/entity/RenovationPartsDetailEntity.java

@@ -28,6 +28,9 @@ public class RenovationPartsDetailEntity extends BaseEntity {
     @Column(name = "parts_shape_id")
     private Long partsShapeId;
 
+    @Column(name = "parts_brand_id")
+    private Long partsBrandId;
+
     @Column(name = "company_id")
     private Long companyId;
 

src/main/java/com/example/demo/mapper/IRenovationPartsBrandMapper.java

@@ -0,0 +1,11 @@
+package com.example.demo.mapper;
+
+import com.example.demo.entity.RenovationPartsBrandEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Created by Hb_zzZ on 2020/12/24.
+ */
+@Mapper
+public interface IRenovationPartsBrandMapper extends IBaseMapper<RenovationPartsBrandEntity, Long>{
+}

src/main/java/com/example/demo/mapper/IRenovationPartsDetailMapper.java

@@ -35,7 +35,7 @@ public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPart
     @Select("<script> " +
             "SELECT a.id, a.parts_type_id AS partsTypeId, a.parts_color_id AS partsColorId, " +
             " a.parts_style_id AS partsStyleId, a.parts_classify_id AS partsClassifyId, " +
-            " a.parts_shape_id AS partsShapeId, a.company_id AS companyId, a.description, a.img, " +
+            " a.parts_shape_id AS partsShapeId, a.parts_brand_id AS partsBrandId, a.company_id AS companyId, a.description, a.img, " +
             " a.high_img AS highImg, a.path, a.key_word AS keyWord, a.NAME, a.zh_name AS zhName, " +
             " a.TYPE, a.is_show AS isShow, a.examine, a.create_time AS createTime, a.has_toolbag as hasToolbag " +
             " FROM tb_renovation_parts_detail a LEFT JOIN `tb_model_upload` b ON a.id = b.parts_detail_id " +

src/main/java/com/example/demo/service/IRenovationPartsBrandService.java

@@ -0,0 +1,9 @@
+package com.example.demo.service;
+
+import com.example.demo.entity.RenovationPartsBrandEntity;
+
+/**
+ * Created by Hb_zzZ on 2020/12/24.
+ */
+public interface IRenovationPartsBrandService extends IBaseService<RenovationPartsBrandEntity, Long> {
+}

src/main/java/com/example/demo/service/impl/RenovationPartsBrandServiceImpl.java

@@ -0,0 +1,23 @@
+package com.example.demo.service.impl;
+
+import com.example.demo.entity.RenovationPartsBrandEntity;
+import com.example.demo.mapper.IBaseMapper;
+import com.example.demo.mapper.IRenovationPartsBrandMapper;
+import com.example.demo.service.IRenovationPartsBrandService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by Hb_zzZ on 2020/12/24.
+ */
+@Service
+public class RenovationPartsBrandServiceImpl extends BaseServiceImpl<RenovationPartsBrandEntity, Long> implements IRenovationPartsBrandService {
+
+    @Autowired
+    private IRenovationPartsBrandMapper renovationPartsBrandMapper;
+
+    @Override
+    public IBaseMapper<RenovationPartsBrandEntity, Long> getBaseMapper() {
+        return this.renovationPartsBrandMapper;
+    }
+}

src/main/java/com/example/demo/vo/request/RequestRenovationPartsDetailManager.java

@@ -27,6 +27,9 @@ public class RequestRenovationPartsDetailManager {
     @ApiModelProperty(value = "形状id", name = "partsColorId")
     private Long partsShapeId;
 
+    @ApiModelProperty(value = "品牌id", name = "partsBrandId")
+    private Long partsBrandId;
+
     @ApiModelProperty(value = "企业id", name = "partsColorId")
     private Long companyId;
 

src/main/java/com/example/demo/vo/response/ResponseRenovationPartsDetailManager.java

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