diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 4fdf3b0..c2c16bc 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -13,92 +13,92 @@ spring: #公司病案的文件服务数据库 master: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #公司病案的系统服务数据库 system: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_system?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #公司病案的基础服务数据库 record: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_medicalrecord?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #医院的用户/科室/基础数据的数据库 his: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #病理数据 bl: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电生理系统数据 ecg: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电子病历系统数据 emr: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #护理文书系统数据 hl: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #手麻系统数据 issubmit: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #lis系统数据 lis: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/lis?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #Pacs系统数据视图 pacs: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #vte静脉血栓栓塞症 vte: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #重症系统数据 zz: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -108,7 +108,7 @@ spring: # password: guest redis: host: redis.docus.cn - password: JSdocus@702 + # password: JSdocus@702 cloud: nacos: discovery: diff --git a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java index 246f5d5..943708f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java @@ -52,7 +52,7 @@ public class UserViewCollectJob extends AbstractCollectJob { public void doHandle(List results, String param) { //docus-BasicDataReceive同步user逻辑 Collection userNames = ListUtils.distinctSelect(results, UserDTO::getUserName); - List powerUsers = userService.findByList("userName", userNames); + List powerUsers = userService.findByList1("userName", userNames); List existUserNames = ListUtils.distinctSelect(powerUsers, PowerUser::getUserName); results.forEach(p -> { @@ -90,7 +90,7 @@ public class UserViewCollectJob extends AbstractCollectJob { } } userService.insertOrUpdatePowerUser(p); - PowerUser powerUser = userService.findOneBy("userName", userName); + PowerUser powerUser = userService.findOneBy1("userName", userName); PowerThirdLogin powerThirdLogin = new PowerThirdLogin(); powerThirdLogin.setId(idService.getDateSeq()); diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java index 740951e..361b390 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java @@ -39,6 +39,8 @@ public class CollectService { /** * 用户信息 + * + * @see TrackRetryListener 重试监听器 */ @TrackRetryListener("user") public void insertOrUpdateUser(UserDTO userDTO) { diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java index 165906c..76f356b 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java @@ -1,5 +1,6 @@ package com.docus.server.sys.service; +import com.docus.server.common.IService; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.common.pojo.entity.PowerUser; @@ -9,7 +10,7 @@ import java.util.List; /** * 用户服务 */ -public interface IPowerUserService { +public interface IPowerUserService extends IService { /** * 用户注册 * @@ -34,7 +35,7 @@ public interface IPowerUserService { void batchInsertOrUpdatePowerUser(List users); - PowerUser findOneBy(String userName, String userValue); + PowerUser findOneBy1(String userName, String userValue); - List findByList(String userName, Collection userNames); + List findByList1(String userName, Collection userNames); } diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java index bb35903..447aed4 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java @@ -2,6 +2,7 @@ package com.docus.server.sys.service.impl; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; +import com.docus.server.common.BaseService; import com.docus.server.common.config.UserProperties; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.common.pojo.dto.UserModifyParam; @@ -21,14 +22,20 @@ import java.util.List; * @author wyb */ @Service -public class PowerUserServiceImpl implements IPowerUserService { +public class PowerUserServiceImpl extends BaseService implements IPowerUserService { @Resource private IdService idService; @Resource private UserProperties userProperties; - @Resource + private IPowerUserDao userDao; + @Resource + public void setUserDao(IPowerUserDao userDao) { + super.setBaseDao(userDao); + this.userDao = userDao; + } + @Transactional @Override public void batchInsertOrUpdatePowerUser(List userDTOList) { @@ -36,12 +43,12 @@ public class PowerUserServiceImpl implements IPowerUserService { } @Override - public PowerUser findOneBy(String userName, String userValue) { + public PowerUser findOneBy1(String userName, String userValue) { return userDao.findOneBy(userName, userValue); } @Override - public List findByList(String userName, Collection values) { + public List findByList1(String userName, Collection values) { return userDao.findByList(userName, values); } diff --git a/docus-api-common/src/main/java/com/docus/server/common/BaseServiceImpl.java b/docus-api-common/src/main/java/com/docus/server/common/BaseService.java similarity index 82% rename from docus-api-common/src/main/java/com/docus/server/common/BaseServiceImpl.java rename to docus-api-common/src/main/java/com/docus/server/common/BaseService.java index 30f9c04..fb62615 100644 --- a/docus-api-common/src/main/java/com/docus/server/common/BaseServiceImpl.java +++ b/docus-api-common/src/main/java/com/docus/server/common/BaseService.java @@ -1,6 +1,6 @@ package com.docus.server.common; -public class BaseServiceImpl extends AbstractBaseService { +public class BaseService extends AbstractBaseService { protected IDao baseDao;