feat: 设备类型绑定TR069

src/main/java/com/bellmann/controller/DeviceTypeController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bellmann.common.model.Option;
 import com.bellmann.common.result.PageResult;
 import com.bellmann.common.result.Result;
+import com.bellmann.model.form.BindingTr069Form;
 import com.bellmann.model.query.DeviceTypeQuery;
 import com.bellmann.model.query.Tr069BindingPageQuery;
 import com.bellmann.model.vo.DeviceTypePageVO;
@@ -75,9 +76,10 @@ public class DeviceTypeController {
     }
 
     @PostMapping("/tr069-binding-page")
-    @Operation(summary = "TR-069数据模型版本对应的设备类型及软件版本列表:")
+    @Operation(summary = "TR-069数据模型版本对应的设备类型及软件版本列表")
     public PageResult<Tr069BindingVO> tr069BindingPage(@RequestBody Tr069BindingPageQuery query){
         Page<Tr069BindingVO> page = deviceTypeService.tr069BindingPage(query);
         return PageResult.success(page);
     }
+
 }

src/main/java/com/bellmann/controller/DeviceTypeVerController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bellmann.common.base.BasePageQuery;
 import com.bellmann.common.result.PageResult;
 import com.bellmann.common.result.Result;
+import com.bellmann.model.form.BindingTr069Form;
 import com.bellmann.model.form.DeviceTypeVerForm;
 import com.bellmann.model.form.VendorProfileForm;
 import com.bellmann.model.query.DeviceTypeToVerQuery;
@@ -141,4 +142,10 @@ public class DeviceTypeVerController {
         return Result.success(rows);
     }
 
+    @PostMapping("/tr069-binding-dev-type")
+    @Operation(summary = "绑定设备类型")
+    public Result<String> tr069BindingDevType(@RequestBody BindingTr069Form form){
+        return deviceTypeVerService.tr069BindingDevType(form);
+    }
+
 }

src/main/java/com/bellmann/controller/Tr069VerController.java

@@ -63,4 +63,5 @@ public class Tr069VerController {
     public Result<Integer> addTr069Form(@RequestBody Tr069VerForm editTr069Form){
         return Result.success(tr069VerService.addTr069Form(editTr069Form));
     }
+
 }

src/main/java/com/bellmann/model/form/BindingTr069Form.java

@@ -0,0 +1,17 @@
+package com.bellmann.model.form;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(description = "设备类型绑定TR069表单")
+public class BindingTr069Form {
+
+    @Schema(description = "设备类型ids")
+    private List<Long> ids;
+
+    @Schema(description = "tr069VerId")
+    private Long tr069VerId;
+}

src/main/java/com/bellmann/service/DeviceTypeVerService.java

@@ -3,6 +3,7 @@ package com.bellmann.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bellmann.common.base.BasePageQuery;
 import com.bellmann.common.result.Result;
+import com.bellmann.model.form.BindingTr069Form;
 import com.bellmann.model.form.DeviceTypeVerForm;
 import com.bellmann.model.form.VendorProfileForm;
 import com.bellmann.model.query.DeviceTypeToVerQuery;
@@ -45,4 +46,6 @@ public interface DeviceTypeVerService {
     Page<DeviceServiceVO> pageService(Long typeAndVerId, BasePageQuery pageQuery);
 
     int addTypeVer(DeviceTypeVerForm form, Long devTypeId);
+
+    Result<String> tr069BindingDevType(BindingTr069Form form);
 }

src/main/java/com/bellmann/service/impl/DeviceTypeVerServiceImpl.java

@@ -21,6 +21,7 @@ import com.bellmann.model.entity.DeviceType;
 import com.bellmann.model.entity.DeviceTypeVer;
 import com.bellmann.model.entity.DeviceTypeVerDetail;
 import com.bellmann.model.entity.FileRecord;
+import com.bellmann.model.form.BindingTr069Form;
 import com.bellmann.model.form.DeviceTypeVerForm;
 import com.bellmann.model.form.VendorProfileForm;
 import com.bellmann.model.query.DeviceTypeToVerQuery;
@@ -348,4 +349,18 @@ public class DeviceTypeVerServiceImpl implements DeviceTypeVerService {
         deviceTypeVerDetailManager.insertDetailByTypeAndVerId(deviceTypeVer.getTypeAndVerId(),devTypeId);
         return 1;
     }
+
+    @Override
+    public Result<String> tr069BindingDevType(BindingTr069Form form) {
+        List<Long> ids = form.getIds();
+        Long tr069VerId = form.getTr069VerId();
+        for(Long devTypeId:ids){
+            deviceTypeVerMapper.update(null,
+                    new LambdaUpdateWrapper<DeviceTypeVer>()
+                            .eq(DeviceTypeVer::getDevTypeId,devTypeId)
+                            .set(DeviceTypeVer::getTr069VerId,tr069VerId)
+            );
+        }
+        return Result.success();
+    }
 }

src/main/resources/mapper/DeviceTypeMapper.xml

@@ -102,6 +102,9 @@
         INNER JOIN itms_tr069_ver ON itms_tr069_ver.tr069_ver_id = itms_device_type_ver.tr069_ver_id
         WHERE
         itms_devtypever_sysdomain_map.sys_domain_id = #{domainId}
+        <if test="query.tr069VerId!=null and query.tr069VerId!=''">
+            AND itms_device_type_ver.tr069_ver_id = #{query.tr069VerId}
+        </if>
         <if test="query.devVendorName!=null and query.devVendorName!=''">
             AND itms_device_type.dev_vendor_name = #{query.devVendorName}
         </if>