new model and bind (add)

src/main/java/com/mmc/pms/controller/WebDeviceController.java

@@ -50,6 +50,18 @@ public class WebDeviceController {
     return webDeviceService.model();
   }
 
+  @ApiOperation("设备品牌")
+  @GetMapping("/deviceBrand")
+  public ResultBody<BrandDTO> deviceBrand() {
+    return webDeviceService.deviceBrand();
+  }
+
+  @ApiOperation("设备型号")
+  @GetMapping("/deviceModel")
+  public ResultBody<ModelDTO> deviceModel() {
+    return webDeviceService.deviceModel();
+  }
+
   @ApiOperation(value = "设备详情")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
   @GetMapping("/detail")

src/main/java/com/mmc/pms/dao/WebDeviceDao.java

@@ -20,8 +20,12 @@ public interface WebDeviceDao {
 
   List<Brand> brand();
 
+  List<Brand> deviceBrand();
+
   List<Model> model();
 
+  List<Model> deviceModel();
+
   List<DeviceListDO> deviceList(
       Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
 

src/main/java/com/mmc/pms/service/Impl/WebDeviceServiceImpl.java

@@ -62,6 +62,19 @@ public class WebDeviceServiceImpl implements WebDeviceService {
   }
 
   @Override
+  public ResultBody deviceBrand() {
+    List<Brand> brand = webDeviceDao.deviceBrand();
+    List<BrandDTO> collect =
+            brand.stream()
+                    .map(
+                            t -> {
+                              return t.brandDTO();
+                            })
+                    .collect(Collectors.toList());
+    return ResultBody.success(collect);
+  }
+
+  @Override
   public ResultBody model() {
     List<Model> model = webDeviceDao.model();
     List<ModelDTO> collect =
@@ -75,6 +88,19 @@ public class WebDeviceServiceImpl implements WebDeviceService {
   }
 
   @Override
+  public ResultBody deviceModel() {
+    List<Model> model = webDeviceDao.deviceModel();
+    List<ModelDTO> collect =
+            model.stream()
+                    .map(
+                            t -> {
+                              return t.modelDTO();
+                            })
+                    .collect(Collectors.toList());
+    return ResultBody.success(collect);
+  }
+
+  @Override
   public ResultBody deviceList(
       Integer districtId, Integer categoryId, Integer brandId, Integer modelId) {
     List<DeviceListDO> deviceList =

src/main/java/com/mmc/pms/service/WebDeviceService.java

@@ -17,8 +17,12 @@ public interface WebDeviceService {
 
   ResultBody brand();
 
+  ResultBody deviceBrand();
+
   ResultBody model();
 
+  ResultBody deviceModel();
+
   ResultBody deviceList(Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
 
   ResultBody update(LeaseVo param);

src/main/resources/mapper/WebDeviceDao.xml

@@ -79,11 +79,21 @@
         from brand;
     </select>
 
+    <select id="deviceBrand" resultType="com.mmc.pms.entity.Brand">
+        select id, `name`
+        from device_brand;
+    </select>
+
     <select id="model" resultType="com.mmc.pms.entity.Model">
         select id, `name`
         from model;
     </select>
 
+    <select id="deviceModel" resultType="com.mmc.pms.entity.Model">
+        select id, `name`
+        from device_model;
+    </select>
+
     <select id="deviceList" resultType="com.mmc.pms.entity.DeviceListDO">
         SELECT d.id,
         d.`name` AS deviceName,