Merge remote-tracking branch 'origin/main'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +31,8 @@ import com.ruoyi.framework.config.ServerConfig;
 public class CommonController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+    @Value("${ruoyi.serverUrl}")
+    private String serverUrl;
 
     @Autowired
     private ServerConfig serverConfig;
@@ -80,7 +83,9 @@ public class CommonController
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+           // String url = serverConfig.getUrl() + fileName;
+           //由本机ip地址修改为外网映射地址
+            String url = serverUrl + fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", url);
             ajax.put("fileName", fileName);

ruoyi-admin/src/main/resources/application.yml

@@ -12,6 +12,8 @@ ruoyi:
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
+  #服务器外网访问地址
+  serverUrl: http://ndkh.tstc.edu.cn
 
 # 开发环境配置
 server:

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java

@@ -2,10 +2,7 @@ package com.ruoyi.kaohe.service.impl;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson2.JSON;
@@ -195,7 +192,9 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
         if (typeid.equals(1L)) {//选项评分
             recard.setVoteDetails(JSON.toJSONString(xuanxiangDetails));
         } else {
-            Map<String, BigDecimal> details = voteEmpList.stream().collect(Collectors.toMap(KhVoteEmp::getBkhdxName, KhVoteEmp::getScore));
+            List<String> details = voteEmpList.stream()
+                    .map(emp -> emp.getBkhdxName() + " : " + emp.getScore())
+                    .collect(Collectors.toList());
             recard.setVoteDetails(JSON.toJSONString(details));
         }
         khVoteRecardMapper.insertKhVoteRecard(recard);