整理代码并回退file修改

base-modules/service-ai/service-ai-biz/src/main/java/com/usky/ai/controller/web/AiChatController.java

@@ -14,6 +14,7 @@ import com.usky.ai.mapper.AiSessionMapper;
 import com.usky.ai.service.AiQuestion;
 import com.usky.ai.service.AiSession;
 import com.usky.ai.service.vo.AiStreamOutputVO;
+import com.usky.common.core.bean.ApiResult;
 import com.usky.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,11 +99,11 @@ public class AiChatController {
         // 获取当前用户的对话历史
         List<AiQuestion> conversationHistory = aiQuestionMapper.findByUserIdAndSessionId(sessionId, userId);
 
-        // 只保留最近的几轮对话
-        int historyLimit = Limit;
-        if (conversationHistory.size() > historyLimit) {
-            conversationHistory = conversationHistory.subList(conversationHistory.size() - historyLimit, conversationHistory.size());
-        }
+//        // 只保留最近的几轮对话
+//        int historyLimit = Limit;
+//        if (conversationHistory.size() > historyLimit) {
+//            conversationHistory = conversationHistory.subList(conversationHistory.size() - historyLimit, conversationHistory.size());
+//        }
 
         // 构建对话历史消息
         List<Message> messages = conversationHistory.stream()
@@ -163,6 +164,7 @@ public class AiChatController {
 
                                 // 写入输出流
                                 outputStream.write(("data: " + newString + "\n\n").getBytes(StandardCharsets.UTF_8));
+//                                outputStream.write(ApiResult.success(newString).toString().getBytes(StandardCharsets.UTF_8));
                                 outputStream.flush(); // 确保立即发送到前端
 
                                 // 累加到完整回答内容中
@@ -234,10 +236,10 @@ public class AiChatController {
         List<AiQuestion> conversationHistory = aiQuestionMapper.findByUserIdAndSessionId(sessionId, userId);
 
         // 只保留最近的几轮对话
-        int historyLimit = Limit;
-        if (conversationHistory.size() > historyLimit) {
-            conversationHistory = conversationHistory.subList(conversationHistory.size() - historyLimit, conversationHistory.size());
-        }
+//        int historyLimit = Limit;
+//        if (conversationHistory.size() > historyLimit) {
+//            conversationHistory = conversationHistory.subList(conversationHistory.size() - historyLimit, conversationHistory.size());
+//        }
 
         // 构建对话历史消息
         List<Message> messages = conversationHistory.stream()

base-modules/service-ai/service-ai-biz/src/main/java/com/usky/ai/controller/web/AiSessionController.java

@@ -5,6 +5,7 @@ import com.usky.ai.mapper.AiSessionMapper;
 import com.usky.ai.service.AiQuestion;
 import com.usky.ai.service.AiQuestionItem;
 import com.usky.ai.service.AiSession;
+import com.usky.common.core.bean.ApiResult;
 import com.usky.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,6 @@ public class AiSessionController {
             session.setItemList(itemList);
         }
 
-        return sessions;
+        return ApiResult.success(sessions).getData();
     }
 }

base-modules/service-file/src/main/java/com/ruoyi/file/controller/UploadFileController.java

@@ -1,37 +0,0 @@
-package com.ruoyi.file.controller;
-
-import com.ruoyi.file.service.UploadFileService;
-import com.ruoyi.file.utils.ResponseResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-
-@Api(tags = "附件管理")
-@RestController
-@RequestMapping("/attach")
-public class UploadFileController {
-
-    @Autowired
-    private UploadFileService uploadFileService;
-
-    @PostMapping("/upload")
-    @ApiOperation(value="上传文件")
-    public ResponseResult upload(@RequestPart("file") MultipartFile file,
-                                 @RequestParam(value = "bussinessId") @Valid @NotBlank(message = "业务id不能为空") String bussinessId) throws Exception {
-        return uploadFileService.upload(file, bussinessId);
-    }
-
-    @GetMapping("/download")
-    @ApiOperation(value = "下载文件")
-    public void download(HttpServletResponse response,
-                         @Valid @NotBlank(message = "id不能为空") String id) throws Exception {
-        uploadFileService.download(response, id);
-    }
-
-}

base-modules/service-file/src/main/java/com/ruoyi/file/enums/AppHttpCodeEnum.java

@@ -1,53 +0,0 @@
-package com.ruoyi.file.enums;
-
-public enum AppHttpCodeEnum {
-
-    // 成功段固定为200
-    SUCCESS(200,"操作成功"),
-
-    // 登录段1~50
-    NEED_LOGIN(1,"需要登录后操作"),
-    LOGIN_PASSWORD_ERROR(2,"密码错误"),
-
-    // TOKEN50~100
-    TOKEN_INVALID(50,"无效的TOKEN"),
-    TOKEN_EXPIRE(51,"TOKEN已过期"),
-    TOKEN_REQUIRE(52,"TOKEN是必须的"),
-
-    // SIGN验签 100~120
-    SIGN_INVALID(100,"无效的SIGN"),
-    SIG_TIMEOUT(101,"SIGN已过期"),
-
-    // 参数错误 500~1000
-    PARAM_REQUIRE(500,"缺少参数"),
-    PARAM_INVALID(501,"无效参数"),
-    PARAM_IMAGE_FORMAT_ERROR(502,"图片格式有误"),
-    SERVER_ERROR(503,"服务器内部错误"),
-
-    // 数据错误 1000~2000
-    DATA_EXIST(1000,"数据已经存在"),
-    AP_USER_DATA_NOT_EXIST(1001,"ApUser数据不存在"),
-    DATA_NOT_EXIST(1002,"数据不存在"),
-    DATA_DUPLICATE(1003,"数据重复"),
-    OPERATION_FAILED(1004,"操作失败"),
-
-    // 数据错误 3000~3500
-    NO_OPERATOR_AUTH(3000,"无权限操作"),
-    NEED_ADMIND(3001,"需要管理员权限");
-
-    int code;
-    String message;
-
-    AppHttpCodeEnum(int code, String errorMessage){
-        this.code = code;
-        this.message = errorMessage;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}

base-modules/service-file/src/main/java/com/ruoyi/file/mapper/UploadFileMapper.java

@@ -1,16 +0,0 @@
-package com.ruoyi.file.mapper;
-
-import com.ruoyi.file.service.UploadFile;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface UploadFileMapper {
-
-    int insert(@Param("uploadFile") UploadFile uploadFile);
-
-    List<UploadFile> selectOne(@Param("id") String id, @Param("bussinessId") String bussinessId, @Param("status") Integer status);
-
-}

base-modules/service-file/src/main/java/com/ruoyi/file/service/UploadFile.java

@@ -1,48 +0,0 @@
-package com.ruoyi.file.service;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class UploadFile {
-    private String id;
-
-    //文件在系统中的名称
-    private String name;
-
-    //文件名称
-    private String fileName;
-
-    //文件后缀
-    private String fileSuffix;
-
-    //文件类型
-    private Integer type;
-
-    //主目录
-    private String domain;
-
-    //完整目录
-    private String path;
-
-    //扩展目录
-    private String pathExt;
-
-    //文件大小
-    private Integer size;
-
-    //关联的业务id
-    private String bussinessId;
-
-    //逻辑删除状态
-    private Integer status;
-
-    private LocalDateTime createTime;
-
-    private String createBy;
-
-    private LocalDateTime updateTime;
-
-    private String updateBy;
-}

base-modules/service-file/src/main/java/com/ruoyi/file/service/UploadFileService.java

@@ -1,13 +0,0 @@
-package com.ruoyi.file.service;
-
-import com.ruoyi.file.utils.ResponseResult;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-
-public interface UploadFileService {
-
-    ResponseResult upload(MultipartFile file, String bussinessId) throws Exception;
-
-    ResponseResult download(HttpServletResponse response, String id) throws Exception;
-}

base-modules/service-file/src/main/java/com/ruoyi/file/service/UploadFileServiceImpl.java

@@ -1,131 +0,0 @@
-package com.ruoyi.file.service;
-
-import com.ruoyi.file.enums.AppHttpCodeEnum;
-import com.ruoyi.file.mapper.UploadFileMapper;
-import com.ruoyi.file.utils.ResponseResult;
-import com.ruoyi.file.utils.Tools;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.util.*;
-
-import lombok.extern.slf4j.Slf4j;
-import java.time.LocalDateTime;
-
-@Slf4j
-@Service
-public class UploadFileServiceImpl implements UploadFileService {
-
-    private static final String LOCAL_HOST = "https://file.usky.cn/static/";
-
-    @Autowired
-    private UploadFileMapper uploadFileMapper;
-
-    @Override
-    @Transactional
-    public ResponseResult upload(MultipartFile multipartFile, String bussinessId) throws Exception {
-        if (multipartFile.isEmpty()) {
-            return ResponseResult.errorResult(AppHttpCodeEnum.PARAM_INVALID,"上传文件为空");
-        }
-        UploadFile uploadFile = new UploadFile();
-        // 保存原文件名称，文件列表展示需要用到
-        uploadFile.setFileName(multipartFile.getOriginalFilename());
-        // 生成系统文件名称，不可重复，防止同名文件上传覆盖问题
-        String name = RandomStringUtils.randomAlphanumeric(32) + multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().lastIndexOf(".")).toLowerCase();
-        uploadFile.setName(name.substring(0, name.lastIndexOf(".")));
-        uploadFile.setFileSuffix(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().lastIndexOf(".")).toLowerCase());
-        // 判断文件类型
-        int fileType = Tools.fileType(name);
-        uploadFile.setType(fileType);
-        uploadFile.setDomain(LOCAL_HOST + "resource/files/");
-        //这种方式比类型强转效率更高
-        String pathExt = System.currentTimeMillis()+"";
-        uploadFile.setPath(LOCAL_HOST + "resource/files/" + pathExt);
-        uploadFile.setPathExt(pathExt);
-        // 获取文件大小
-        uploadFile.setSize((int)multipartFile.getSize());
-        uploadFile.setBussinessId(bussinessId);
-        uploadFile.setStatus(1);
-        uploadFile.setCreateTime(LocalDateTime.now());
-        uploadFile.setId(Tools.getCode32());
-        uploadFileMapper.insert(uploadFile);
-
-        // 将文件保存到本目录/resources/files/下
-        // DateUtil.today()得到得是当天日期如：20230715，这个会在/resources/files/下再以日期生成一层目录
-        File newFile = new File("./resources/files/"+ pathExt +  "/" + name);
-        // 保证这个文件的父文件夹必须要存在
-        if (!newFile.getParentFile().exists()) {
-            newFile.getParentFile().mkdirs();
-        }
-        newFile.createNewFile();
-        // 将文件内容写入到这个文件中
-        InputStream is = multipartFile.getInputStream();
-        FileOutputStream fos = new FileOutputStream(newFile);
-        try {
-            int len;
-            byte[] buf = new byte[1024];
-            while ((len = is.read(buf)) != -1) {
-                fos.write(buf, 0, len);
-            }
-        } finally {
-            // 关流顺序，先打开的后关闭
-            fos.close();
-            is.close();
-        }
-
-        // 返回文件信息给前端
-        Map resultMap = new HashMap();
-        resultMap.put("id", uploadFile.getId());
-        resultMap.put("path", uploadFile.getPath());
-        return ResponseResult.okResult(resultMap);
-    }
-
-    @Override
-    public ResponseResult download(HttpServletResponse response, String id) throws Exception {
-        List<UploadFile> uploadFiles = uploadFileMapper.selectOne(id, null, 1);
-        if (CollectionUtils.isEmpty(uploadFiles)) {
-            return ResponseResult.errorResult(AppHttpCodeEnum.PARAM_INVALID, "查询文件为空");
-        }
-
-        // 去./resources/files/目录下取出文件
-        File downloadFile = new File("./resources/files/" +uploadFiles.get(0).getPathExt() +  "/" + uploadFiles.get(0).getName() + uploadFiles.get(0).getFileSuffix());
-        if (!downloadFile.exists() || downloadFile.length() == 0) {
-            return ResponseResult.errorResult(AppHttpCodeEnum.PARAM_INVALID, "查询文件为空");
-        }
-
-        InputStream is = null;
-        OutputStream os = null;
-        try {
-            // 判断是否是图片，如果是图片加上 response.setContentType("image/jpeg")，这样就可以直接在浏览器打开而不是下载
-            if (uploadFiles.get(0).getType() == 1) {
-                response.setContentType("image/jpeg");
-            }
-            response.addHeader("Content-Length", "" + downloadFile.length());
-            is = new FileInputStream(downloadFile);
-            os = response.getOutputStream();
-            IOUtils.copy(is, os);
-        } catch (Exception e) {
-            log.error("下载文件发生异常", e);
-        } finally {
-            try {
-                if (os != null) {
-                    os.flush();
-                    os.close();
-                }
-                if (is != null) {
-                    is.close();
-                }
-            } catch (IOException e) {
-                log.error("关闭流发生异常", e);
-            }
-        }
-        return ResponseResult.okResult("下载成功");
-    }
-}

base-modules/service-file/src/main/java/com/ruoyi/file/utils/ResponseResult.java

@@ -1,104 +0,0 @@
-package com.ruoyi.file.utils;
-
-import com.ruoyi.file.enums.AppHttpCodeEnum;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 通用的结果返回类
- * @param <T>
- */
-@Data
-public class ResponseResult<T> implements Serializable {
-
-    private String token;
-
-    private Integer code;
-
-    private String message;
-
-    private T data;
-
-    private String status;
-
-    public ResponseResult() {
-        this.code = 200;
-    }
-
-    public ResponseResult(Integer code, T data) {
-        this.code = code;
-        this.data = data;
-    }
-
-    public ResponseResult(Integer code, String msg, T data) {
-        this.code = code;
-        this.message = msg;
-        this.data = data;
-    }
-
-    public ResponseResult(Integer code, String msg) {
-        this.code = code;
-        this.message = msg;
-    }
-
-    public static ResponseResult okResult(int code, String msg) {
-        ResponseResult result = new ResponseResult();
-        return result.ok(code, null, msg);
-    }
-
-    public static ResponseResult okResult(int code, Object data,String msg) {
-        ResponseResult result = new ResponseResult();
-        return result.ok(code, data, msg);
-    }
-
-    public static ResponseResult okResult(Object data) {
-        ResponseResult result = setAppHttpCodeEnum(AppHttpCodeEnum.SUCCESS, AppHttpCodeEnum.SUCCESS.getMessage());
-        if(data!=null) {
-            result.setData(data);
-        }
-        return result;
-    }
-
-    public static ResponseResult errorResult(int code, String msg) {
-        ResponseResult result = new ResponseResult();
-        return result.error(code, msg);
-    }
-
-    public static ResponseResult errorResult(AppHttpCodeEnum enums){
-        return setAppHttpCodeEnum(enums,enums.getMessage());
-    }
-
-    public static ResponseResult errorResult(AppHttpCodeEnum enums, String message){
-        return setAppHttpCodeEnum(enums,message);
-    }
-
-    public static ResponseResult setAppHttpCodeEnum(AppHttpCodeEnum enums){
-        return okResult(enums.getCode(),enums.getMessage());
-    }
-
-    private static ResponseResult setAppHttpCodeEnum(AppHttpCodeEnum enums, String message){
-        return okResult(enums.getCode(),message);
-    }
-
-    public ResponseResult<?> error(Integer code, String msg) {
-        this.code = code;
-        this.message = msg;
-        return this;
-    }
-    public ResponseResult<?> ok(Integer code, T data) {
-        this.code = code;
-        this.data = data;
-        return this;
-    }
-    public ResponseResult<?> ok(Integer code, T data, String msg) {
-        this.code = code;
-        this.data = data;
-        this.message = msg;
-        return this;
-    }
-    public ResponseResult<?> ok(T data) {
-        this.data = data;
-        return this;
-    }
-}

base-modules/service-file/src/main/java/com/ruoyi/file/utils/Tools.java

@@ -1,48 +0,0 @@
-package com.ruoyi.file.utils;
-
-public class Tools {
-    public static int fileType(String fileName) {
-        if (fileName == null) {
-            return 0;
-        } else {
-            // 获取文件后缀名并转化为写，用于后续比较
-            String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
-            // 创建图片类型数组
-            String img[] = {"bmp", "jpg", "jpeg", "png", "tiff", "gif", "pcx", "tga", "exif", "fpx", "svg", "psd",
-                    "cdr", "pcd", "dxf", "ufo", "eps", "ai", "raw", "wmf"};
-            for (int i = 0; i < img.length; i++) {
-                if (img[i].equals(fileType)) {
-                    return 1;
-                }
-            }
-            // 创建文档类型数组
-            String document[] = {"txt", "doc", "docx", "xls", "htm", "html", "jsp", "rtf", "wpd", "pdf", "ppt"};
-            for (int i = 0; i < document.length; i++) {
-                if (document[i].equals(fileType)) {
-                    return 2;
-                }
-            }
-            // 创建视频类型数组
-            String video[] = {"mp4", "avi", "mov", "wmv", "asf", "navi", "3 gp", "mkv", "f4v", "rmvb", "webm"};
-            for (int i = 0; i < video.length; i++) {
-                if (video[i].equals(fileType)) {
-                    return 3;
-                }
-            }
-            // 创建音乐类型数组
-            String music[] = {"mp3", "wma", "wav", "mod", "ra", "cd", "md", "asf", "aac", "vqf", "ape", "mid", "ogg",
-                    "m4a", "vqf"};
-            for (int i = 0; i < music.length; i++) {
-                if (music[i].equals(fileType)) {
-                    return 4;
-                }
-            }
-        }
-        return 0;
-    }
-
-
-    public static String getCode32() {
-        return java.util.UUID.randomUUID().toString().replace("-", "").toLowerCase();
-    }
-}