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 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 @@ + @@ -33,6 +34,7 @@ mobile, user_dept, user_title, + user_account, user_pwd, join_time, is_published, @@ -59,6 +61,7 @@ mobile, user_dept, user_title, + user_account, user_pwd, join_time, is_published, @@ -77,6 +80,7 @@ #{mobile}, #{userDept}, #{userTitle}, + #{userAccount}, #{userPwd}, #{joinTime}, #{isPublished}, @@ -99,6 +103,7 @@ mobile = #{mobile}, user_dept = #{userDept}, user_title = #{userTitle}, + user_account = #{userAccount}, join_time = #{joinTime}, user_status = #{userStatus}, is_activated = #{isActivated},