From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
index 1fa9b8b..959b34b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
@@ -19,8 +19,10 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.ObsUploadUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.factory.UserFactory;
import com.stylefeng.guns.modular.system.model.TCompany;
@@ -29,6 +31,8 @@
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.transfer.UserDto;
+import com.stylefeng.guns.modular.system.util.OssUploadUtil;
+import com.stylefeng.guns.modular.system.util.huawei.OBSUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -37,12 +41,11 @@
import org.springframework.web.multipart.MultipartFile;
import javax.naming.NoPermissionException;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.io.InputStream;
+import java.util.*;
/**
* 系统管理员控制器
@@ -342,7 +345,7 @@
itCompanyService.updateById(company);
//设置该分公司下的所有司机状态
- itDriverService.updateCompanyDriverState(3,company.getId());
+// itDriverService.updateCompanyDriverState(3,company.getId());
}else if (user.getRoleType() == 3){
//查询加盟商
@@ -351,7 +354,7 @@
itCompanyService.updateById(franchisee);
//设置该加盟商下的所有司机状态
- itDriverService.updateFranchiseeDriverState(3,franchisee.getId());
+// itDriverService.updateFranchiseeDriverState(3,franchisee.getId());
}
return SUCCESS_TIP;
}
@@ -378,7 +381,7 @@
itCompanyService.updateById(company);
//设置该分公司下的所有司机状态
- itDriverService.updateCompanyDriverState(2,company.getId());
+// itDriverService.updateCompanyDriverState(2,company.getId());
}else if (user.getRoleType() == 3){
//查询加盟商
@@ -387,7 +390,7 @@
itCompanyService.updateById(franchisee);
//设置该加盟商下的所有司机状态
- itDriverService.updateFranchiseeDriverState(2,franchisee.getId());
+// itDriverService.updateFranchiseeDriverState(2,franchisee.getId());
}
return SUCCESS_TIP;
}
@@ -431,6 +434,32 @@
return pictureName;
}
+ @ResponseBody
+ @RequestMapping("/saveApk")
+ public String saveApk(@RequestPart("myfile") MultipartFile file, HttpServletRequest request){
+ Map<String, Object> m = new HashMap<>();
+ try {
+ String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
+ try {
+ String fileSavePath = gunsProperties.getFileUploadPath()+"apk\\";
+ InputStream inputStream = file.getInputStream();
+ String name1 = file.getOriginalFilename();
+ name1 = UUIDUtil.getRandomCode() + name1.substring(name1.lastIndexOf("."));
+ String s = OBSUtil.putObjectToBucket(inputStream, name1);
+// String s = OssUploadUtil.ossUpload(request, file);
+ // file.transferTo(new File(fileSavePath + pictureName));
+ return s;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ m.put("imgUrl", gunsProperties.getFileUploadPath()+"apk/"+pictureName);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
/**
* 判断当前登录的用户是否有操作这个用户的权限
*/
--
Gitblit v1.7.1