From e2e9349dfa66b39cef81f2979106f4723ce28ac6 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Wed, 8 Jan 2025 15:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=E5=85=B3=E7=B3=BBbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EdFileRelationController.java  | 19 ++++++++++++++++++-
 .../manage/pojo/req/UpdateRelationDTO.java    | 11 +++++++++++
 .../manage/pojo/resp/FileSimpleInfoVO.java    |  2 +-
 .../main/resources/sqlmapper/UserMapper.xml   |  5 +++++
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateRelationDTO.java

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
index a1a39fe..61fc52a 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
@@ -1,11 +1,15 @@
 package com.electromagnetic.industry.software.manage.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation;
 import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
+import com.electromagnetic.industry.software.manage.pojo.req.UpdateRelationDTO;
 import com.electromagnetic.industry.software.manage.service.EdFileRelationService;
+import com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileRelationServiceImpl;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,7 +21,7 @@ import javax.annotation.Resource;
 public class EdFileRelationController {
 
     @Resource
-    EdFileRelationService edFileRelationService;
+    EdFileRelationServiceImpl edFileRelationService;
 
     /**
      * 创建文件关系
@@ -35,6 +39,19 @@ public class EdFileRelationController {
         }
     }
 
+    /**
+     * 创建文件关系
+     *
+     * @param updateRelation
+     * @return
+     */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) {
+        LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship());
+        return ElectromagneticResultUtil.success(edFileRelationService.update(wrapper));
+    }
+
     /**
      * 取消文件关系
      *
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateRelationDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateRelationDTO.java
new file mode 100644
index 0000000..e65efaa
--- /dev/null
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UpdateRelationDTO.java
@@ -0,0 +1,11 @@
+package com.electromagnetic.industry.software.manage.pojo.req;
+
+import lombok.Data;
+
+@Data
+public class UpdateRelationDTO {
+
+    private String relationId;
+
+    private String relationship;
+}
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileSimpleInfoVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileSimpleInfoVO.java
index 8d69250..efb1d41 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileSimpleInfoVO.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileSimpleInfoVO.java
@@ -23,6 +23,6 @@ public class FileSimpleInfoVO {
     /**
      * 文件版本
      */
-    private String fileVersion;
+    private Integer fileVersion;
 
 }
diff --git a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml
index 244432a..0864be4 100644
--- a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml
+++ b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml
@@ -9,6 +9,7 @@
         <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
         <result column="user_dept" jdbcType="VARCHAR" property="userDept"/>
         <result column="user_title" jdbcType="VARCHAR" property="userTitle"/>
+        <result column="user_account" jdbcType="VARCHAR" property="userAccount"/>
         <result column="user_pwd" jdbcType="VARCHAR" property="userPwd"/>
         <result column="join_time" jdbcType="TIMESTAMP" property="joinTime"/>
         <result column="is_published" jdbcType="TINYINT" property="isPublished"/>
@@ -33,6 +34,7 @@
                mobile,
                user_dept,
                user_title,
+               user_account,
                user_pwd,
                join_time,
                is_published,
@@ -59,6 +61,7 @@
         <if test="mobile != null and mobile !='' ">mobile,</if>
         <if test="userDept != null and userDept !='' ">user_dept,</if>
         <if test="userTitle != null and userTitle !='' ">user_title,</if>
+        <if test="userAccount != null and userAccount !='' ">user_account,</if>
         <if test="userPwd != null and userPwd !='' ">user_pwd,</if>
         <if test="joinTime != null">join_time,</if>
         <if test="isPublished != null">is_published,</if>
@@ -77,6 +80,7 @@
         <if test="mobile != null and mobile !='' ">#{mobile},</if>
         <if test="userDept != null and userDept !='' ">#{userDept},</if>
         <if test="userTitle != null and userTitle !='' ">#{userTitle},</if>
+        <if test="userAccount != null and userAccount !='' ">#{userAccount},</if>
         <if test="userPwd != null and userPwd !='' ">#{userPwd},</if>
         <if test="joinTime != null">#{joinTime},</if>
         <if test="isPublished != null">#{isPublished},</if>
@@ -99,6 +103,7 @@
             <if test="mobile != null and mobile != ''">mobile = #{mobile},</if>
             <if test="userDept != null and userDept != ''">user_dept = #{userDept},</if>
             <if test="userTitle != null and userTitle != ''">user_title = #{userTitle},</if>
+            <if test="userAccount != null and userAccount != ''">user_account = #{userAccount},</if>
             <if test="joinTime != null">join_time = #{joinTime},</if>
             <if test="userStatus != null and userStatus != ''">user_status = #{userStatus},</if>
             <if test="isActivated != null and isActivated != ''">is_activated = #{isActivated},</if>