From b76679a8ee852645ce85d6dec981dac7632eef35 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 30 四月 2025 17:20:49 +0800
Subject: [PATCH] zjh20250430

---
 ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
index 9f1dbfd..56cdb0e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
@@ -9,13 +9,16 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ltkj.common.core.domain.R;
 import com.ltkj.common.core.domain.entity.SysDictData;
 import com.ltkj.common.utils.SnowFlake;
 import com.ltkj.common.utils.uuid.UUID;
 import com.ltkj.hosp.domain.SysAttachment;
+import com.ltkj.hosp.mapper.TestMapper;
 import com.ltkj.hosp.service.ISysAttachmentService;
+import com.ltkj.system.service.ISysConfigService;
 import com.ltkj.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -66,6 +69,10 @@
     private ISysAttachmentService sysAttachmentService;
     @Autowired
     private ISysDictDataService sysDictDataService;
+    @Autowired
+    private ISysConfigService sysConfigService;
+    @Autowired
+    private TestMapper testMapper;
 
 
     /**
@@ -147,12 +154,29 @@
         }
     }
 
+    /**
+     * exe涓婁紶鍥剧墖鎺ュ彛
+     * @param file
+     * @param dictVal
+     * @param ip
+     * @return
+     */
     @PostMapping("/uploadImgExe")
     @ApiOperation(value = "EXE绋嬪簭寰幆璇诲彇鍥剧墖涓婁紶")
     public AjaxResult uploadImgExe(@RequestPart("file") MultipartFile file,@RequestParam("val")String dictVal,@RequestParam("ip")String ip){
+        if (StrUtil.isBlank(dictVal))
+            return AjaxResult.error("绫诲瀷涓嶈兘涓虹┖");
         try {
+            String exeimgsaveurl = sysConfigService.selectConfigByKey("exeimgsaveurl");
+            String filePath;
+            if (StrUtil.isNotBlank(exeimgsaveurl)){
+                filePath = exeimgsaveurl;
+            }else {
+                filePath = ltkjConfig.getUploadPath();
+            }
             // 涓婁紶鏂囦欢璺緞
-            String filePath = ltkjConfig.getUploadPath();
+
+            filePath+="/"+dictVal;
             // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
@@ -164,9 +188,10 @@
             ajax.put("newFileName", newFileName);
             ajax.put("originalFilename", file.getOriginalFilename());
             SysAttachment sysAttachment = new SysAttachment();
+            sysAttachment.setOldFileName(file.getOriginalFilename());
             sysAttachment.setId(SnowFlake.getInstance().nextId());
             sysAttachment.setFileName(newFileName);
-            sysAttachment.setFilePath(fileName);
+            sysAttachment.setFilePath(ltkjConfig.getUploadPath()+fileName.replace("/profileupload",""));
             sysAttachment.setUrl(url);
             sysAttachment.setSysDictVal(dictVal);
             sysAttachment.setIp(ip);
@@ -182,6 +207,18 @@
         }
     }
 
+    /**
+     * 鑾峰彇exe绋嬪簭涓婁紶鍥剧墖鍒楄〃
+     * @param type
+     * @return
+     */
+    @GetMapping("/getExeUploadImgList")
+    public AjaxResult getExeUploadImgList(@RequestParam("type") String type){
+        if (StrUtil.isBlank(type)) return AjaxResult.error("绫诲瀷涓嶈兘涓虹┖");
+        List<Map<String, Object>> list = testMapper.getExeUploadImgListByGnLx(type);
+        return AjaxResult.success().put("data",list);
+    }
+
     @GetMapping("/listExeVal")
     public AjaxResult listExeDictVal(){
         LambdaQueryWrapper<SysDictData> queryWrapper = new LambdaQueryWrapper<>();

--
Gitblit v1.8.0