From 6557baac627dce769c2b05ab482e4daf262a88ac Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 17 Jun 2020 17:34:01 +0800
Subject: [PATCH] 1.增加工具类 MultipartFileUtils ,支持将MultipartFile类型转换为file类型 2.增加缩略图相关全局配置变量：宽高和生成缩略图的暂存目录（缩略图上传成功后会删除） 3.修改文件上传中心的上传代码，将生成目录和aliyun上传方法抽离独立 4.增加医院logo上传支持接口（可返回缩略图地址） 5.修改登录后回去用户信息不完整bug
---
kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java b/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java
index 6fe6978..d24ee5c 100644
--- a/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java
+++ b/kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/DateMetaObjectHandler.java
@@ -30,7 +30,7 @@
private final static String UPDATE_USER_ID = "updateUserId";
private final static String CREATE_USER_NAME = "createUserName";
private final static String UPDATE_USER_NAME = "updateUserName";
- private final static String CREATE_USER_ORG_CODE = "createUserOrgCode";
+// private final static String CREATE_USER_ORG_CODE = "createUserOrgCode";
/**
* 插入填充，字段为空自动填充
@@ -43,8 +43,8 @@
Object updateUserId = getFieldValByName(UPDATE_USER_ID, metaObject);
Object createUserName = getFieldValByName(CREATE_USER_NAME, metaObject);
Object updateUserName = getFieldValByName(UPDATE_USER_NAME, metaObject);
- Object createUserOrgCode = getFieldValByName(CREATE_USER_ORG_CODE, metaObject);
- if (createTime == null || updateTime == null || createUserId == null || updateUserId == null || createUserName == null || updateUserName == null || createUserOrgCode == null) {
+// Object createUserOrgCode = getFieldValByName(CREATE_USER_ORG_CODE, metaObject);
+ if (createTime == null || updateTime == null || createUserId == null || updateUserId == null || createUserName == null || updateUserName == null ) {
Date date = new Date();
if (createTime == null) {
setFieldValByName(CREATE_TIME, date, metaObject);
@@ -58,13 +58,13 @@
setFieldValByName(CREATE_USER_NAME, request.getHeader(SecurityConstants.USER_HEADER), metaObject);
}
}
- if (createUserOrgCode == null) {
- if (request.getHeader(SecurityConstants.USER_ORGS_HEADER) != null) {
- //获取orgLevel等级高的
- List<SysOrganization> sysOrganizations = JSON.parseArray(request.getHeader(SecurityConstants.USER_ORGS_HEADER), SysOrganization.class);
- setFieldValByName(CREATE_USER_ORG_CODE,sysOrganizations.get(sysOrganizations.size()-1).getOrgCode() , metaObject);
- }
- }
+// if (createUserOrgCode == null) {
+// if (request.getHeader(SecurityConstants.USER_ORGS_HEADER) != null) {
+// //获取orgLevel等级高的
+// List<SysOrganization> sysOrganizations = JSON.parseArray(request.getHeader(SecurityConstants.USER_ORGS_HEADER), SysOrganization.class);
+// setFieldValByName(CREATE_USER_ORG_CODE,sysOrganizations.get(sysOrganizations.size()-1).getOrgCode() , metaObject);
+// }
+// }
}
}
@@ -77,8 +77,17 @@
@Override
public void updateFill(MetaObject metaObject) {
//mybatis-plus版本2.0.9+
- setFieldValByName(UPDATE_TIME, new Date(), metaObject);
- setFieldValByName(UPDATE_USER_ID, Long.valueOf(request.getHeader(SecurityConstants.USER_ID_HEADER).toString()), metaObject);
- setFieldValByName(UPDATE_USER_NAME, request.getHeader(SecurityConstants.USER_HEADER), metaObject);
+ Object updateTime = getFieldValByName(UPDATE_TIME, metaObject);
+ Object updateUserId = getFieldValByName(UPDATE_USER_ID, metaObject);
+ Object updateUserName = getFieldValByName(UPDATE_USER_NAME, metaObject);
+ if (updateTime == null) {
+ setFieldValByName(UPDATE_TIME, new Date(), metaObject);
+ }
+ if ((updateUserId == null) && (request.getHeader(SecurityConstants.USER_ID_HEADER) != null)) {
+ setFieldValByName(UPDATE_USER_ID, Long.valueOf(request.getHeader(SecurityConstants.USER_ID_HEADER).toString()), metaObject);
+ }
+ if ((updateUserName == null) && (request.getHeader(SecurityConstants.USER_HEADER) != null)) {
+ setFieldValByName(UPDATE_USER_NAME, request.getHeader(SecurityConstants.USER_HEADER), metaObject);
+ }
}
}
--
Gitblit v1.8.0