feat: 组态添加CRUD

@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
@@ -86,4 +87,13 @@ public class YtConfigurationCenterController extends BaseController {
     deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
     deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(ytConfigurationCenterService.deleteConfigurationCenter(deleteDTO));
     return ResponseEntity.ok(ytConfigurationCenterService.deleteConfigurationCenter(deleteDTO));
   }
   }
+
+  @GetMapping("/getConfigurationInfo/{id}")
+  @ApiOperation("获取组态信息")
+  public ResponseEntity<ConfigurationContentInfoDTO> getConfigurationInfos(
+      @PathVariable("id") String id) throws ThingsboardException {
+    return ResponseEntity.ok(
+        ytConfigurationCenterService.getConfigurationInfos(
+            id, getCurrentUser().getCurrentTenantId()));
+  }
 }
 }

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
+
+@RestController
+@RequestMapping("/api/yt/configuration/content")
+@RequiredArgsConstructor
+@Api(tags = "组态内容")
+public class YtConfigurationContentController extends BaseController {
+
+  private final YtConfigurationContentService ytConfigurationContentService;
+
+  @PostMapping
+  @ApiOperation("新增")
+  public ResponseEntity<ConfigurationContentDTO> save(
+      @Validated({AddGroup.class}) @RequestBody ConfigurationContentDTO configurationContentDTO)
+      throws ThingsboardException {
+    configurationContentDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(
+        ytConfigurationContentService.saveConfigurationContent(configurationContentDTO));
+  }
+
+  @PutMapping
+  @ApiOperation("修改")
+  public ResponseEntity<ConfigurationContentInfoDTO> update(
+      @Validated({UpdateGroup.class}) @RequestBody ConfigurationContentInfoDTO contentReqDTO)
+      throws ThingsboardException {
+    for (ConfigurationContentDTO configurationContentDTO :
+        contentReqDTO.getConfigurationContentList()) {
+      configurationContentDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+      configurationContentDTO.setConfigurationId(contentReqDTO.getConfigurationId());
+      ytConfigurationContentService.updateConfigurationContent(configurationContentDTO);
+    }
+    return ResponseEntity.ok(contentReqDTO);
+  }
+
+  @DeleteMapping
+  @ApiOperation("删除")
+  public ResponseEntity<Boolean> delete(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(ytConfigurationContentService.deleteConfigurationContent(deleteDTO));
+  }
+}

@@ -6,6 +6,9 @@ public interface FastIotConstants {
   Integer JAVA_SCRIPT = 0;
   Integer JAVA_SCRIPT = 0;
   Integer CONVERT_DATA = 1;
   Integer CONVERT_DATA = 1;
   Integer SCENE_REACT = 2;
   Integer SCENE_REACT = 2;
+  Integer MOBILE_TYPE = 0;
+  Integer PC_TYPE = 1;
+  String FIRST_PAGE_NAME = "第 1 页";
   class DefaultOrder {
   class DefaultOrder {
     public static final String CREATE_TIME="create_time";
     public static final String CREATE_TIME="create_time";
   }
   }

@@ -73,12 +73,13 @@ public final class ModelConstants {
     public static final String IOTFS_CONVERT_CONFIG_TABLE_NAME = "iotfs_convert_config";
     public static final String IOTFS_CONVERT_CONFIG_TABLE_NAME = "iotfs_convert_config";
     /** 组态中心 */
     /** 组态中心 */
     public static final String IOTFS_CONFIGURATION_CENTER_NAME = "iotfs_configuration_center";
     public static final String IOTFS_CONFIGURATION_CENTER_NAME = "iotfs_configuration_center";
-
+    /** 组态内容 */
+    public static final String IOTFS_CONFIGURATION_CONTENT_NAME = "iotfs_configuration_content";
     /** 视频流 */
     /** 视频流 */
     public static final String IOTFS_VIDEO_STREAM_TABLE_NAME = "iotfs_device_camera";
     public static final String IOTFS_VIDEO_STREAM_TABLE_NAME = "iotfs_device_camera";
     /** 意见反馈 */
     /** 意见反馈 */
     public static final String IOTFS_OPINION_TABLE_NAME = "iotfs_opinion";
     public static final String IOTFS_OPINION_TABLE_NAME = "iotfs_opinion";
-    /** 意见反馈 */
+    /** 第三方用户表 */
     public static final String IOTFS_THIRD_USER_TABLE_NAME = "iotfs_third_user";
     public static final String IOTFS_THIRD_USER_TABLE_NAME = "iotfs_third_user";
   }
   }
 
 

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConfigurationContentDTO extends TenantDTO {
+  @ApiModelProperty(value = "页面名称", required = true)
+  @NotEmpty(
+      message = "页面名称不能为空或空字符串",
+      groups = {UpdateGroup.class, AddGroup.class})
+  private String name;
+
+  @ApiModelProperty(value = "页面内容")
+  @NotEmpty(
+      message = "页面内容不能为空或空字符串",
+      groups = {UpdateGroup.class})
+  private String content;
+
+  @ApiModelProperty(value = "组态描述")
+  private String remark;
+
+  @ApiModelProperty(value = "组织中心ID", required = true)
+  @NotEmpty(
+      message = "组织中心ID不能为空或空字符串",
+      groups = {UpdateGroup.class, AddGroup.class})
+  private String configurationId;
+
+  @ApiModelProperty(value = "类型：0手机 1PC", required = true)
+  @NotNull(
+      message = "类型不能为空",
+      groups = {UpdateGroup.class, AddGroup.class})
+  private Integer type;
+}

+package org.thingsboard.server.common.data.yunteng.dto.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO;
+
+import java.util.List;
+@Data
+@ApiModel(value = "组态编辑")
+public class ConfigurationContentInfoDTO {
+    @ApiModelProperty(value = "组态中心ID",required = true)
+    private String configurationId;
+    @ApiModelProperty(value = "组态中心名称")
+    private String configurationName;
+    @ApiModelProperty(value = "组态内容",required = true)
+    private List<ConfigurationContentDTO> configurationContentList;
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.Table.IOTFS_CONFIGURATION_CONTENT_NAME)
+@Data
+public class ConfigurationContent extends TenantBaseEntity {
+
+  private static final long serialVersionUID = -419380277607655083L;
+  private String name;
+  private String remark;
+  private String configurationId;
+  private String content;
+  private Integer type;
+}

@@ -9,16 +9,15 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
-import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.ConfigurationCenter;
 import org.thingsboard.server.dao.yunteng.entities.ConfigurationCenter;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationCenterMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationCenterMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationCenterService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationCenterService;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
 
 
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
@@ -32,6 +31,7 @@ public class YtConfigurationCenterServiceImpl
     extends AbstractBaseService<ConfigurationCenterMapper, ConfigurationCenter>
     extends AbstractBaseService<ConfigurationCenterMapper, ConfigurationCenter>
     implements YtConfigurationCenterService {
     implements YtConfigurationCenterService {
   private final OrganizationMapper organizationMapper;
   private final OrganizationMapper organizationMapper;
+  private final YtConfigurationContentService ytConfigurationContentService;
 
 
   @Override
   @Override
   public YtPageData<ConfigurationCenterDTO> page(Map<String, Object> queryMap) {
   public YtPageData<ConfigurationCenterDTO> page(Map<String, Object> queryMap) {
@@ -59,7 +59,14 @@ public class YtConfigurationCenterServiceImpl
   @Override
   @Override
   @Transactional
   @Transactional
   public ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO) {
   public ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO) {
-    baseMapper.insert(configurationCenterDTO.getEntity(ConfigurationCenter.class));
+    ConfigurationCenter configurationCenter = configurationCenterDTO.getEntity(ConfigurationCenter.class);
+    baseMapper.insert(configurationCenter);
+    ConfigurationContentDTO contentDTO = new ConfigurationContentDTO();
+    contentDTO.setTenantId(configurationCenter.getTenantId());
+    contentDTO.setType(FastIotConstants.PC_TYPE);
+    contentDTO.setName(FastIotConstants.FIRST_PAGE_NAME);
+    contentDTO.setConfigurationId(configurationCenter.getId());
+    ytConfigurationContentService.saveConfigurationContent(contentDTO);
     return configurationCenterDTO;
     return configurationCenterDTO;
   }
   }
 
 
@@ -86,6 +93,15 @@ public class YtConfigurationCenterServiceImpl
         throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
         throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
       }
       }
     }
     }
+    ytConfigurationContentService.deleteConfigurationContentByCenterId(deleteDTO.getIds());
     return baseMapper.deleteBatchIds(deleteDTO.getIds()) > FastIotConstants.MagicNumber.ZERO;
     return baseMapper.deleteBatchIds(deleteDTO.getIds()) > FastIotConstants.MagicNumber.ZERO;
   }
   }
+
+  @Override
+  public ConfigurationContentInfoDTO getConfigurationInfos(String id, String tenantId) {
+    List<ConfigurationContentInfoDTO> list = baseMapper.getConfigurationInfoById(id, tenantId);
+    return list.size() > FastIotConstants.MagicNumber.ZERO
+        ? list.get(FastIotConstants.MagicNumber.ZERO)
+        : null;
+  }
 }
 }

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationContent;
+import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtConfigurationContentServiceImpl
+    extends AbstractBaseService<ConfigurationContentMapper, ConfigurationContent>
+    implements YtConfigurationContentService {
+
+  @Override
+  @Transactional
+  public ConfigurationContentDTO saveConfigurationContent(
+      ConfigurationContentDTO configurationContentDTO) {
+    baseMapper.insert(configurationContentDTO.getEntity(ConfigurationContent.class));
+    return configurationContentDTO;
+  }
+
+  @Override
+  @Transactional
+  public ConfigurationContentDTO updateConfigurationContent(
+      ConfigurationContentDTO configurationContentDTO) {
+    ConfigurationContent configurationContent =
+        baseMapper.selectById(configurationContentDTO.getId());
+    if (!configurationContent.getTenantId().equals(configurationContentDTO.getTenantId())) {
+      throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+    }
+    baseMapper.updateById(configurationContentDTO.getEntity(ConfigurationContent.class));
+    return configurationContentDTO;
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteConfigurationContent(DeleteDTO deleteDTO) {
+    List<ConfigurationContent> centerList =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<ConfigurationContent>()
+                .in(ConfigurationContent::getId, deleteDTO.getIds()));
+    for (ConfigurationContent center : centerList) {
+      if (!center.getTenantId().equals(deleteDTO.getTenantId())) {
+        throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+      }
+    }
+    return baseMapper.deleteBatchIds(deleteDTO.getIds()) > FastIotConstants.MagicNumber.ZERO;
+  }
+
+  @Override
+  @Transactional
+  public boolean deleteConfigurationContentByCenterId(Set<String> configurationCenterIds) {
+    return baseMapper.delete(
+            new LambdaQueryWrapper<ConfigurationContent>()
+                .in(ConfigurationContent::getConfigurationId, configurationCenterIds))
+        > FastIotConstants.MagicNumber.ZERO;
+  }
+}

@@ -5,12 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
 import org.thingsboard.server.dao.yunteng.entities.ConfigurationCenter;
 import org.thingsboard.server.dao.yunteng.entities.ConfigurationCenter;
 
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 @Mapper
 @Mapper
 public interface ConfigurationCenterMapper extends BaseMapper<ConfigurationCenter> {
 public interface ConfigurationCenterMapper extends BaseMapper<ConfigurationCenter> {
   IPage<ConfigurationCenterDTO> getConfigurationCenterPage(
   IPage<ConfigurationCenterDTO> getConfigurationCenterPage(
       IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
       IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+  List<ConfigurationContentInfoDTO> getConfigurationInfoById(
+      @Param("id") String id, @Param("tenantId") String tenantId);
 }
 }

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.ConfigurationContent;
+
+@Mapper
+public interface ConfigurationContentMapper extends BaseMapper<ConfigurationContent> {
+}

@@ -2,6 +2,7 @@ package org.thingsboard.server.dao.yunteng.service;
 
 
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 
 
 import java.util.Map;
 import java.util.Map;
@@ -14,4 +15,6 @@ public interface YtConfigurationCenterService {
   ConfigurationCenterDTO updateConfiguration(ConfigurationCenterDTO configurationCenterDTO);
   ConfigurationCenterDTO updateConfiguration(ConfigurationCenterDTO configurationCenterDTO);
 
 
   boolean deleteConfigurationCenter(DeleteDTO deleteDTO);
   boolean deleteConfigurationCenter(DeleteDTO deleteDTO);
+
+  ConfigurationContentInfoDTO getConfigurationInfos(String id,String tenantId);
 }
 }

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+
+import java.util.Set;
+
+public interface YtConfigurationContentService {
+
+  ConfigurationContentDTO saveConfigurationContent(ConfigurationContentDTO configurationContentDTO);
+
+  ConfigurationContentDTO updateConfigurationContent(
+      ConfigurationContentDTO configurationContentDTO);
+
+  boolean deleteConfigurationContent(DeleteDTO deleteDTO);
+
+  boolean deleteConfigurationContentByCenterId(Set<String> configurationCenterIds);
+}

@@ -17,6 +17,15 @@
             <result property="name" column="organization_name"/>
             <result property="name" column="organization_name"/>
         </association>
         </association>
     </resultMap>
     </resultMap>
+    <resultMap id="configurationInfoMap" type="org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO">
+        <result property="configurationId" column="id"/>
+        <result property="configurationName" column="name"/>
+        <collection property="configurationContentList" ofType="org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO">
+            <result property="id" column="content_id"/>
+            <result property="content" column="content"/>
+        </collection>
+    </resultMap>
+
     <sql id="columns">
     <sql id="columns">
         a.id,a.name,a.organization_id,a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
         a.id,a.name,a.organization_id,a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
     </sql>
     </sql>
@@ -40,4 +49,10 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+    <select id="getConfigurationInfoById" resultMap="configurationInfoMap">
+        SELECT icc.id,icc.name,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
+        iotfs_configuration_content icct ON icc.id = icct.configuration_id
+        WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
+    </select>
 </mapper>
 </mapper>