diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java index 0a42391..727d7ba 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java @@ -87,6 +87,7 @@ public class UsersServiceImpl extends ServiceImpl implements this.initPwd(user); Integer tag = userMapper.insert(user); + if(StrUtils.isNotEmpty(user.getDataOrgIds())){ String[] dataPermissionArray = user.getDataOrgIds().split(","); if (dataPermissionArray != null && dataPermissionArray.length > 0) { diff --git a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTableJob.java b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTableJob.java index 684079c..0e745aa 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTableJob.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncTableJob.java @@ -1,27 +1,18 @@ package com.lyms.cm.job; -import java.io.Serializable; import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.lyms.base.common.entity.sys.SyncDataBasic; import com.lyms.base.common.service.sys.SyncDataBasicService; import com.lyms.sync.ParamsAdpter; -import com.lyms.sync.SyncCallback; -import com.lyms.sync.SyncCenter; import com.lyms.sync.SyncHandler; -import com.lyms.sync.SyncCenter.Work; import com.lyms.sync.channel.ChannelData; -import com.lyms.sync.queue.SyncQueue; -import com.lyms.util.HttpUtils; import com.lyms.util.JsonUtils; /** @@ -40,8 +31,8 @@ public class SyncTableJob { public void excute() { List dataList = syncDataBasicService.selectList(new EntityWrapper().where("IFSUC=0")); - if(dataList != null ){ - log.debug("=======开始进行 SYNC_DATA_BASIC 表格数据的同步======="); + if(dataList != null && dataList.size() > 0){ + log.debug("=======开始进行本地 SYNC_DATA_BASIC 表格数据的同步======="); for(SyncDataBasic entity : dataList){ try{ ChannelData data = JsonUtils.jsonToBean(entity.getData(), ChannelData.class); @@ -54,7 +45,7 @@ public class SyncTableJob { entity.setIfsuc(1); syncDataBasicService.updateById(entity); }catch (Exception e) { - log.error("【SYNC_DATA_BASIC】表格数据的同步错误:SyncDataBasic = {} {}",JSONObject.toJSON(entity),e); + log.error("本地【SYNC_DATA_BASIC】表格数据的同步错误:SyncDataBasic = {} {}",JSONObject.toJSON(entity),e); } } } diff --git a/parent/center.manager/src/main/resources/logback.xml b/parent/center.manager/src/main/resources/logback.xml index f3cfe9f..b2f8423 100644 --- a/parent/center.manager/src/main/resources/logback.xml +++ b/parent/center.manager/src/main/resources/logback.xml @@ -30,9 +30,11 @@ - - - + + + + + @@ -44,6 +46,5 @@ - - + diff --git a/parent/core.sdk/src/main/java/com/lyms/aop/SysLogAop.java b/parent/core.sdk/src/main/java/com/lyms/aop/SysLogAop.java index 216bdfc..5a0350d 100644 --- a/parent/core.sdk/src/main/java/com/lyms/aop/SysLogAop.java +++ b/parent/core.sdk/src/main/java/com/lyms/aop/SysLogAop.java @@ -20,8 +20,8 @@ import org.springframework.web.context.request.ServletRequestAttributes; import com.alibaba.fastjson.JSON; -@Aspect -@Component +//@Aspect +//@Component public class SysLogAop { private static Logger logger = LoggerFactory.getLogger(SysLogAop.class); diff --git a/parent/core.sdk/src/main/java/com/lyms/util/remote/HttpRemote.java b/parent/core.sdk/src/main/java/com/lyms/util/remote/HttpRemote.java index 50d226b..6e108f2 100644 --- a/parent/core.sdk/src/main/java/com/lyms/util/remote/HttpRemote.java +++ b/parent/core.sdk/src/main/java/com/lyms/util/remote/HttpRemote.java @@ -3,6 +3,7 @@ package com.lyms.util.remote; import java.io.IOException; import java.util.Map; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.http.HttpEntity; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.methods.CloseableHttpResponse; @@ -46,7 +47,7 @@ public class HttpRemote extends AbsRemote { httpContext.getCookieStore().clear(); return responseUTF8(entity); } catch (Exception e) { - LOG.error("连接错误: " + e); + LOG.error("连接错误: " + e + " ChannelData: 【{}】",ToStringBuilder.reflectionToString(data)); } finally { try { if (response != null) { diff --git a/parent/hospital.web/src/main/resources/logback.xml b/parent/hospital.web/src/main/resources/logback.xml index cbd552f..02485f3 100644 --- a/parent/hospital.web/src/main/resources/logback.xml +++ b/parent/hospital.web/src/main/resources/logback.xml @@ -30,20 +30,20 @@ + + - - - +