From eccdd30fc64dc74d13714d04063270aa209a272f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Thu, 23 May 2024 16:52:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=91=E5=AE=9ATR069?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceTypeController.java | 4 +++- .../controller/DeviceTypeVerController.java | 7 +++++++ .../bellmann/controller/Tr069VerController.java | 1 + .../bellmann/model/form/BindingTr069Form.java | 17 +++++++++++++++++ .../bellmann/service/DeviceTypeVerService.java | 3 +++ .../service/impl/DeviceTypeVerServiceImpl.java | 15 +++++++++++++++ src/main/resources/mapper/DeviceTypeMapper.xml | 3 +++ 7 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bellmann/model/form/BindingTr069Form.java diff --git a/src/main/java/com/bellmann/controller/DeviceTypeController.java b/src/main/java/com/bellmann/controller/DeviceTypeController.java index 8409f98..8b6b1a3 100644 --- a/src/main/java/com/bellmann/controller/DeviceTypeController.java +++ b/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 tr069BindingPage(@RequestBody Tr069BindingPageQuery query){ Page page = deviceTypeService.tr069BindingPage(query); return PageResult.success(page); } + } diff --git a/src/main/java/com/bellmann/controller/DeviceTypeVerController.java b/src/main/java/com/bellmann/controller/DeviceTypeVerController.java index 9bc86bf..934a40c 100644 --- a/src/main/java/com/bellmann/controller/DeviceTypeVerController.java +++ b/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 tr069BindingDevType(@RequestBody BindingTr069Form form){ + return deviceTypeVerService.tr069BindingDevType(form); + } + } diff --git a/src/main/java/com/bellmann/controller/Tr069VerController.java b/src/main/java/com/bellmann/controller/Tr069VerController.java index a6938db..959628c 100644 --- a/src/main/java/com/bellmann/controller/Tr069VerController.java +++ b/src/main/java/com/bellmann/controller/Tr069VerController.java @@ -63,4 +63,5 @@ public class Tr069VerController { public Result addTr069Form(@RequestBody Tr069VerForm editTr069Form){ return Result.success(tr069VerService.addTr069Form(editTr069Form)); } + } diff --git a/src/main/java/com/bellmann/model/form/BindingTr069Form.java b/src/main/java/com/bellmann/model/form/BindingTr069Form.java new file mode 100644 index 0000000..9f2ac39 --- /dev/null +++ b/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 ids; + + @Schema(description = "tr069VerId") + private Long tr069VerId; +} diff --git a/src/main/java/com/bellmann/service/DeviceTypeVerService.java b/src/main/java/com/bellmann/service/DeviceTypeVerService.java index d1bc5e7..6a3c73d 100644 --- a/src/main/java/com/bellmann/service/DeviceTypeVerService.java +++ b/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 pageService(Long typeAndVerId, BasePageQuery pageQuery); int addTypeVer(DeviceTypeVerForm form, Long devTypeId); + + Result tr069BindingDevType(BindingTr069Form form); } diff --git a/src/main/java/com/bellmann/service/impl/DeviceTypeVerServiceImpl.java b/src/main/java/com/bellmann/service/impl/DeviceTypeVerServiceImpl.java index 4ac8867..bf69378 100644 --- a/src/main/java/com/bellmann/service/impl/DeviceTypeVerServiceImpl.java +++ b/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 tr069BindingDevType(BindingTr069Form form) { + List ids = form.getIds(); + Long tr069VerId = form.getTr069VerId(); + for(Long devTypeId:ids){ + deviceTypeVerMapper.update(null, + new LambdaUpdateWrapper() + .eq(DeviceTypeVer::getDevTypeId,devTypeId) + .set(DeviceTypeVer::getTr069VerId,tr069VerId) + ); + } + return Result.success(); + } } diff --git a/src/main/resources/mapper/DeviceTypeMapper.xml b/src/main/resources/mapper/DeviceTypeMapper.xml index e17eb64..ffff31d 100644 --- a/src/main/resources/mapper/DeviceTypeMapper.xml +++ b/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} + + AND itms_device_type_ver.tr069_ver_id = #{query.tr069VerId} + AND itms_device_type.dev_vendor_name = #{query.devVendorName}