修改图像接口

zxkf-api/src/main/java/api/controller/IndexController.java

@@ -1,6 +1,7 @@
 package api.controller;
 
 
+import api.entity.database.call.CallLog;
 import api.entity.database.call.Record;
 import api.entity.database.online.Message;
 import api.entity.database.Report.HourReport;
@@ -13,6 +14,7 @@ import api.service.order.IReportBaseService;
 import api.service.order.IWorkOrderBaseService;
 import api.service.system.*;
 import api.util.annotation.Anonymous;
+import api.util.helper.StringHelper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import api.entity.database.system.Dept;
 import api.entity.database.system.Menu;
@@ -52,7 +54,8 @@ public class IndexController extends BaseController {
     private IReportBaseService ReportBaseService;
     @Autowired
     private IUserExtensionService userextensionService;
-
+    @Autowired
+    private IConfigService configService;
     /**
      * 获取用户信息
      *
@@ -89,6 +92,11 @@ public class IndexController extends BaseController {
         if (entity!=null)
         {
             user.setExtension(entity.getExtension());
+            if(!user.getAvatar().isEmpty() )
+            {
+                String captchaEnabled = configService.selectCaptchaEnabled("FileUrl");
+                user.setAvatar(captchaEnabled + user.getAvatar());
+            }
         }
         return Success("成功", map);
     }

zxkf-api/src/main/java/api/controller/system/SysAccessoriesController.java

@@ -40,7 +40,7 @@ public class SysAccessoriesController extends BaseController {
 
     @ApiOperation(value = "上传文件")
     @PostMapping("/upload")
-    public AjaxResult uploadFile(MultipartFile file) {
+    public AjaxResult uploadFile(MultipartFile file,String type) {
         //无文件返回错误
         if (file == null  ) {
             return Error("无文件");
@@ -51,6 +51,10 @@ public class SysAccessoriesController extends BaseController {
         //全部文件名，若多个，则逗号分隔
         StringBuilder allFileNames = new StringBuilder();
         String fileSavePath = "files/order/" + DateHelper.getDate();
+        if (!type.isEmpty())
+        {
+            fileSavePath="files/"+type+"/" + DateHelper.getDate();
+        }
         //若文件夹不存在，则创建文件夹
         File pFile = new File(fileSavePath);
         if (!pFile.exists()) {

zxkf-api/src/main/java/api/controller/system/UserController.java

@@ -1,9 +1,11 @@
 package api.controller.system;
 
+import api.entity.database.call.CallLog;
 import api.entity.database.system.*;
 import api.entity.view.call.CallLogView;
+import api.entity.view.system.CustomerView;
 import api.entity.view.system.UserView;
-import api.service.system.IUserExtensionService;
+import api.service.system.*;
 import api.util.annotation.Anonymous;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,9 +15,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import api.controller.BaseController;
 import api.entity.input.PageInput;
 import api.model.AjaxResult;
-import api.service.system.IDeptService;
-import api.service.system.IRoleService;
-import api.service.system.IUserService;
 import api.util.annotation.Log;
 import api.util.enums.BusinessType;
 import api.util.helper.*;
@@ -70,10 +69,14 @@ public class UserController extends BaseController {
         qw.eq(!StringHelper.isEmpty(input.getStatus()), User::getStatus, input.getStatus());
         qw.eq(User::getDelFlag, "0");
         qw.orderByDesc(User::getUserId);
+
         Page<User> page = GetPage(pageInput);
         if (page != null) {
             //IPage<User> iPage = userService.getListPage(page, qw);
             IPage<User> iPage = userService.selectUserDeptList(page, qw);
+
+
+
             return Success("成功", iPage.getRecords(), iPage.getTotal());
         } else {
             return Success("成功", userService.selectUserDeptList(qw));
@@ -217,6 +220,23 @@ public class UserController extends BaseController {
         }
         return Error("修改失败!");
     }
+
+    /**
+     * 修改图像
+     */
+    @ApiOperation("修改图像")
+    @Log(title = "修改图像", businessType = BusinessType.OTHER)
+    @PutMapping("/avatar")
+    public AjaxResult avatar(String url) {
+        UserView currentUser=CurrentUser();
+
+        var  entity=userService.getEntity(currentUser.getUserId());
+        entity.setAvatar(url);
+        if (userService.update(entity)) {
+            return Success("修改成功!");
+        }
+        return Error("修改失败!");
+    }
     /**
      * 修改状态
      *