Browse Source

1、新增讯飞API key 管理模块
2、设备分配回显

lihao16 6 months ago
parent
commit
45d77b5cb7
17 changed files with 1161 additions and 4 deletions
  1. 12 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/controller/SmsbDeviceChatKeyController.java
  2. 105 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/controller/SmsbDeviceXfApiController.java
  3. 77 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/SmsbDeviceXfApi.java
  4. 80 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/bo/SmsbDeviceXfApiBo.java
  5. 101 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/vo/SmsbDeviceXfApiVo.java
  6. 15 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/mapper/SmsbDeviceXfApiMapper.java
  7. 7 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/service/ISmsbDeviceChatKeyService.java
  8. 68 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/service/ISmsbDeviceXfApiService.java
  9. 12 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDeviceChatKeyServiceImpl.java
  10. 143 0
      smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDeviceXfApiServiceImpl.java
  11. 7 0
      smsb-modules/smsb-device/src/main/resources/mapper/device/SmsbDeviceXfApiMapper.xml
  12. 1 1
      smsb-modules/smsb-source/src/main/java/com/inspur/source/controller/SmsbFrontController.java
  13. 7 0
      smsb-plus-ui/src/api/smsb/device/chat_api.ts
  14. 63 0
      smsb-plus-ui/src/api/smsb/device/xf_api.ts
  15. 161 0
      smsb-plus-ui/src/api/smsb/device/xf_api_type.ts
  16. 10 3
      smsb-plus-ui/src/views/smsb/chatKey/index.vue
  17. 292 0
      smsb-plus-ui/src/views/smsb/xfApi/index.vue

+ 12 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/controller/SmsbDeviceChatKeyController.java

@@ -69,6 +69,18 @@ public class SmsbDeviceChatKeyController extends BaseController {
         return R.ok(smsbDeviceChatKeyService.queryById(id));
     }
 
+    /**
+     * 获取chat API KEY管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("device:chatKey:query")
+    @GetMapping("/getRel/{id}")
+    public R<List<Long>> getRelDeviceIds(@NotNull(message = "主键不能为空")
+                                          @PathVariable Long id) {
+        return R.ok(smsbDeviceChatKeyService.getRelDeviceIds(id));
+    }
+
     /**
      * 新增chat API KEY管理
      */

+ 105 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/controller/SmsbDeviceXfApiController.java

@@ -0,0 +1,105 @@
+package com.inspur.device.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import com.inspur.device.domain.vo.SmsbDeviceXfApiVo;
+import com.inspur.device.domain.bo.SmsbDeviceXfApiBo;
+import com.inspur.device.service.ISmsbDeviceXfApiService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 讯飞API
+ *
+ * @author Hao Li
+ * @date 2025-05-13
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/smsb/device/xfApi")
+public class SmsbDeviceXfApiController extends BaseController {
+
+    private final ISmsbDeviceXfApiService smsbDeviceXfApiService;
+
+    /**
+     * 查询讯飞API列表
+     */
+    @SaCheckPermission("device:xfApi:list")
+    @GetMapping("/list")
+    public TableDataInfo<SmsbDeviceXfApiVo> list(SmsbDeviceXfApiBo bo, PageQuery pageQuery) {
+        return smsbDeviceXfApiService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出讯飞API列表
+     */
+    @SaCheckPermission("device:xfApi:export")
+    @Log(title = "讯飞API", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SmsbDeviceXfApiBo bo, HttpServletResponse response) {
+        List<SmsbDeviceXfApiVo> list = smsbDeviceXfApiService.queryList(bo);
+        ExcelUtil.exportExcel(list, "讯飞API", SmsbDeviceXfApiVo.class, response);
+    }
+
+    /**
+     * 获取讯飞API详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("device:xfApi:query")
+    @GetMapping("/{id}")
+    public R<SmsbDeviceXfApiVo> getInfo(@NotNull(message = "主键不能为空")
+                                        @PathVariable Long id) {
+        return R.ok(smsbDeviceXfApiService.queryById(id));
+    }
+
+    /**
+     * 新增讯飞API
+     */
+    @SaCheckPermission("device:xfApi:add")
+    @Log(title = "讯飞API", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SmsbDeviceXfApiBo bo) {
+        return toAjax(smsbDeviceXfApiService.insertByBo(bo));
+    }
+
+    /**
+     * 修改讯飞API
+     */
+    @SaCheckPermission("device:xfApi:edit")
+    @Log(title = "讯飞API", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SmsbDeviceXfApiBo bo) {
+        return toAjax(smsbDeviceXfApiService.updateByBo(bo));
+    }
+
+    /**
+     * 删除讯飞API
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("device:xfApi:remove")
+    @Log(title = "讯飞API", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(smsbDeviceXfApiService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 77 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/SmsbDeviceXfApi.java

@@ -0,0 +1,77 @@
+package com.inspur.device.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 讯飞API对象 smsb_device_xf_api
+ *
+ * @author Hao Li
+ * @date 2025-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("smsb_device_xf_api")
+public class SmsbDeviceXfApi extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * APP ID
+     */
+    private String appId;
+
+    /**
+     * API SECRET
+     */
+    private String apiSecret;
+
+    /**
+     * API KEY
+     */
+    private String apiKey;
+
+    /**
+     * RAASRAPIKEY
+     */
+    private String raasrApiKey;
+
+    /**
+     * RTASRAPIKEY
+     */
+    private String rtasrApiKey;
+
+    /**
+     * 状态 0-否 1-是
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+
+}

+ 80 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/bo/SmsbDeviceXfApiBo.java

@@ -0,0 +1,80 @@
+package com.inspur.device.domain.bo;
+
+import com.inspur.device.domain.SmsbDeviceXfApi;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 讯飞API业务对象 smsb_device_xf_api
+ *
+ * @author Hao Li
+ * @date 2025-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SmsbDeviceXfApi.class, reverseConvertGenerate = false)
+public class SmsbDeviceXfApiBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * APP ID
+     */
+    @NotBlank(message = "APP ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String appId;
+
+    /**
+     * API SECRET
+     */
+    @NotBlank(message = "API SECRET不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String apiSecret;
+
+    /**
+     * API KEY
+     */
+    @NotBlank(message = "API KEY不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String apiKey;
+
+    /**
+     * RAASRAPIKEY
+     */
+    @NotBlank(message = "RAASRAPIKEY不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String raasrApiKey;
+
+    /**
+     * RTASRAPIKEY
+     */
+    @NotBlank(message = "RTASRAPIKEY不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String rtasrApiKey;
+
+    /**
+     * 状态 0-否 1-是
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+
+}

+ 101 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/vo/SmsbDeviceXfApiVo.java

@@ -0,0 +1,101 @@
+package com.inspur.device.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.inspur.device.domain.SmsbDeviceXfApi;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 讯飞API视图对象 smsb_device_xf_api
+ *
+ * @author Hao Li
+ * @date 2025-05-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SmsbDeviceXfApi.class)
+public class SmsbDeviceXfApiVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * APP ID
+     */
+    @ExcelProperty(value = "APP ID")
+    private String appId;
+
+    /**
+     * API SECRET
+     */
+    @ExcelProperty(value = "API SECRET")
+    private String apiSecret;
+
+    /**
+     * API KEY
+     */
+    @ExcelProperty(value = "API KEY")
+    private String apiKey;
+
+    /**
+     * RAASRAPIKEY
+     */
+    @ExcelProperty(value = "RAASRAPIKEY")
+    private String raasrApiKey;
+
+    /**
+     * RTASRAPIKEY
+     */
+    @ExcelProperty(value = "RTASRAPIKEY")
+    private String rtasrApiKey;
+
+    /**
+     * 状态 0-否 1-是
+     */
+    @ExcelProperty(value = "状态 0-否 1-是")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private String updateUser;
+
+
+}

+ 15 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/mapper/SmsbDeviceXfApiMapper.java

@@ -0,0 +1,15 @@
+package com.inspur.device.mapper;
+
+import com.inspur.device.domain.SmsbDeviceXfApi;
+import com.inspur.device.domain.vo.SmsbDeviceXfApiVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 讯飞APIMapper接口
+ *
+ * @author Hao Li
+ * @date 2025-05-13
+ */
+public interface SmsbDeviceXfApiMapper extends BaseMapperPlus<SmsbDeviceXfApi, SmsbDeviceXfApiVo> {
+
+}

+ 7 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/service/ISmsbDeviceChatKeyService.java

@@ -72,4 +72,11 @@ public interface ISmsbDeviceChatKeyService {
      * @return
      */
     Boolean insertDeviceRel(SmsbDeviceChatKeyBo bo);
+
+    /**
+     * 获取关联设备IDS
+     * @param id
+     * @return
+     */
+    List<Long> getRelDeviceIds(Long id);
 }

+ 68 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/service/ISmsbDeviceXfApiService.java

@@ -0,0 +1,68 @@
+package com.inspur.device.service;
+
+import com.inspur.device.domain.vo.SmsbDeviceXfApiVo;
+import com.inspur.device.domain.bo.SmsbDeviceXfApiBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 讯飞APIService接口
+ *
+ * @author Hao Li
+ * @date 2025-05-13
+ */
+public interface ISmsbDeviceXfApiService {
+
+    /**
+     * 查询讯飞API
+     *
+     * @param id 主键
+     * @return 讯飞API
+     */
+    SmsbDeviceXfApiVo queryById(Long id);
+
+    /**
+     * 分页查询讯飞API列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 讯飞API分页列表
+     */
+    TableDataInfo<SmsbDeviceXfApiVo> queryPageList(SmsbDeviceXfApiBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的讯飞API列表
+     *
+     * @param bo 查询条件
+     * @return 讯飞API列表
+     */
+    List<SmsbDeviceXfApiVo> queryList(SmsbDeviceXfApiBo bo);
+
+    /**
+     * 新增讯飞API
+     *
+     * @param bo 讯飞API
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SmsbDeviceXfApiBo bo);
+
+    /**
+     * 修改讯飞API
+     *
+     * @param bo 讯飞API
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SmsbDeviceXfApiBo bo);
+
+    /**
+     * 校验并批量删除讯飞API信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 12 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDeviceChatKeyServiceImpl.java

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * chat API KEY管理Service业务层处理
@@ -158,4 +159,15 @@ public class SmsbDeviceChatKeyServiceImpl implements ISmsbDeviceChatKeyService {
         smsbDeviceChatKeyRelMapper.insertBatch(chatKeyRelList);
         return true;
     }
+
+    @Override
+    public List<Long> getRelDeviceIds(Long id) {
+        List<Long> deviceIds = new ArrayList<>();
+        List<SmsbDeviceChatKeyRel> relList = smsbDeviceChatKeyRelMapper.selectList(Wrappers.lambdaQuery(SmsbDeviceChatKeyRel.class).eq(SmsbDeviceChatKeyRel::getKeyId, id));
+        if (CollectionUtil.isEmpty(relList)) {
+            return deviceIds;
+        }
+        deviceIds = relList.stream().map(SmsbDeviceChatKeyRel::getDeviceId).collect(Collectors.toList());
+        return deviceIds;
+    }
 }

+ 143 - 0
smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDeviceXfApiServiceImpl.java

@@ -0,0 +1,143 @@
+package com.inspur.device.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.stereotype.Service;
+import com.inspur.device.domain.bo.SmsbDeviceXfApiBo;
+import com.inspur.device.domain.vo.SmsbDeviceXfApiVo;
+import com.inspur.device.domain.SmsbDeviceXfApi;
+import com.inspur.device.mapper.SmsbDeviceXfApiMapper;
+import com.inspur.device.service.ISmsbDeviceXfApiService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 讯飞APIService业务层处理
+ *
+ * @author Hao Li
+ * @date 2025-05-13
+ */
+@RequiredArgsConstructor
+@Service
+public class SmsbDeviceXfApiServiceImpl implements ISmsbDeviceXfApiService {
+
+    private final SmsbDeviceXfApiMapper baseMapper;
+
+    /**
+     * 查询讯飞API
+     *
+     * @param id 主键
+     * @return 讯飞API
+     */
+    @Override
+    public SmsbDeviceXfApiVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询讯飞API列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 讯飞API分页列表
+     */
+    @Override
+    public TableDataInfo<SmsbDeviceXfApiVo> queryPageList(SmsbDeviceXfApiBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SmsbDeviceXfApi> lqw = buildQueryWrapper(bo);
+        Page<SmsbDeviceXfApiVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的讯飞API列表
+     *
+     * @param bo 查询条件
+     * @return 讯飞API列表
+     */
+    @Override
+    public List<SmsbDeviceXfApiVo> queryList(SmsbDeviceXfApiBo bo) {
+        LambdaQueryWrapper<SmsbDeviceXfApi> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SmsbDeviceXfApi> buildQueryWrapper(SmsbDeviceXfApiBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SmsbDeviceXfApi> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), SmsbDeviceXfApi::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getAppId()), SmsbDeviceXfApi::getAppId, bo.getAppId());
+        lqw.eq(StringUtils.isNotBlank(bo.getApiSecret()), SmsbDeviceXfApi::getApiSecret, bo.getApiSecret());
+        lqw.eq(StringUtils.isNotBlank(bo.getApiKey()), SmsbDeviceXfApi::getApiKey, bo.getApiKey());
+        lqw.eq(StringUtils.isNotBlank(bo.getRaasrApiKey()), SmsbDeviceXfApi::getRaasrApiKey, bo.getRaasrApiKey());
+        lqw.eq(StringUtils.isNotBlank(bo.getRtasrApiKey()), SmsbDeviceXfApi::getRtasrApiKey, bo.getRtasrApiKey());
+        lqw.eq(bo.getStatus() != null, SmsbDeviceXfApi::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateUser()), SmsbDeviceXfApi::getCreateUser, bo.getCreateUser());
+        lqw.eq(StringUtils.isNotBlank(bo.getUpdateUser()), SmsbDeviceXfApi::getUpdateUser, bo.getUpdateUser());
+        return lqw;
+    }
+
+    /**
+     * 新增讯飞API
+     *
+     * @param bo 讯飞API
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SmsbDeviceXfApiBo bo) {
+        SmsbDeviceXfApi add = MapstructUtils.convert(bo, SmsbDeviceXfApi.class);
+        // validEntityBeforeSave(add);
+        String loginNickName = LoginHelper.getLoginUser().getNickname();
+        add.setCreateUser(loginNickName);
+        add.setUpdateUser(loginNickName);
+        add.setStatus(0);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改讯飞API
+     *
+     * @param bo 讯飞API
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SmsbDeviceXfApiBo bo) {
+        SmsbDeviceXfApi update = MapstructUtils.convert(bo, SmsbDeviceXfApi.class);
+        // validEntityBeforeSave(update);
+        update.setUpdateUser(LoginHelper.getLoginUser().getNickname());
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SmsbDeviceXfApi entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除讯飞API信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

+ 7 - 0
smsb-modules/smsb-device/src/main/resources/mapper/device/SmsbDeviceXfApiMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.inspur.device.mapper.SmsbDeviceXfApiMapper">
+
+</mapper>

+ 1 - 1
smsb-modules/smsb-source/src/main/java/com/inspur/source/controller/SmsbFrontController.java

@@ -84,7 +84,7 @@ public class SmsbFrontController {
      * @param identifier 主键
      */
     @SaIgnore
-    @GetMapping("/screenshot/upload")
+    @PostMapping("/screenshot/upload")
     public R<Void> screenshotUpload(@RequestParam("identifier") String identifier,@RequestParam("timestamp") Long timestamp,
                                                @RequestBody MultipartFile file) {
         return smsbDeviceService.screenshotUpload(identifier,timestamp, file);

+ 7 - 0
smsb-plus-ui/src/api/smsb/device/chat_api.ts

@@ -16,6 +16,13 @@ export const listDeviceChatKey = (query?: DeviceChatKeyQuery): AxiosPromise<Devi
   });
 };
 
+export const getDeviceChatKeyRel = (id : string | number): AxiosPromise<DeviceChatKeyVO[]> => {
+  return request({
+    url: '/smsb/device/chatKey/getRel/' + id,
+    method: 'get'
+  });
+}
+
 /**
  * 查询chat API KEY管理详细
  * @param id

+ 63 - 0
smsb-plus-ui/src/api/smsb/device/xf_api.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceXfApiVO, DeviceXfApiForm, DeviceXfApiQuery } from '@/api/smsb/device/xf_api_type';
+
+/**
+ * 查询讯飞API列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceXfApi = (query?: DeviceXfApiQuery): AxiosPromise<DeviceXfApiVO[]> => {
+  return request({
+    url: '/smsb/device/xfApi/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询讯飞API详细
+ * @param id
+ */
+export const getDeviceXfApi = (id: string | number): AxiosPromise<DeviceXfApiVO> => {
+  return request({
+    url: '/smsb/device/xfApi/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增讯飞API
+ * @param data
+ */
+export const addDeviceXfApi = (data: DeviceXfApiForm) => {
+  return request({
+    url: '/smsb/device/xfApi',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改讯飞API
+ * @param data
+ */
+export const updateDeviceXfApi = (data: DeviceXfApiForm) => {
+  return request({
+    url: '/smsb/device/xfApi',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除讯飞API
+ * @param id
+ */
+export const delDeviceXfApi = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/smsb/device/xfApi/' + id,
+    method: 'delete'
+  });
+};

+ 161 - 0
smsb-plus-ui/src/api/smsb/device/xf_api_type.ts

@@ -0,0 +1,161 @@
+export interface DeviceXfApiVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 名称
+   */
+  name: string;
+
+  /**
+   * APP ID
+   */
+  appId: string | number;
+
+  /**
+   * API SECRET
+   */
+  apiSecret: string;
+
+  /**
+   * API KEY
+   */
+  apiKey: string;
+
+  /**
+   * RAASRAPIKEY
+   */
+  raasrApiKey: string;
+
+  /**
+   * RTASRAPIKEY
+   */
+  rtasrApiKey: string;
+
+  /**
+   * 状态 0-否 1-是
+   */
+  status: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 创建人
+   */
+  createUser: string;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+  /**
+   * 更新人
+   */
+  updateUser: string;
+
+}
+
+export interface DeviceXfApiForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 名称
+   */
+  name?: string;
+
+  /**
+   * APP ID
+   */
+  appId?: string | number;
+
+  /**
+   * API SECRET
+   */
+  apiSecret?: string;
+
+  /**
+   * API KEY
+   */
+  apiKey?: string;
+
+  /**
+   * RAASRAPIKEY
+   */
+  raasrApiKey?: string;
+
+  /**
+   * RTASRAPIKEY
+   */
+  rtasrApiKey?: string;
+
+  /**
+   * 状态 0-否 1-是
+   */
+  status?: number;
+
+}
+
+export interface DeviceXfApiQuery extends PageQuery {
+
+  /**
+   * 名称
+   */
+  name?: string;
+
+  /**
+   * APP ID
+   */
+  appId?: string | number;
+
+  /**
+   * API SECRET
+   */
+  apiSecret?: string;
+
+  /**
+   * API KEY
+   */
+  apiKey?: string;
+
+  /**
+   * RAASRAPIKEY
+   */
+  raasrApiKey?: string;
+
+  /**
+   * RTASRAPIKEY
+   */
+  rtasrApiKey?: string;
+
+  /**
+   * 状态 0-否 1-是
+   */
+  status?: number;
+
+  /**
+   * 创建人
+   */
+  createUser?: string;
+
+  /**
+   * 更新人
+   */
+  updateUser?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

+ 10 - 3
smsb-plus-ui/src/views/smsb/chatKey/index.vue

@@ -105,7 +105,7 @@
 import {
   addDeviceChatKey, addDeviceChatKeyRel,
   delDeviceChatKey,
-  getDeviceChatKey,
+  getDeviceChatKey, getDeviceChatKeyRel,
   listDeviceChatKey,
   updateDeviceChatKey
 } from '@/api/smsb/device/chat_api';
@@ -220,11 +220,13 @@ const handleSelectionChange = (selection: DeviceChatKeyVO[]) => {
   multiple.value = !selection.length;
 }
 const handleRelDevice = async (row: DeviceChatKeyVO) => {
-  keyId.value = row.id;
-  deviceIds.value = [];
   dialog_device.visible = true;
   dialog_device.title = "分配设备";
+  keyId.value = row.id;
+  // deviceIds.value = [];
   await getDeviceList();
+  await getRelDeviceIds();
+
 }
 
 const getDeviceList = async () => {
@@ -234,6 +236,11 @@ const getDeviceList = async () => {
   loading.value = false;
 };
 
+const getRelDeviceIds = async () => {
+  const res = await getDeviceChatKeyRel(keyId.value);
+  deviceIds.value = res.data;
+}
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();

+ 292 - 0
smsb-plus-ui/src/views/smsb/xfApi/index.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="API名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery"/>
+            </el-form-item>
+            <el-form-item label="APP ID" prop="appId">
+              <el-input v-model="queryParams.appId" placeholder="请输入APP ID" clearable @keyup.enter="handleQuery"/>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['device:xfApi:add']">新增
+              </el-button>
+              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                         v-hasPermi="['device:xfApi:edit']">修改
+              </el-button>
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                         v-hasPermi="['device:xfApi:remove']">删除
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+
+      <div class="table-content">
+        <el-table v-loading="loading" :data="deviceXfApiList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="ID" align="left" prop="id" v-if="true" width="175"/>
+          <el-table-column label="API名称" align="left" prop="name"/>
+          <el-table-column label="APP ID" align="left" prop="appId" width="90" :show-overflow-tooltip="true"/>
+          <el-table-column label="API SECRET" align="left" prop="apiSecret" width="150" :show-overflow-tooltip="true"/>
+          <el-table-column label="API KEY" align="left" prop="apiKey" width="150" :show-overflow-tooltip="true"/>
+          <el-table-column label="RAASRAPIKEY" align="left" prop="raasrApiKey" width="150" :show-overflow-tooltip="true"/>
+          <el-table-column label="RTASRAPIKEY" align="left" prop="rtasrApiKey" width="150" :show-overflow-tooltip="true"/>
+          <el-table-column label="状态" align="center" prop="status" width="65">
+            <template #default="scope">
+              <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0"></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="left" prop="createTime" width="155"/>
+          <el-table-column label="创建人" align="left" prop="createUser" width="100" :show-overflow-tooltip="true"/>
+          <el-table-column label="更新时间" align="left" prop="updateTime" width="155"/>
+          <el-table-column label="更新人" align="left" prop="updateUser" width="100" :show-overflow-tooltip="true"/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+            <template #default="scope">
+              <el-tooltip content="修改" placement="top">
+                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                           v-hasPermi="['device:xfApi:edit']"></el-button>
+              </el-tooltip>
+              <el-tooltip content="删除" placement="top">
+                <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['device:xfApi:remove']"></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                  v-model:limit="queryParams.pageSize" @pagination="getList"/>
+    </el-card>
+    <!-- 添加或修改讯飞API对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
+      <el-form ref="deviceXfApiFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="API名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="APP ID" prop="appId">
+              <el-input v-model="form.appId" placeholder="请输入APP ID"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="API SECRET" prop="apiSecret">
+              <el-input v-model="form.apiSecret" placeholder="请输入API SECRET"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="API KEY" prop="apiKey">
+              <el-input v-model="form.apiKey" placeholder="请输入API KEY"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="RAASRAPIKEY" prop="raasrApiKey">
+              <el-input v-model="form.raasrApiKey" placeholder="请输入RAASRAPIKEY"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="RTASRAPIKEY" prop="rtasrApiKey">
+              <el-input v-model="form.rtasrApiKey" placeholder="请输入RTASRAPIKEY"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DeviceXfApi" lang="ts">
+import {
+  addDeviceXfApi,
+  delDeviceXfApi,
+  getDeviceXfApi,
+  listDeviceXfApi,
+  updateDeviceXfApi
+} from '@/api/smsb/device/xf_api';
+import {DeviceXfApiForm, DeviceXfApiQuery, DeviceXfApiVO} from '@/api/smsb/device/xf_api_type';
+
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+
+const deviceXfApiList = ref<DeviceXfApiVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const deviceXfApiFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceXfApiForm = {
+  id: undefined,
+  name: undefined,
+  appId: undefined,
+  apiSecret: undefined,
+  apiKey: undefined,
+  raasrApiKey: undefined,
+  rtasrApiKey: undefined,
+  status: undefined,
+}
+const data = reactive<PageData<DeviceXfApiForm, DeviceXfApiQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: undefined,
+    appId: undefined,
+    apiSecret: undefined,
+    apiKey: undefined,
+    raasrApiKey: undefined,
+    rtasrApiKey: undefined,
+    status: undefined,
+    createUser: undefined,
+    updateUser: undefined,
+    params: {}
+  },
+  rules: {
+    name: [
+      {required: true, message: "名称不能为空", trigger: "blur"}
+    ],
+    appId: [
+      {required: true, message: "APP ID不能为空", trigger: "blur"}
+    ],
+    apiSecret: [
+      {required: true, message: "API SECRET不能为空", trigger: "blur"}
+    ],
+    apiKey: [
+      {required: true, message: "API KEY不能为空", trigger: "blur"}
+    ],
+    raasrApiKey: [
+      {required: true, message: "RAASRAPIKEY不能为空", trigger: "blur"}
+    ],
+    rtasrApiKey: [
+      {required: true, message: "RTASRAPIKEY不能为空", trigger: "blur"}
+    ],
+  }
+});
+
+const {queryParams, form, rules} = toRefs(data);
+
+/** 查询讯飞API列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceXfApi(queryParams.value);
+  deviceXfApiList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  deviceXfApiFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceXfApiVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加讯飞API";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceXfApiVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceXfApi(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改讯飞API";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceXfApiFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceXfApi(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addDeviceXfApi(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceXfApiVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除讯飞API编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+  await delDeviceXfApi(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('device/deviceXfApi/export', {
+    ...queryParams.value
+  }, `deviceXfApi_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>