Browse Source

修改:增加CUSTOMER_ID的填充代码

dev_shibei_match
wxz 5 years ago
parent
commit
ec8259f0f4
  1. 8
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java
  2. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java
  3. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
  4. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java
  5. 17
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java
  6. 3
      epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
  7. 2
      epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml

8
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java

@ -51,6 +51,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
Date date = new Date(); Date date = new Date();
if (metaObject.getOriginalObject() instanceof BaseEpmetEntity) { if (metaObject.getOriginalObject() instanceof BaseEpmetEntity) {
// epmet项目新增的 // epmet项目新增的
setFieldValByName(FieldConstant.CUSTOMER_ID_HUMP, getCustomerIdByFieldValue(metaObject), metaObject);
setFieldValByName(FieldConstant.CREATED_TIME_HUMP, getCreatedTimeByFieldValue(metaObject), metaObject); setFieldValByName(FieldConstant.CREATED_TIME_HUMP, getCreatedTimeByFieldValue(metaObject), metaObject);
setFieldValByName(FieldConstant.CREATED_BY_HUMP, getCreatedByFieldValue(metaObject), metaObject); setFieldValByName(FieldConstant.CREATED_BY_HUMP, getCreatedByFieldValue(metaObject), metaObject);
setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, getUpdatedTimeByFieldValue(metaObject), metaObject); setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, getUpdatedTimeByFieldValue(metaObject), metaObject);
@ -95,6 +96,13 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
return value; return value;
} }
public Object getCustomerIdByFieldValue(MetaObject metaObject) {
if (metaObject.hasSetter(FieldConstant.CUSTOMER_ID_HUMP)) {
return loginUserUtil.getLoginUserCustomerId();
}
return null;
}
public Object getCreatedTimeByFieldValue(MetaObject metaObject) { public Object getCreatedTimeByFieldValue(MetaObject metaObject) {
Object createdTime = null; Object createdTime = null;
if (metaObject.hasGetter(FieldConstant.CREATED_TIME_HUMP)) { if (metaObject.hasGetter(FieldConstant.CREATED_TIME_HUMP)) {

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/BaseTokenDto.java

@ -24,6 +24,11 @@ public class BaseTokenDto {
*/ */
private String token; private String token;
/**
* 客户id
*/
private String customerId;
public BaseTokenDto() { public BaseTokenDto() {
} }

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java

@ -31,11 +31,6 @@ public class GovTokenDto extends BaseTokenDto implements Serializable {
*/ */
private String unionId; private String unionId;
/**
* 当前工作人员进入的客户id
*/
private String customerId;
/** /**
* 过期时间戳 * 过期时间戳
*/ */

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/TokenDto.java

@ -40,11 +40,6 @@ public class TokenDto extends BaseTokenDto implements Serializable {
*/ */
private long updateTime; private long updateTime;
/**
* 当前工作人员进入的客户id
*/
private String customerId;
@Override @Override
public String toString() { public String toString() {
return JSON.toJSONString(this); return JSON.toJSONString(this);

17
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java

@ -68,6 +68,23 @@ public class LoginUserUtil {
return client; return client;
} }
/**
* 获取用户customerId
* @return
*/
public String getLoginUserCustomerId() {
HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
if (request == null) {
return null;
}
String client = request.getHeader(AppClientConstant.CUSTOMER_ID);
if (StringUtils.isBlank(client)) {
return null;
}
return client;
}
/** /**
* 获取用户的部门ID列表 * 获取用户的部门ID列表
* @return * @return

3
epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java

@ -109,7 +109,8 @@ public class InternalAuthProcessor extends AuthProcessor {
.header(Constant.APP_USER_KEY, redisKey) .header(Constant.APP_USER_KEY, redisKey)
.header(AppClientConstant.APP,baseTokenDto.getApp()) .header(AppClientConstant.APP,baseTokenDto.getApp())
.header(AppClientConstant.CLIENT,baseTokenDto.getClient()) .header(AppClientConstant.CLIENT,baseTokenDto.getClient())
.header(AppClientConstant.USER_ID,baseTokenDto.getUserId()); .header(AppClientConstant.USER_ID,baseTokenDto.getUserId())
.header(AppClientConstant.CUSTOMER_ID,baseTokenDto.getCustomerId());
if (StringUtils.equals(baseTokenDto.getApp(), "gov")) {//工作端 if (StringUtils.equals(baseTokenDto.getApp(), "gov")) {//工作端
if(StringUtils.isNotBlank(customerId)){ if(StringUtils.isNotBlank(customerId)){

2
epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml

@ -139,7 +139,7 @@
</appender> </appender>
<!-- 开发、测试环境 --> <!-- 开发、测试环境 -->
<springProfile name="dev,test"> <springProfile name="dev,test,local">
<logger name="org.springframework.web" level="INFO"/> <logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/> <logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/> <logger name="com.epmet.dao" level="INFO"/>

Loading…
Cancel
Save