Merge branch '2024-2-19' into 'master_dev'

feat：新增设备接入信息

See merge request yunteng/thingskit!341

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -65,7 +64,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @PostMapping
   @ApiOperation("新增")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<TkDataViewInterfaceDTO> save(
       @Validated({AddGroup.class}) @RequestBody TkDataViewInterfaceDTO tkDataViewInterfaceDTO)
       throws ThingsboardException {
@@ -77,7 +75,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @PutMapping
   @ApiOperation("修改")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<TkDataViewInterfaceDTO> update(
       @Validated({UpdateGroup.class}) @RequestBody TkDataViewInterfaceDTO TkDataViewInterfaceDTO)
       throws ThingsboardException {
@@ -88,7 +85,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @DeleteMapping
   @ApiOperation("删除")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<Boolean> delete(
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
@@ -98,7 +94,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/publish/{id}")
   @ApiOperation("发布")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<Boolean> publishInterface(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.ok(
@@ -107,7 +102,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/cancel_publish/{id}")
   @ApiOperation("取消发布")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public ResponseEntity<Boolean> cancelPublishInterface(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.ok(
@@ -116,7 +110,6 @@ public class TkDataViewInterfaceController extends BaseController {
   }
 
   @ApiOperation("根据接口ID，获得接口详情")
-  @PreAuthorize("@check.checkPermissions({},{})")
   @RequestMapping(
       value = "/get_interface_details",
       params = {"ids"},
@@ -130,7 +123,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/filter_by_interface_type/{type}")
   @ApiOperation("根据接口类型过滤数据")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public List<TkDataViewInterfaceDTO> filterByInterfaceType(@PathVariable("type") String type)
       throws ThingsboardException {
     return tkDataViewInterfaceService.filterByInterfaceType(
@@ -139,7 +131,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/find_all_interface/{state}")
   @ApiOperation("查询所有接口")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public List<TkDataViewInterfaceDTO> findAll(@PathVariable("state") String state)
       throws ThingsboardException {
     return tkDataViewInterfaceService.findAll(state, getCurrentUser().getCurrentTenantId());
@@ -147,7 +138,6 @@ public class TkDataViewInterfaceController extends BaseController {
 
   @GetMapping("/find/can_use_interfaces")
   @ApiOperation("查询当前用户可使用的接口")
-  @PreAuthorize("@check.checkPermissions({},{})")
   public List<TkDataViewInterfaceDTO> findCanUseInterfaces() throws ThingsboardException {
     boolean isSysAdminOrPtAdmin = getCurrentUser().isPtAdmin() || getCurrentUser().isSystemAdmin();
     return tkDataViewInterfaceService.findCanUseInterfaces(

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.StringUtils;
+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.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccessInformationDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccessInformationService;
+
+import java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/device_profile/access_information")
+@Api(tags = {"设备接入信息管理"})
+public class TkDeviceAccessInformationController extends BaseController {
+
+  private final TkDeviceAccessInformationService service;
+
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public TkPageData<TkDeviceAccessInformationDTO> page(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "intranetIp", required = false) String intranetIp,
+      @RequestParam(value = "intranetPort", required = false) String intranetPort,
+      @RequestParam(value = "outerNetIp", required = false) String outerNetIp,
+      @RequestParam(value = "outerNetPort", required = false) String outerNetPort,
+      @RequestParam(value = "deviceAgreement", required = false) String deviceAgreement,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy) {
+
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("intranetIp", intranetIp);
+    queryMap.put("intranetPort", intranetPort);
+    queryMap.put("outerNetIp", outerNetIp);
+    queryMap.put("outerNetPort", outerNetPort);
+    queryMap.put("deviceAgreement", deviceAgreement);
+
+    return service.page(queryMap);
+  }
+
+  @PostMapping
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:device_profile:access_information:post'})")
+  public ResponseResult<TkDeviceAccessInformationDTO> saveAccessInfo(
+      @Validated({AddGroup.class}) @RequestBody TkDeviceAccessInformationDTO dto)
+      throws ThingsboardException {
+    if (!StringUtils.isEmpty(dto.getId())) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return saveOrUpdate(dto);
+  }
+
+  @PutMapping
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:device_profile:access_information:update'})")
+  public ResponseResult<TkDeviceAccessInformationDTO> updateAccessInfo(
+      @Validated({UpdateGroup.class}) @RequestBody TkDeviceAccessInformationDTO dto)
+      throws ThingsboardException {
+    if (StringUtils.isEmpty(dto.getId())) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return saveOrUpdate(dto);
+  }
+
+  @DeleteMapping
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:device_profile:access_information:delete'})")
+  public ResponseResult<String> deleteSysDict(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return service.delete(deleteDTO)
+        ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
+        : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+  }
+
+  private ResponseResult<TkDeviceAccessInformationDTO> saveOrUpdate(
+      TkDeviceAccessInformationDTO dto) throws ThingsboardException {
+    dto.setTenantId(getCurrentUser().getCurrentTenantId());
+    TkDeviceAccessInformationDTO newDTO = service.saveOrUpdate(dto);
+    return ResponseResult.success(newDTO);
+  }
+}

@@ -134,6 +134,9 @@ public final class ModelConstants {
     /** 产品品类表 */
     public static final String TK_DEVICE_PROFILE_CATEGORY = "tk_device_profile_category";
 
+    /** 设备接入信息表 */
+    public static final String TK_DEVICE_ACCESS_INFORMATION = "tk_device_access_information";
+
     /** ZLMediaKit 流媒体表 */
     public static final String TK_MEDIA_SERVER_NAME = "tk_media_server";
 

@@ -131,6 +131,8 @@ public enum ErrorMessage {
   SIP_COMMAND_SEND_FAILED(400106,"sip命令下发失败"),
   NOT_BELONG_CURRENT_CUSTOMER(400107,"该数据不属于当前客户"),
   IMPORT_ERROR(400108,"请使用模板excel重新导入"),
+  INTRANET_ERROR(400109,"内网ip+端口不能重复，请重新输入"),
+  OUTER_NET_ERROR(400110,"外网ip+端口不能重复，请重新输入"),
   HAVE_NO_PERMISSION(500002,"没有修改权限"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置");
 

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+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.enums.TransportTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkDeviceAccessInformationDTO extends TenantDTO {
+
+    @ApiModelProperty(value = "内网ip")
+    @NotEmpty(
+            message = "内网ip不能为空或空字符串",
+            groups = {AddGroup.class})
+    private String intranetIp;
+
+    @ApiModelProperty(value = "内网端口")
+    @NotEmpty(
+            message = "内网端口不能为空或空字符串",
+            groups = {AddGroup.class})
+    private String intranetPort;
+
+    @ApiModelProperty(value = "外网IP")
+    @NotEmpty(
+            message = "外网IP不能为空或空字符串",
+            groups = {AddGroup.class})
+    private String outerNetIp;
+
+    @ApiModelProperty(value = "外网端口")
+    private String outerNetPort;
+
+    @ApiModelProperty(value = "设备接入协议")
+    private TransportTypeEnum deviceAgreement;
+
+    @ApiModelProperty(value = "sip扩展信息: serverId  服务器id serverRegion 服务器域  password 密码")
+    private JsonNode sipExtend;
+
+}

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.Table.TK_DEVICE_ACCESS_INFORMATION, autoResultMap = true)
+public class TkDeviceAccessInformationEntity extends TenantBaseEntity {
+
+    private static final long serialVersionUID = -5381101569947753244L;
+
+    /** 内网ip */
+    private String intranetIp;
+
+    /** 内网端口 */
+    private String intranetPort;
+
+    /** 外网IP */
+    private String outerNetIp;
+
+    /** 外网端口 */
+    private String outerNetPort;
+
+    /** 设备接入协议 */
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private TransportTypeEnum deviceAgreement;
+
+    /** sip扩展信息
+     * serverId  服务器id
+     * serverRegion 服务器域
+     * password 密码
+     * */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode sipExtend;
+
+
+
+}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.StringUtils;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccessInformationDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceAccessInformationEntity;
+import org.thingsboard.server.dao.yunteng.mapper.TkDeviceAccessInformationMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccessInformationService;
+
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class TkDeviceAccessInformationServiceImpl extends AbstractBaseService<TkDeviceAccessInformationMapper, TkDeviceAccessInformationEntity>
+        implements TkDeviceAccessInformationService {
+
+    @Override
+    public TkPageData<TkDeviceAccessInformationDTO> page(Map<String, Object> queryMap) {
+        String intranetIp = queryMap.get("intranetIp") != null ? String.valueOf(queryMap.get("intranetIp")) : null;
+        String intranetPort = queryMap.get("intranetPort") != null ? String.valueOf(queryMap.get("intranetPort")) : null;
+        String outerNetIp = queryMap.get("outerNetIp") != null ? String.valueOf(queryMap.get("outerNetIp")) : null;
+        String outerNetPort = queryMap.get("outerNetPort") != null ? String.valueOf(queryMap.get("outerNetPort")) : null;
+        String deviceAgreement = queryMap.get("deviceAgreement") != null ? String.valueOf(queryMap.get("deviceAgreement")) : null;
+        IPage<TkDeviceAccessInformationEntity> iPage =
+                baseMapper.selectPage(
+                        getPage(queryMap, "create_time", false),
+                        new QueryWrapper<TkDeviceAccessInformationEntity>()
+                                .lambda()
+                                .like(
+                                        intranetIp != null,
+                                        TkDeviceAccessInformationEntity::getIntranetIp,intranetIp)
+                                .eq(
+                                        intranetPort != null,
+                                        TkDeviceAccessInformationEntity::getIntranetPort,intranetPort)
+                                .like(
+                                        outerNetIp != null,
+                                        TkDeviceAccessInformationEntity::getOuterNetIp,outerNetIp)
+                                .eq(
+                                        outerNetPort != null,
+                                        TkDeviceAccessInformationEntity::getOuterNetPort,outerNetPort)
+                                .eq(
+                                        deviceAgreement != null,
+                                        TkDeviceAccessInformationEntity::getDeviceAgreement,deviceAgreement)
+                                );
+        return getPageData(iPage, TkDeviceAccessInformationDTO.class);
+    }
+
+    @Override
+    public TkDeviceAccessInformationDTO saveOrUpdate(TkDeviceAccessInformationDTO dto ) {
+        //内网重复校验
+        TkDeviceAccessInformationEntity intranet = baseMapper.selectOne(new LambdaQueryWrapper<TkDeviceAccessInformationEntity>()
+                .eq(TkDeviceAccessInformationEntity::getIntranetIp, dto.getIntranetIp())
+                .eq(TkDeviceAccessInformationEntity::getIntranetPort,dto.getIntranetPort()));
+        if(intranet!=null&&(StringUtils.isEmpty(dto.getId()) || !intranet.getId().equals(dto.getId()))){
+            throw new TkDataValidationException(ErrorMessage.INTRANET_ERROR.getMessage());
+        }
+        //外网重复校验
+        TkDeviceAccessInformationEntity outerNet = baseMapper.selectOne(new LambdaQueryWrapper<TkDeviceAccessInformationEntity>()
+                .eq(TkDeviceAccessInformationEntity::getOuterNetIp, dto.getOuterNetIp())
+                .eq(TkDeviceAccessInformationEntity::getOuterNetPort,dto.getOuterNetPort()));
+        if(outerNet!=null&&(StringUtils.isEmpty(dto.getId()) || !outerNet.getId().equals(dto.getId()))){
+            throw new TkDataValidationException(ErrorMessage.OUTER_NET_ERROR.getMessage());
+        }
+        LambdaQueryWrapper<TkDeviceAccessInformationEntity> filter = new QueryWrapper<TkDeviceAccessInformationEntity>().lambda()
+                .eq(TkDeviceAccessInformationEntity::getId, dto.getId());
+        TkDeviceAccessInformationEntity old = baseMapper.selectOne(filter);
+        TkDeviceAccessInformationEntity newData = dto.getEntity(TkDeviceAccessInformationEntity.class);
+       if (old == null) {
+            baseMapper.insert(newData);
+        }else {
+            baseMapper.update(newData, filter);
+        }
+        return dto;
+    }
+
+    @Override
+    @Transactional
+    public boolean delete(DeleteDTO dto) {
+        int result =
+                baseMapper.delete(
+                        new LambdaQueryWrapper<TkDeviceAccessInformationEntity>()
+                                .eq(TkDeviceAccessInformationEntity::getTenantId, dto.getTenantId())
+                                .in(TkDeviceAccessInformationEntity::getId, dto.getIds()));
+        if (result > FastIotConstants.MagicNumber.ZERO && result != dto.getIds().size()) {
+            throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+        }
+        return result > FastIotConstants.MagicNumber.ZERO;
+    }
+}

+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.TkDeviceAccessInformationEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileCategoryEntity;
+
+@Mapper
+public interface TkDeviceAccessInformationMapper extends BaseMapper<TkDeviceAccessInformationEntity> {
+
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccessInformationDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+
+import java.util.Map;
+
+public interface TkDeviceAccessInformationService {
+
+    TkPageData<TkDeviceAccessInformationDTO> page(Map<String, Object> queryMap);
+
+    TkDeviceAccessInformationDTO saveOrUpdate(TkDeviceAccessInformationDTO sysDictDTO);
+
+    boolean delete(DeleteDTO dto);
+
+}