Merge remote-tracking branch 'origin/main'

flx-ai/src/main/java/com/pjilisense/flxai/base/service/CrudService.java

@@ -31,6 +31,6 @@ public interface CrudService<T, D> extends BaseService<T> {
 
     void update(D dto);
 
-    void delete(Serializable[] ids);
+    void delete(java.io.Serializable[] ids);
 
 }

flx-ai/src/main/java/com/pjilisense/flxai/base/service/impl/CrudServiceImpl.java

@@ -75,7 +75,7 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T, D> extends Bas
     }
 
     @Override
-    public void delete(Serializable[] ids) {
+    public void delete(java.io.Serializable[] ids) {
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 }

flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiAssistantController.java

@@ -92,4 +92,13 @@ public class AppAiAssistantController {
         return new Result();
     }
 
+    @GetMapping("deleteByIdentifier")
+    @ApiOperation("删除")
+    public Result deleteByIdentifier(@RequestParam("userid") String userid, @RequestParam("identifier") String identifier){
+        //效验数据
+        appAiAssistantService.deleteByIdentifier(userid,identifier);
+
+        return new Result();
+    }
+
 }

flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiModelController.java

@@ -0,0 +1,91 @@
+package com.pjilisense.flxai.controller;
+
+import com.pjilisense.flxai.base.constant.Constant;
+import com.pjilisense.flxai.page.PageData;
+import com.pjilisense.flxai.utils.Result;
+import com.pjilisense.flxai.dto.AppAiModelDTO;
+import com.pjilisense.flxai.service.AppAiModelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * AI模型表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@RestController
+@RequestMapping("robot/appaimodel")
+@Api(tags="AI模型表")
+public class AppAiModelController {
+
+    private static Logger logger = LoggerFactory.getLogger(AppAiModelController.class);
+
+    @Autowired
+    private AppAiModelService appAiModelService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="Integer", dataTypeClass =Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="Integer", dataTypeClass =Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String", dataTypeClass =String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String", dataTypeClass =String.class)
+    })
+    public Result<PageData<AppAiModelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<AppAiModelDTO> page = appAiModelService.page(params);
+
+        return new Result<PageData<AppAiModelDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    public Result<AppAiModelDTO> get(@PathVariable("id") Long id){
+        AppAiModelDTO data = appAiModelService.get(id);
+
+        return new Result<AppAiModelDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    public Result save(@RequestBody AppAiModelDTO dto){
+        //效验数据
+
+        appAiModelService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    public Result update(@RequestBody AppAiModelDTO dto){
+        //效验数据
+
+        appAiModelService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        appAiModelService.delete(ids);
+
+        return new Result();
+    }
+
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiPluginController.java

@@ -0,0 +1,91 @@
+package com.pjilisense.flxai.controller;
+
+import com.pjilisense.flxai.base.constant.Constant;
+import com.pjilisense.flxai.page.PageData;
+import com.pjilisense.flxai.utils.Result;
+import com.pjilisense.flxai.dto.AppAiPluginDTO;
+import com.pjilisense.flxai.service.AppAiPluginService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * AI插件表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@RestController
+@RequestMapping("robot/appaiplugin")
+@Api(tags="AI插件表")
+public class AppAiPluginController {
+
+    private static Logger logger = LoggerFactory.getLogger(AppAiPluginController.class);
+
+    @Autowired
+    private AppAiPluginService appAiPluginService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="Integer", dataTypeClass =Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="Integer", dataTypeClass =Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String", dataTypeClass =String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String", dataTypeClass =String.class)
+    })
+    public Result<PageData<AppAiPluginDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<AppAiPluginDTO> page = appAiPluginService.page(params);
+
+        return new Result<PageData<AppAiPluginDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    public Result<AppAiPluginDTO> get(@PathVariable("id") Long id){
+        AppAiPluginDTO data = appAiPluginService.get(id);
+
+        return new Result<AppAiPluginDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    public Result save(@RequestBody AppAiPluginDTO dto){
+        //效验数据
+
+        appAiPluginService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    public Result update(@RequestBody AppAiPluginDTO dto){
+        //效验数据
+
+        appAiPluginService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+
+        appAiPluginService.delete(ids);
+
+        return new Result();
+    }
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/dao/AppAiModelDao.java

@@ -0,0 +1,16 @@
+package com.pjilisense.flxai.dao;
+
+import com.pjilisense.flxai.base.dao.BaseDao;
+import com.pjilisense.flxai.entity.AppAiModelEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * AI模型表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Mapper
+public interface AppAiModelDao extends BaseDao<AppAiModelEntity> {
+	
+}

flx-ai/src/main/java/com/pjilisense/flxai/dao/AppAiPluginDao.java

@@ -0,0 +1,16 @@
+package com.pjilisense.flxai.dao;
+
+import com.pjilisense.flxai.base.dao.BaseDao;
+import com.pjilisense.flxai.entity.AppAiPluginEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * AI插件表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Mapper
+public interface AppAiPluginDao extends BaseDao<AppAiPluginEntity> {
+	
+}

flx-ai/src/main/java/com/pjilisense/flxai/dto/AppAiModelDTO.java

@@ -0,0 +1,71 @@
+package com.pjilisense.flxai.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * AI模型表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Data
+@ApiModel(value = "AI模型表")
+public class AppAiModelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private String id;
+
+	@ApiModelProperty(value = "标识")
+	private String identifier;
+
+	@ApiModelProperty(value = "提供者")
+	private String providers;
+
+	@ApiModelProperty(value = "转换")
+	private String conversations;
+
+	@ApiModelProperty(value = "likes")
+	private String likes;
+
+	@ApiModelProperty(value = "tokens")
+	private String tokens;
+
+	@ApiModelProperty(value = "描述")
+	private String description;
+
+	@ApiModelProperty(value = "名称")
+	private String displayname;
+
+	@ApiModelProperty(value = "是否允许")
+	private String enabled;
+
+	@ApiModelProperty(value = "MetaID")
+	private String metaId;
+
+	@ApiModelProperty(value = "meta tokens")
+	private String metaTokens;
+
+	@ApiModelProperty(value = "分类")
+	private String category;
+
+	@ApiModelProperty(value = "标题")
+	private String title;
+
+	@ApiModelProperty(value = "建议")
+	private String suggestions;
+
+	@ApiModelProperty(value = "创建时间")
+	private String createdAt;
+
+	@ApiModelProperty(value = "用户ID")
+	private String userid;
+
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/dto/AppAiPluginDTO.java

@@ -0,0 +1,65 @@
+package com.pjilisense.flxai.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * AI插件表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Data
+@ApiModel(value = "AI插件表")
+public class AppAiPluginDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private String id;
+
+	@ApiModelProperty(value = "作者")
+	private String author;
+
+	@ApiModelProperty(value = "创建时间")
+	private String createdAt;
+
+	@ApiModelProperty(value = "主页地址")
+	private String homepage;
+
+	@ApiModelProperty(value = "标识")
+	private String identifier;
+
+	@ApiModelProperty(value = "locale")
+	private String locale;
+
+	@ApiModelProperty(value = "manifest")
+	private String manifest;
+
+	@ApiModelProperty(value = "avatar")
+	private String avatar;
+
+	@ApiModelProperty(value = "标签")
+	private String tags;
+
+	@ApiModelProperty(value = "标题")
+	private String title;
+
+	@ApiModelProperty(value = "描述")
+	private String description;
+
+	@ApiModelProperty(value = "分类")
+	private String category;
+
+	@ApiModelProperty(value = "Version")
+	private String schemaVersion;
+
+	@ApiModelProperty(value = "用户ID")
+	private String userid;
+
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/entity/AppAiModelEntity.java

@@ -0,0 +1,82 @@
+package com.pjilisense.flxai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * AI模型表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Data
+@TableName("app_ai_model")
+public class AppAiModelEntity {
+
+    /**
+     * 主键
+     */
+	private String id;
+    /**
+     * 标识
+     */
+	private String identifier;
+    /**
+     * 提供者
+     */
+	private String providers;
+    /**
+     * 转换
+     */
+	private String conversations;
+    /**
+     * likes
+     */
+	private String likes;
+    /**
+     * tokens
+     */
+	private String tokens;
+    /**
+     * 描述
+     */
+	private String description;
+    /**
+     * 名称
+     */
+	private String displayname;
+    /**
+     * 是否允许
+     */
+	private String enabled;
+    /**
+     * MetaID
+     */
+	private String metaId;
+    /**
+     * meta tokens
+     */
+	private String metaTokens;
+    /**
+     * 分类
+     */
+	private String category;
+    /**
+     * 标题
+     */
+	private String title;
+    /**
+     * 建议
+     */
+	private String suggestions;
+    /**
+     * 创建时间
+     */
+	private String createdAt;
+    /**
+     * 用户ID
+     */
+	private String userid;
+}

flx-ai/src/main/java/com/pjilisense/flxai/entity/AppAiPluginEntity.java

@@ -0,0 +1,74 @@
+package com.pjilisense.flxai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * AI插件表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Data
+@TableName("app_ai_plugin")
+public class AppAiPluginEntity {
+
+    /**
+     * 主键
+     */
+	private String id;
+    /**
+     * 作者
+     */
+	private String author;
+    /**
+     * 创建时间
+     */
+	private String createdAt;
+    /**
+     * 主页地址
+     */
+	private String homepage;
+    /**
+     * 标识
+     */
+	private String identifier;
+    /**
+     * locale
+     */
+	private String locale;
+    /**
+     * manifest
+     */
+	private String manifest;
+    /**
+     * avatar
+     */
+	private String avatar;
+    /**
+     * 标签
+     */
+	private String tags;
+    /**
+     * 标题
+     */
+	private String title;
+    /**
+     * 描述
+     */
+	private String description;
+    /**
+     * 分类
+     */
+	private String category;
+    /**
+     * Version
+     */
+	private String schemaVersion;
+    /**
+     * 用户ID
+     */
+	private String userid;
+}

flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiAssistantService.java

@@ -16,4 +16,6 @@ import java.util.Map;
 public interface AppAiAssistantService extends CrudService<AppAiAssistantEntity, AppAiAssistantDTO> {
 
     List<Map<String, Object>> getAllAiTools(String userid);
+
+    int deleteByIdentifier(String userid,String identifier);
 }

flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiModelService.java

@@ -0,0 +1,15 @@
+package com.pjilisense.flxai.service;
+
+import com.pjilisense.flxai.base.service.CrudService;
+import com.pjilisense.flxai.dto.AppAiModelDTO;
+import com.pjilisense.flxai.entity.AppAiModelEntity;
+
+/**
+ * AI模型表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+public interface AppAiModelService extends CrudService<AppAiModelEntity, AppAiModelDTO> {
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiPluginService.java

@@ -0,0 +1,15 @@
+package com.pjilisense.flxai.service;
+
+import com.pjilisense.flxai.base.service.CrudService;
+import com.pjilisense.flxai.dto.AppAiPluginDTO;
+import com.pjilisense.flxai.entity.AppAiPluginEntity;
+
+/**
+ * AI插件表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+public interface AppAiPluginService extends CrudService<AppAiPluginEntity, AppAiPluginDTO> {
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiAssistantServiceImpl.java

@@ -72,4 +72,12 @@ public class AppAiAssistantServiceImpl extends CrudServiceImpl<AppAiAssistantDao
         }
         return retList;
     }
+
+    @Override
+    public int deleteByIdentifier(String userid,String identifier) {
+        QueryWrapper<AppAiAssistantEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StrUtil.isNotBlank(identifier), "identifier", identifier);
+        wrapper.eq(StrUtil.isNotBlank(userid), "userid", userid);
+        return baseDao.delete(wrapper);
+    }
 }

flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiModelServiceImpl.java

@@ -0,0 +1,34 @@
+package com.pjilisense.flxai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pjilisense.flxai.base.service.impl.CrudServiceImpl;
+import com.pjilisense.flxai.dao.AppAiModelDao;
+import com.pjilisense.flxai.dto.AppAiModelDTO;
+import com.pjilisense.flxai.entity.AppAiModelEntity;
+import com.pjilisense.flxai.service.AppAiModelService;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * AI模型表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Service
+public class AppAiModelServiceImpl extends CrudServiceImpl<AppAiModelDao, AppAiModelEntity, AppAiModelDTO> implements AppAiModelService {
+
+    @Override
+    public QueryWrapper<AppAiModelEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<AppAiModelEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StrUtil.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiPluginServiceImpl.java

@@ -0,0 +1,34 @@
+package com.pjilisense.flxai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pjilisense.flxai.base.service.impl.CrudServiceImpl;
+import com.pjilisense.flxai.dao.AppAiPluginDao;
+import com.pjilisense.flxai.dto.AppAiPluginDTO;
+import com.pjilisense.flxai.entity.AppAiPluginEntity;
+import com.pjilisense.flxai.service.AppAiPluginService;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * AI插件表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-20
+ */
+@Service
+public class AppAiPluginServiceImpl extends CrudServiceImpl<AppAiPluginDao, AppAiPluginEntity, AppAiPluginDTO> implements AppAiPluginService {
+
+    @Override
+    public QueryWrapper<AppAiPluginEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<AppAiPluginEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StrUtil.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}

flx-ai/src/main/resources/mapper/postgres/AppAiModelDao.xml

@@ -0,0 +1,26 @@
+<?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.pjilisense.flxai.dao.AppAiModelDao">
+
+    <resultMap type="com.pjilisense.flxai.entity.AppAiModelEntity" id="appAiModelMap">
+        <result property="id" column="id"/>
+        <result property="identifier" column="identifier"/>
+        <result property="providers" column="providers"/>
+        <result property="conversations" column="conversations"/>
+        <result property="likes" column="likes"/>
+        <result property="tokens" column="tokens"/>
+        <result property="description" column="description"/>
+        <result property="displayname" column="displayname"/>
+        <result property="enabled" column="enabled"/>
+        <result property="metaId" column="meta_id"/>
+        <result property="metaTokens" column="meta_tokens"/>
+        <result property="category" column="category"/>
+        <result property="title" column="title"/>
+        <result property="suggestions" column="suggestions"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="userid" column="userid"/>
+    </resultMap>
+
+
+</mapper>

flx-ai/src/main/resources/mapper/postgres/AppAiPluginDao.xml

@@ -0,0 +1,24 @@
+<?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.pjilisense.flxai.dao.AppAiPluginDao">
+
+    <resultMap type="com.pjilisense.flxai.entity.AppAiPluginEntity" id="appAiPluginMap">
+        <result property="id" column="id"/>
+        <result property="author" column="author"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="homepage" column="homepage"/>
+        <result property="identifier" column="identifier"/>
+        <result property="locale" column="locale"/>
+        <result property="manifest" column="manifest"/>
+        <result property="avatar" column="avatar"/>
+        <result property="tags" column="tags"/>
+        <result property="title" column="title"/>
+        <result property="description" column="description"/>
+        <result property="category" column="category"/>
+        <result property="schemaVersion" column="schema_version"/>
+        <result property="userid" column="userid"/>
+    </resultMap>
+
+
+</mapper>