From 9b3eb7cfcf0a7509e4494006cc4e2ef82d4024eb Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Mon, 10 Apr 2023 09:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B1=9F=E4=B8=9A=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=B0=E6=9B=B4=E6=96=B0/=E5=88=A0=E9=99=A4=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SjUploadFileController.java    | 43 +++++++++++++++++++
 .../controller/UploadFileController.java      | 12 ------
 .../xmgl/modules/project/entity/Project.java  |  2 +-
 .../resources/application-sjjt-gsx.properties |  2 +-
 4 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java
new file mode 100644
index 000000000..fb2393a14
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjUploadFileController.java
@@ -0,0 +1,43 @@
+package com.zhgd.xmgl.modules.basicdata.controller;
+
+
+import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.xmgl.modules.basicdata.entity.vo.UploadImageVo;
+import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @program: diseaseManage
+ * @description: 文件
+ * @author: Mr.Peng
+ * @create: 2020-02-18 13:13
+ **/
+@RestController
+@RequestMapping(value = "/xmgl/upload")
+@Slf4j
+@Api(tags = "文件")
+public class SjUploadFileController {
+
+    @Resource
+    private UploadFileService uploadFileService;
+
+    /**
+     * 三江业务中台上传图片返回url
+     *
+     * @param file
+     * @return
+     */
+    @PostMapping(value = "/sj/image")
+    @ApiOperation(value = "三江业务中台上传图片", notes = "三江业务中台上传图片", httpMethod = "POST")
+    public Result<UploadImageVo> uploadSjImage(@RequestParam("file") MultipartFile file) {
+        return uploadFileService.uploadSjImage(file);
+    }
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java
index df175adb4..7e91a5d7a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java
@@ -53,18 +53,6 @@ public class UploadFileController {
         return resultMap;
     }
 
-    /**
-     * 三江业务中台上传图片返回url
-     *
-     * @param file
-     * @return
-     */
-    @PostMapping(value = "/sj/image")
-    @ApiOperation(value = "三江业务中台上传图片", notes = "三江业务中台上传图片", httpMethod = "POST")
-    public Result<UploadImageVo> uploadSjImage(@RequestParam("file") MultipartFile file) {
-        return uploadFileService.uploadSjImage(file);
-    }
-
     /*@ApiOperation(value = "企业上传资料", notes = "企业上传资料" , httpMethod="POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "文件", paramType = "query", required = true, dataType = "String"),
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
index 7136e6244..44dc38d6d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java
@@ -248,7 +248,7 @@ public class Project implements Serializable {
     @ApiModelProperty(value = "云联万物-工程所在街（乡）镇机构编码")
     private String streetTownshipTownCode;
 
-    @ApiModelProperty(value = "'三江重点工程类型多选'")
+    @ApiModelProperty(value = "三江重点工程类型多选")
     private String keyProjectType;
 
 }
diff --git a/src/main/resources/application-sjjt-gsx.properties b/src/main/resources/application-sjjt-gsx.properties
index 15451a79b..bc9ec0464 100644
--- a/src/main/resources/application-sjjt-gsx.properties
+++ b/src/main/resources/application-sjjt-gsx.properties
@@ -90,4 +90,4 @@ sj.unifiedAuthentication.login.code.url=http://wbtqry.natappfree.cc/xmgl/sj/unif
 sj.unifiedAuthentication.success.redirect=http://192.168.34.150:8080/index.html#/login?UID=
 
 
-sj.upload.image.url=http://192.168.34.221/image/
\ No newline at end of file
+sj.upload.image.url=http://192.168.34.221:11111/image/
\ No newline at end of file