From 3dcb4e0ebfd43190957f556d886917b2a2ffa064 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 12 Aug 2020 18:45:30 +0800
Subject: [PATCH] 修改上传图片的接口
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 17 +++++++++++++----
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java | 5 +++--
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 10 ++++++----
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html | 2 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java | 4 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 5 +----
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/FastdfsAutoConfigure.java | 2 +-
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java | 2 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 3 +++
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/QiniuOSSAutoConfigure.java | 2 +-
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java | 2 +-
11 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
index 36729eb..668e668 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
@@ -46,7 +46,7 @@
* @param imgType 文件类型：X光片/医院Logo[Xray/Logo]
*/
@PostMapping(value = "/baseUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- FileInfo baseUplaod(@RequestParam("file") String file,@RequestParam("imgType") String imgType);
+ FileInfo baseUplaod(@RequestParam("file") String file,@RequestParam("imgType") String imgType,@RequestParam("hospitalId") String hospitalId,@RequestParam("departmentId") String departmentId);
/**
* base64 下载图片
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
index d70e4c9..ace2cbe 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
@@ -37,7 +37,7 @@
/**
* base64上传图片
*/
- FileInfo baseUplaod(String file, String imgType);
+ FileInfo baseUplaod(String file, String imgType, String hospitalId, String departmentId);
/**
* base64图片下载
*/
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
index f762db3..a57b098 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -100,7 +100,7 @@
*/
protected abstract void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception;
protected abstract void fileUpLoadOss(FileInfo fileInfo,String newFilePath, InputStream fileStream);
- protected abstract String FilePath(String imgType,String folderByDate);
+ protected abstract String FilePath(String imgType,String folderByDate,String hospitalId,String departmentId);
protected abstract OSSObject down(String url);
/**
@@ -160,7 +160,7 @@
//将生成的文件转换为流
InputStream inputStream=new FileInputStream(thuFile);
String folderByDate = DateUtil.formatDate(new Date());
- String filefloder=this.FilePath(imgType,folderByDate);
+ String filefloder=this.FilePath(imgType,folderByDate,null,null);
FileInfo newfileInfo=new FileInfo();
newfileInfo.setName(newFileName);
newfileInfo.setId(IdUtil.fastSimpleUUID());
@@ -190,7 +190,7 @@
}
@Override
- public FileInfo baseUplaod(String file, String imgType) {
+ public FileInfo baseUplaod(String file, String imgType, String hospitalId, String departmentId) {
if(file==null||"".equals(file.trim())){
return null;
}
@@ -215,7 +215,9 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(imgType);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,"HospitalLogo/"+newFileName,input);
+ String folderByDate =DateUtil.formatDate(new Date());
+ String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
+ this.fileUpLoadOss(newfileInfo,filePath,input);
input.close();
baseMapper.insert(newfileInfo);
return newfileInfo;
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
index 2ee75b4..ba31137 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
@@ -75,7 +75,7 @@
String fileName= UUID.randomUUID().toString().replaceAll("-","")+fileType;
String fileFolder = "";
if(clientID.equals("hospital")){//医院端平台，
- fileFolder=FilePath(fileInfo.getImgType(),folderByDate);
+ fileFolder=FilePath(fileInfo.getImgType(),folderByDate,null,null);
fileUpLoadOss(fileInfo,fileFolder + fileName,file.getInputStream());
}
else {
@@ -111,7 +111,7 @@
* @param imgType
* @return
*/
- public String FilePath(String imgType,String folderByDate)
+ public String FilePath(String imgType,String folderByDate,String hospitalId,String departmentId)
{
//返回的文件路径
String fileFolder="";
@@ -120,7 +120,17 @@
if (imgType.toLowerCase().equals("xray")) {
String hospitalID = httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER);
String depID = httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER);
- fileFolder = "Xray/" + hospitalID + "/" + depID + "/"+ folderByDate + "/";
+ if (org.apache.commons.lang3.StringUtils.isBlank(hospitalID)&&
+ org.apache.commons.lang3.StringUtils.isBlank(depID)) {
+ fileFolder = "Xray/" + hospitalID + "/" + depID + "/"+ folderByDate + "/";
+ }else {
+ if (org.apache.commons.lang3.StringUtils.isBlank(hospitalId)&&
+ org.apache.commons.lang3.StringUtils.isBlank(departmentId)) {
+ fileFolder = "Xray/" + hospitalId + "/" + departmentId + "/"+ folderByDate + "/";
+ }else {
+ fileFolder = "Xray/" + folderByDate + "/";
+ }
+ }
}
// 医院Logo只保存在一个目录中
else if (imgType.toLowerCase().equals("logo")) {
@@ -131,7 +141,6 @@
else {
fileFolder = "OtherImage/"+ folderByDate + "/";
}
-
} else {
fileFolder = "OtherImage/"+ folderByDate + "/";
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/FastdfsAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/FastdfsAutoConfigure.java
index 175569f..6c164d6 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/FastdfsAutoConfigure.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/FastdfsAutoConfigure.java
@@ -53,7 +53,7 @@
}
@Override
- protected String FilePath(String imgType, String folderByDate) {
+ protected String FilePath(String imgType, String folderByDate,String hospitalId,String departmentId) {
return null;
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/QiniuOSSAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/QiniuOSSAutoConfigure.java
index ad5f769..ed5e0f2 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/QiniuOSSAutoConfigure.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/QiniuOSSAutoConfigure.java
@@ -96,7 +96,7 @@
}
@Override
- protected String FilePath(String imgType, String folderByDate) {
+ protected String FilePath(String imgType, String folderByDate,String hospitalId,String departmentId) {
return null;
}
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
index 4341125..3d67a91 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
@@ -68,8 +68,9 @@
* base64上传图片
*/
@PostMapping(value="baseUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public FileInfo baseUplaod(@RequestParam("file") String file,@RequestParam("imgType") String imgType){
- return fileService.baseUplaod(file,imgType);
+ public FileInfo baseUplaod(@RequestParam("file") String file,@RequestParam("imgType") String imgType,
+ @RequestParam("hospitalId") String hospitalId,@RequestParam("departmentId") String departmentId){
+ return fileService.baseUplaod(file,imgType,hospitalId,departmentId);
}
/**
* base64图片下载
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index 08deb28..c55c79a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -382,6 +382,9 @@
if (id > 0 && adminId > 0) {
Map<String, Object> map = new HashMap<>();
map.put("user_id", adminId);
+ map.put("is_admin_user",1);
+ map.put("is_del",0);
+ map.put("enable",1);
List<SysDoctor> sysDoctors = baseMapper.selectByMap(map);
if (sysDoctors == null || sysDoctors.size() <= 0) {
return ResultBody.failed("当前操作用户不是管理员");
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
index 1efe30b..1ea6e4f 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
@@ -97,7 +97,7 @@
//查询 科室
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("org_id", sysUserOrg.getOrgId());
queryWrapper.eq("is_del", 0);
queryWrapper.eq("enabled", 1);
List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
@@ -136,7 +136,7 @@
//查询 科室
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("org_id", sysUserOrg.getOrgId());
queryWrapper.eq("is_del", 0);
queryWrapper.eq("enabled", 1);
List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
index e914f47..08830dd 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
@@ -541,10 +541,7 @@
data) {
layer.closeAll('loading');
if (data.code == 0) {
- layer.msg(data.msg, {
- icon: 1,
- time: 2000
- });
+ layer.alert("密码重置为："+data.data, {icon: 1});
} else {
layer.msg(data.msg, {
icon: 2,
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
index f1f730f..51edbe0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
@@ -392,7 +392,7 @@
}
//获取销售代表
var getXiaoShouDaiBiao = function () {
- admin.req('api-user/users/getThisUserOrganizationUser', {}, function (data) {
+ admin.req('api-user/users/getAppointUser', {type:0}, function (data) {
layer.closeAll('loading');
if (0 === data.code) {
user = data.data;
--
Gitblit v1.8.0