Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicetemplate/vo/IotDeviceTemplateSaveReqVO.java

@@ -1,8 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo;
 
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.model.DeviceTemplateAttrs;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - PMS 功能优化 设备模板新增/修改 Request VO")
 @Data
 public class IotDeviceTemplateSaveReqVO {
@@ -20,7 +23,7 @@ public class IotDeviceTemplateSaveReqVO {
     private String code;
 
     @Schema(description = "模板属性 json 格式数据")
-    private String attrs;
+    private List<DeviceTemplateAttrs> attrs;
 
     @Schema(description = "模板描述", example = "随便")
     private String description;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/convert/iotdevicetemplate/IotDeviceTemplateConvert.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.pms.convert.iotdevicetemplate;
+
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.model.DeviceTemplateAttrs;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.IotDeviceTemplateSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicetemplate.IotDeviceTemplateDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface IotDeviceTemplateConvert {
+
+    IotDeviceTemplateConvert INSTANCE = Mappers.getMapper(IotDeviceTemplateConvert.class);
+
+    @Mapping(target = "attrs", expression = "java(convertToProperty(bean))")
+    IotDeviceTemplateDO convert(IotDeviceTemplateSaveReqVO bean);
+
+    @Named("convertToProperty")
+    default List<DeviceTemplateAttrs> convertToProperty(IotDeviceTemplateSaveReqVO bean) {
+        return bean.getAttrs();
+    }
+
+}