瀏覽代碼

fix personal avatar

Alex 4 年之前
父節點
當前提交
18799870ef

+ 47 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TPersonalPageController.java

@@ -1,16 +1,16 @@
 package com.ruoyi.web.controller.system;
 
+import java.io.IOException;
 import java.util.List;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -19,6 +19,7 @@ import com.ruoyi.system.domain.TPersonalPage;
 import com.ruoyi.system.service.ITPersonalPageService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 个人页Controller
@@ -100,4 +101,42 @@ public class TPersonalPageController extends BaseController
     {
         return toAjax(tPersonalPageService.deleteTPersonalPageByIds(ids));
     }
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:personalPage:edit')")
+    @PutMapping("/changeEnable")
+    public AjaxResult changeStatus(@RequestBody TPersonalPage tPersonalPage)
+    {
+        if (tPersonalPage == null){
+            return AjaxResult.error("数据不能为空");
+        }
+        if (tPersonalPage.getId() <= 0){
+            return AjaxResult.error("ID不能为空");
+        }
+        if (!tPersonalPage.getEnable().equals("0") && !tPersonalPage.getEnable().equals("1")){
+            return AjaxResult.error("修改失败");
+        }
+        tPersonalPage.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(tPersonalPageService.updateEnable(tPersonalPage));
+    }
+
+
+    /**
+     * 头像上传
+     */
+    @PreAuthorize("@ss.hasPermi('system:personalPage:edit')")
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file, Long id) throws IOException {
+        if (!file.isEmpty()) {
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getUploadPath(), file);
+
+            if (tPersonalPageService.updateAvatar(id, avatar)) {
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                return ajax;
+            }
+        }
+        return AjaxResult.error("上传图片异常,请联系管理员");
+    }
 }

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTemplatePageController.java

@@ -120,7 +120,7 @@ public class TTemplatePageController extends BaseController
         if (tTemplatePage.getId() <= 0){
             return AjaxResult.error("ID不能为空");
         }
-        if (tTemplatePage.getEnable() != 0 && tTemplatePage.getEnable() != 1){
+        if (!tTemplatePage.getEnable().equals("0") && !tTemplatePage.getEnable().equals("1")){
             return AjaxResult.error("修改失败");
         }
         tTemplatePage.setUpdateBy(SecurityUtils.getUsername());

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/domain/TPersonalImg.java

@@ -28,7 +28,7 @@ public class TPersonalImg extends BaseEntity
 
     /** 是否启用  0是  1否 */
     @Excel(name = "是否启用  0是  1否")
-    private Integer enable;
+    private String enable;
 
     public void setId(Long id) 
     {
@@ -57,12 +57,12 @@ public class TPersonalImg extends BaseEntity
     {
         return url;
     }
-    public void setEnable(Integer enable) 
+    public void setEnable(String enable)
     {
         this.enable = enable;
     }
 
-    public Integer getEnable() 
+    public String getEnable()
     {
         return enable;
     }

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/domain/TPersonalPage.java

@@ -55,7 +55,7 @@ public class TPersonalPage extends BaseEntity
 
     /** 启用  0正常,1停用 */
     @Excel(name = "启用  0正常,1停用")
-    private Integer enable;
+    private String enable;
 
     public void setId(Long id)
     {
@@ -138,12 +138,12 @@ public class TPersonalPage extends BaseEntity
     {
         return content;
     }
-    public void setEnable(Integer enable)
+    public void setEnable(String enable)
     {
         this.enable = enable;
     }
 
-    public Integer getEnable()
+    public String getEnable()
     {
         return enable;
     }

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/domain/TTemplatePage.java

@@ -47,7 +47,7 @@ public class TTemplatePage extends BaseEntity
 
     /** 启用  0正常,1停用 */
     @Excel(name = "启用  0正常,1停用")
-    private Integer enable;
+    private String enable;
 
     public void setId(Long id)
     {
@@ -112,12 +112,12 @@ public class TTemplatePage extends BaseEntity
     {
         return stakeholderBirthday;
     }
-    public void setEnable(Integer enable)
+    public void setEnable(String enable)
     {
         this.enable = enable;
     }
 
-    public Integer getEnable()
+    public String getEnable()
     {
         return enable;
     }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TPersonalPageMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.TPersonalPage;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 个人页Mapper接口
@@ -58,4 +59,11 @@ public interface TPersonalPageMapper
      * @return 结果
      */
     public int deleteTPersonalPageByIds(Long[] ids);
+    /**
+     * 修改头像
+     *
+     * @param id 个人id
+     * @param avatar 头像地址
+     */
+    int updateAvatar(@Param("id") Long id, @Param("avatar") String avatar);
 }

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ITPersonalPageService.java

@@ -58,4 +58,8 @@ public interface ITPersonalPageService
      * @return 结果
      */
     public int deleteTPersonalPageById(Long id);
+
+    int updateEnable(TPersonalPage tPersonalPage);
+
+    boolean updateAvatar(Long id, String avatar);
 }

+ 9 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPersonalPageServiceImpl.java

@@ -92,4 +92,13 @@ public class TPersonalPageServiceImpl implements ITPersonalPageService
     {
         return tPersonalPageMapper.deleteTPersonalPageById(id);
     }
+    @Override
+    public int updateEnable(TPersonalPage tPersonalPage) {
+        return tPersonalPageMapper.updateTPersonalPage(tPersonalPage);
+    }
+
+    @Override
+    public boolean updateAvatar(Long id, String avatar){
+        return tPersonalPageMapper.updateAvatar(id,avatar) > 0;
+    }
 }

+ 4 - 1
ruoyi-system/src/main/resources/mapper/system/TPersonalPageMapper.xml

@@ -113,5 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-    
+
+    <update id="updateAvatar" parameterType="TPersonalPage">
+ 		update t_personal_page set avatar = #{avatar} where id = #{id}
+	</update>
 </mapper>