From 75d0a1c324f90fa46362a368082481e50adde893 Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Wed, 10 May 2023 11:41:54 +0800
Subject: [PATCH] =?UTF-8?q?5-10=20=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/sys_resources/SysResources.java       |  3 ++
 .../api/sys_resources/SysResourcesFeign.java  | 11 +++++++
 .../system/biz/sys_plan/SysPlanMapper.xml     |  2 +-
 .../SysPlanScheduleMapper.xml                 |  7 ++--
 .../biz/sys_resources/SysResourcesMapper.java |  7 +++-
 .../biz/sys_resources/SysResourcesRest.java   | 21 +++++++++++-
 .../sys_resources/SysResourcesService.java    | 32 ++++++++++++++++++-
 .../src/main/resources/application-dev.yml    |  5 ++-
 8 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResources.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResources.java
index a60535d..ef5eb04 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResources.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResources.java
@@ -2,6 +2,7 @@ package com.yxt.demo.system.api.sys_resources;
 
 import com.yxt.demo.system.utils.BaseEntity;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @Author dimengzhe
@@ -19,4 +20,6 @@ public class SysResources extends BaseEntity {
     private String typeKey;
 
     private String content;
+
+    private MultipartFile file;
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResourcesFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResourcesFeign.java
index 1b16345..28093bd 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResourcesFeign.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_resources/SysResourcesFeign.java
@@ -1,9 +1,20 @@
 package com.yxt.demo.system.api.sys_resources;
 
+import com.yxt.demo.system.utils.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.multipart.MultipartFile;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:26
  * @Description
  */
+@Api(value = "")
 public interface SysResourcesFeign {
+
+    @ApiOperation(value = "上传")
+    @RequestMapping("/upload")
+    ResultBean upload(MultipartFile file);
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
index b3e0d54..93fa931 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
@@ -24,7 +24,7 @@
     </select>
 
     <select id="selectSysPlanCommentBySid" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
-        select p.id,p.sid,p.teacherNo,p.studentNo,p.planContent,p.planOpinion,ps.planContent planContentJd,ps.planOpinion planOpinionYj from sys_plan p
+        select p.id,p.sid,p.teacherNo,p.studentNo,p.planContent,ps.planContent planContentJd,ps.planOpinion from sys_plan p
         left join sys_plan_schedule ps
         on p.sid = ps.planSid
         where p.sid = #{sid}
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml
index 7cf86c0..c5e02c8 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml
@@ -8,15 +8,12 @@
                 state = #{state},
             </if>
             <if test="stateChinese != null">
-                state = #{stateChinese},
-            </if>
-            <if test="planContent != null">
-                planContent = #{planContent},
+                stateChinese = #{stateChinese},
             </if>
             <if test="planOpinion != null">
                 planOpinion=#{planOpinion},
             </if>
         </set>
-        where planSid=#{planSid}
+        where planSid=#{sid}
     </update>
 </mapper>
\ No newline at end of file
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesMapper.java
index a50d707..d1fe8c4 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesMapper.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesMapper.java
@@ -1,9 +1,14 @@
 package com.yxt.demo.system.biz.sys_resources;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.demo.system.api.sys_resources.SysResources;
+import org.apache.ibatis.annotations.Mapper;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:26
  * @Description
  */
-public interface SysResourcesMapper {
+@Mapper
+public interface SysResourcesMapper extends BaseMapper<SysResources> {
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesRest.java
index 6818cff..dc0e587 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesRest.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesRest.java
@@ -1,9 +1,28 @@
 package com.yxt.demo.system.biz.sys_resources;
 
+import com.yxt.demo.system.api.sys_resources.SysResourcesFeign;
+import com.yxt.demo.system.utils.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:26
  * @Description
  */
-public class SysResourcesRest {
+@RestController
+@Api(tags = "自主资源表")
+@RequestMapping("v1/sysResources")
+public class SysResourcesRest implements SysResourcesFeign {
+
+    @Autowired
+    private SysResourcesService sysResourcesService;
+
+    @Override
+    public ResultBean upload(MultipartFile file) {
+        return sysResourcesService.upload(file);
+    }
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesService.java
index 786a7a4..23d24bd 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_resources/SysResourcesService.java
@@ -1,9 +1,39 @@
 package com.yxt.demo.system.biz.sys_resources;
 
+import com.yxt.demo.system.api.sys_resources.SysResources;
+import com.yxt.demo.system.jdbc.service.MybatisBaseService;
+import com.yxt.demo.system.utils.ResultBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.util.UUID;
+
 /**
  * @Author dimengzhe
  * @Date 2023/4/24 14:26
  * @Description
  */
-public class SysResourcesService {
+@Service
+public class SysResourcesService extends MybatisBaseService<SysResourcesMapper, SysResources> {
+
+    @Value("${reggie.path}")
+    private String basePath;
+
+    public ResultBean upload(MultipartFile file) {
+        String filename = file.getOriginalFilename();
+        String substring = filename.substring(filename.lastIndexOf("."));
+        String fileName = UUID.randomUUID().toString() + substring;
+        File file1 = new File(basePath);
+        if (!file1.exists()){
+            file1.mkdirs();
+        }
+        try {
+            file.transferTo(new File(basePath+fileName));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
 }
diff --git a/demo-system/demo-system-biz/src/main/resources/application-dev.yml b/demo-system/demo-system-biz/src/main/resources/application-dev.yml
index d3ff5e5..e5e9433 100644
--- a/demo-system/demo-system-biz/src/main/resources/application-dev.yml
+++ b/demo-system/demo-system-biz/src/main/resources/application-dev.yml
@@ -9,12 +9,15 @@ spring:
 
 image:
   upload:
-    path: D:\\demo\\upload\\
+    path: D:\demo\upload\
   url:
     prefix: http://127.0.0.1:8111/upload/
   login:
     path: D:\\images\\pic-click
 
+reggie:
+  path: D:\demo\upload\
+