From e4efc2c6cec3de14aa7cfbc6f5e7469e90b707a4 Mon Sep 17 00:00:00 2001 From: linrf Date: Wed, 21 Jun 2023 11:51:59 +0800 Subject: [PATCH] =?UTF-8?q?mapper=E4=BF=AE=E6=94=B9=E6=88=90dao=E5=B1=82?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/noview/DefNoViewJobResultImpl.java | 6 ++-- .../view/AbstractViewJobResultImpl.java | 12 +++---- collect-sdry/src/main/resources/bootstrap.yml | 34 +++++++++---------- .../basic/http/test/TestRestController.java | 3 +- .../collect/user/view/UserViewCollectJob.java | 16 ++++----- .../collect/user/ws/impl/UserServerImpl.java | 4 +-- .../web/dao/ITaskOriginalMessageDao.java | 8 +++++ .../dao/impl/TaskOriginalMessageDaoImpl.java | 11 ++++++ .../server/collect/web/job/TrackRetryJob.java | 2 +- .../collect/web/process/VisitorProcessor.java | 2 +- .../service/ITaskOriginalMessageService.java | 8 +++-- .../web/service/TrackRetryService.java | 1 + .../impl/TaskOriginalMessageServiceImpl.java | 23 ++++++++----- .../dao/IAfCollectSysDictionaryDao.java | 7 ++++ .../dao/IAfViewCollectionLogDao.java | 10 ++++++ .../impl/AfCollectSysDictionaryDaoImpl.java | 11 ++++++ .../dao/impl/AfViewCollectionLogDaoImpl.java | 23 +++++++++++++ .../service/IAfCollectSysDictionary.java | 7 ---- .../IAfCollectSysDictionaryService.java | 12 +++++++ .../service/IAfViewCollectionLogService.java | 10 ++++-- .../impl/AfCollectSysDictionaryImpl.java | 17 +++++++--- .../impl/AfViewCollectionLogServiceImpl.java | 19 +++++++++-- .../server/record/service/ITBasicService.java | 4 +-- .../service/impl/TBasicServiceImpl.java | 3 +- .../sys/infrastructure/dao/IPowerDeptDao.java | 16 +++++++++ .../dao/IPowerThirdLoginDao.java | 7 ++++ .../sys/infrastructure/dao/IPowerUserDao.java | 4 +-- .../dao/impl/PowerDeptDaoImpl.java | 32 +++++++++++++++++ .../dao/impl/PowerThirdLoginDaoImpl.java | 11 ++++++ .../server/sys/service/IPowerDeptService.java | 11 ++++-- .../sys/service/IPowerThirdLoginService.java | 8 +++++ .../server/sys/service/IPowerUserService.java | 5 ++- .../service/impl/PowerDeptServiceImpl.java | 22 +++++++----- .../impl/PowerThirdLoginServiceImpl.java | 21 ++++++++++++ .../service/impl/PowerUserServiceImpl.java | 15 +++----- 35 files changed, 305 insertions(+), 100 deletions(-) create mode 100644 common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java create mode 100644 common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfCollectSysDictionaryDao.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfViewCollectionLogDao.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfViewCollectionLogDaoImpl.java delete mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java create mode 100644 common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java create mode 100644 common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerDeptDao.java create mode 100644 common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerThirdLoginDao.java create mode 100644 common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerDeptDaoImpl.java create mode 100644 common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerThirdLoginDaoImpl.java diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java index 6a0bca3..ddadb54 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.docus.core.util.Func; import com.docus.core.util.MapObjUtil; import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; -import com.docus.server.archivefile.service.IAfCollectSysDictionary; +import com.docus.server.archivefile.service.IAfCollectSysDictionaryService; import com.docus.server.collect.web.common.DocusProperties; import com.docus.server.collect.web.common.NoViewChNewbornProperties; import com.docus.server.collect.web.common.NoViewProperties; @@ -48,7 +48,7 @@ public class DefNoViewJobResultImpl @Resource(name = "defRedis") private RedisMq redisMq; @Resource - private IAfCollectSysDictionary afCollectSysDictionary; + private IAfCollectSysDictionaryService collectSysDictionaryService; @Resource private AmqpTemplate amqpTemplate; @Resource @@ -83,7 +83,7 @@ public class DefNoViewJobResultImpl String syscodes = collectionDto.getSyscodes(); List configs = collectionDto.getNoviewconfig(); Map queuemerge = collectionDto.getQueuemerge(); - List collectsysDictionaries = afCollectSysDictionary.findAll(); + List collectsysDictionaries = collectSysDictionaryService.findCollectSysDictionarys(); if (!StringUtils.isEmpty(syscodes)) { List collectids = Arrays.asList(syscodes.split(",")); collectsysDictionaries = collectsysDictionaries.stream().filter(t -> collectids.contains(t.getSysCode())).collect(Collectors.toList()); diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java index f698cb6..97e7798 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java @@ -2,8 +2,6 @@ package com.docus.server.collect.report.view; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.core.util.SpringUtils; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.api.IHospitalApi; @@ -239,9 +237,9 @@ public abstract class AbstractViewJobResultImpl implements IJobResult { } } log.debug("recordlog:{}", recordlog); - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.in(AfViewCollectionLog::getJzh, jzhs).eq(AfViewCollectionLog::getSysCode, syscode); - List oldcollects = afViewCollectionLogService.find(queryWrapper); +// LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); +// queryWrapper.in(AfViewCollectionLog::getJzh, jzhs).eq(AfViewCollectionLog::getSysCode, syscode); + List oldcollects = afViewCollectionLogService.findByJzhAndSysCode(jzhs, syscode); // List oldcollects = getOldConllectionLog(jzhs, syscode); List> newcollects = new ArrayList<>(); List updates = new ArrayList<>(); @@ -290,8 +288,8 @@ public abstract class AbstractViewJobResultImpl implements IJobResult { } } - afViewCollectionLogService.saveOrUpdateBatch(adds); - afViewCollectionLogService.saveOrUpdateBatch(updates); + afViewCollectionLogService.insertBatchAfViewCollectionLogs(adds); + afViewCollectionLogService.insertBatchAfViewCollectionLogs(updates); return newcollects; } diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index c2c16bc..4fdf3b0 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: root - password: root + username: docus + password: docus702 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: root - password: root + username: docus + password: docus702 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: root - password: root + username: docus + password: docus702 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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 + password: root@123456 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/basic/http/test/TestRestController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java index ee8858d..e783ab4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java @@ -11,6 +11,7 @@ import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.collect.web.service.ITaskOriginalMessageService; import com.docus.server.enums.CollectTypeEnum; +import com.docus.server.enums.StateEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -43,7 +44,7 @@ public class TestRestController { @ApiOperation("TEST-2") @GetMapping("/get2") public void get2() throws Exception { - TaskOriginalMessage message = messageService.findAll().get(0); + TaskOriginalMessage message = messageService.findByState(StateEnum.FAIL).get(0); IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey()); String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName(); Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name)); 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 943708f..3d0ef80 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 @@ -59,7 +59,7 @@ public class UserViewCollectJob extends AbstractCollectJob { String userName = p.getUserName(); String pwd = p.getPwd(); if (existUserNames.contains(userName)) { - updateThirdLogin(pwd, userName); + thirdLoginService.updateThirdLogin(pwd, userName); } else { insertUserAndThirdLogin(p, userName); } @@ -84,14 +84,13 @@ public class UserViewCollectJob extends AbstractCollectJob { } if (Func.isNotBlank(p.getDeptId())) { - PowerDept powerDept = deptService.findOneBy("deptCode", p.getDeptId()); + PowerDept powerDept = deptService.findByDeptCode(p.getDeptId()); if (!Objects.isNull(powerDept)) { p.setDeptId(String.valueOf(powerDept.getDeptId())); } } - userService.insertOrUpdatePowerUser(p); - PowerUser powerUser = userService.findOneBy1("userName", userName); + PowerUser powerUser = userService.findByUserName(userName); PowerThirdLogin powerThirdLogin = new PowerThirdLogin(); powerThirdLogin.setId(idService.getDateSeq()); powerThirdLogin.setPowerUserId(String.valueOf(powerUser.getUserId())); @@ -99,13 +98,10 @@ public class UserViewCollectJob extends AbstractCollectJob { powerThirdLogin.setPwd(p.getPwd()); powerThirdLogin.setSource(0); powerThirdLogin.setCreateTime(DateUtil.now()); - thirdLoginService.save(powerThirdLogin); - } - private void updateThirdLogin(String pwd, String userName) { - PowerThirdLogin user = thirdLoginService.findOneBy("user", userName); - user.setPwd(pwd); - thirdLoginService.updateById(user); + + userService.insertOrUpdatePowerUser(p); + thirdLoginService.savePowerThirdLogin(powerThirdLogin); } } diff --git a/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java index a5625b6..61ce5c9 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java @@ -6,9 +6,9 @@ import com.docus.log.context.TrackHelper; import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.collect.user.ws.IUserServer; -import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; +import com.docus.server.enums.CollectTypeEnum; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -21,7 +21,7 @@ import javax.annotation.Resource; * @see CollectTypeEnum 枚举 * @see IConverter 通用转化器 * @see IWsResult 通用返回结果 - * @see VisitorProcessor 通用处理器 + * @see VisitorProcessor#initBeans(String[]) 通用处理器 */ @Service @Slf4j diff --git a/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java b/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java new file mode 100644 index 0000000..2dea5ce --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java @@ -0,0 +1,8 @@ +package com.docus.server.collect.web.dao; + + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.collect.web.common.entity.TaskOriginalMessage; + +public interface ITaskOriginalMessageDao extends IBaseDao { +} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java new file mode 100644 index 0000000..3af5589 --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java @@ -0,0 +1,11 @@ +package com.docus.server.collect.web.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.collect.web.common.entity.TaskOriginalMessage; +import com.docus.server.collect.web.dao.ITaskOriginalMessageDao; +import com.docus.server.collect.web.mapper.TaskOriginalMessageMapper; +import org.springframework.stereotype.Repository; + +@Repository +public class TaskOriginalMessageDaoImpl extends BaseDaoImpl implements ITaskOriginalMessageDao { +} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java index a8ee536..11aeecb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/TrackRetryJob.java @@ -25,7 +25,7 @@ public class TrackRetryJob { @XxlJob("trackRetryJob") public void retry() throws Exception { - List messages = messageService.findBy("state", StateEnum.FAIL); + List messages = messageService.findByState(StateEnum.FAIL); for (TaskOriginalMessage message : messages) { trackRetryService.doRetry(message); diff --git a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java index 9c969bc..00f796c 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java @@ -82,7 +82,7 @@ public class VisitorProcessor extends AbstractProcessor { /** * 初始化bean */ - private void initBeans(String[] beanNames) { + public void initBeans(String[] beanNames) { this.converter = (IConverter) SpringUtils.getBean(beanNames[0]); this.result = (IResult) SpringUtils.getBean(beanNames[1]); this.messageService = SpringUtils.getBean(ITaskOriginalMessageService.class); diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java index 3e2ef3e..0d261e1 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java @@ -1,13 +1,17 @@ package com.docus.server.collect.web.service; -import com.docus.infrastructure.core.db.service.IBaseService; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; -public interface ITaskOriginalMessageService extends IBaseService { +import java.util.List; + +public interface ITaskOriginalMessageService { Long insertTaskOriginalMessage(String json, String xml, CollectTypeEnum collectType, String retryKey); void updateTaskOriginalMessage(Long id, String json, String exMessageResult, StateEnum stateEnum); + + List findByState(StateEnum stateEnum); + } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java index 4781d2d..57c267f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java @@ -23,4 +23,5 @@ public class TrackRetryService { //to write retry log } + } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java index 8a79870..18bf0cb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java @@ -2,10 +2,9 @@ package com.docus.server.collect.web.service.impl; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; -import com.docus.infrastructure.core.db.service.impl.BaseServiceImpl; import com.docus.server.collect.web.common.entity.TaskOriginalMessage; import com.docus.server.collect.web.convert.TaskOriginalMessageConverter; -import com.docus.server.collect.web.mapper.TaskOriginalMessageMapper; +import com.docus.server.collect.web.dao.ITaskOriginalMessageDao; import com.docus.server.collect.web.service.ITaskOriginalMessageService; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; @@ -13,11 +12,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.List; @Service -public class TaskOriginalMessageServiceImpl extends BaseServiceImpl implements ITaskOriginalMessageService { +public class TaskOriginalMessageServiceImpl implements ITaskOriginalMessageService { @Resource private TaskOriginalMessageConverter converter; + @Resource + private ITaskOriginalMessageDao taskOriginalMessageDao; /** * 新增 ws xml 原始报文 @@ -26,7 +28,7 @@ public class TaskOriginalMessageServiceImpl extends BaseServiceImpl 500 ? exMessageResult.substring(0, 500) : exMessageResult); - } - super.updateById(taskOriginalMessage); + taskOriginalMessage.setErrorMsg(exMessageResult); + taskOriginalMessageDao.updateById(taskOriginalMessage); } } + + @Override + public List findByState(StateEnum stateEnum) { + return taskOriginalMessageDao.findBy("state", stateEnum); + } } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfCollectSysDictionaryDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfCollectSysDictionaryDao.java new file mode 100644 index 0000000..0fd9cbb --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfCollectSysDictionaryDao.java @@ -0,0 +1,7 @@ +package com.docus.server.archivefile.dao; + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; + +public interface IAfCollectSysDictionaryDao extends IBaseDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfViewCollectionLogDao.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfViewCollectionLogDao.java new file mode 100644 index 0000000..5f6466a --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/IAfViewCollectionLogDao.java @@ -0,0 +1,10 @@ +package com.docus.server.archivefile.dao; + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; + +import java.util.List; + +public interface IAfViewCollectionLogDao extends IBaseDao { + List findByJzhAndSysCode(List jzhs, String syscode); +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java new file mode 100644 index 0000000..f58e09e --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java @@ -0,0 +1,11 @@ +package com.docus.server.archivefile.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.archivefile.dao.IAfCollectSysDictionaryDao; +import com.docus.server.archivefile.mapper.AfCollectSysDictionaryMapper; +import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; +import org.springframework.stereotype.Repository; + +@Repository +public class AfCollectSysDictionaryDaoImpl extends BaseDaoImpl implements IAfCollectSysDictionaryDao { +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfViewCollectionLogDaoImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfViewCollectionLogDaoImpl.java new file mode 100644 index 0000000..4311709 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfViewCollectionLogDaoImpl.java @@ -0,0 +1,23 @@ +package com.docus.server.archivefile.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.archivefile.dao.IAfViewCollectionLogDao; +import com.docus.server.archivefile.mapper.AfViewCollectionLogMapper; +import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public class AfViewCollectionLogDaoImpl extends BaseDaoImpl implements IAfViewCollectionLogDao { + + @Override + public List findByJzhAndSysCode(List jzhs, String syscode) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.in(AfViewCollectionLog::getJzh, jzhs).eq(AfViewCollectionLog::getSysCode, syscode); + return super.find(queryWrapper); + } + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java deleted file mode 100644 index 6af725b..0000000 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.docus.server.archivefile.service; - -import com.docus.infrastructure.core.db.service.IBaseService; -import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; - -public interface IAfCollectSysDictionary extends IBaseService { -} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java new file mode 100644 index 0000000..4d24516 --- /dev/null +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java @@ -0,0 +1,12 @@ +package com.docus.server.archivefile.service; + +import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; + +import java.util.List; + +public interface IAfCollectSysDictionaryService { + + List findCollectSysDictionarys(); + + +} diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java index f09acde..8c87cb9 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java @@ -1,11 +1,17 @@ package com.docus.server.archivefile.service; -import com.docus.infrastructure.core.db.service.IBaseService; import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; +import java.util.List; + /** * @author linrf * @date 2023/6/13 17:05 */ -public interface IAfViewCollectionLogService extends IBaseService { +public interface IAfViewCollectionLogService { + + List findByJzhAndSysCode(List jzhs, String syscode); + + void insertBatchAfViewCollectionLogs(List collectionLogs); + } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java index 820ef21..7c6db8d 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java @@ -1,11 +1,20 @@ package com.docus.server.archivefile.service.impl; -import com.docus.infrastructure.core.db.service.impl.BaseServiceImpl; -import com.docus.server.archivefile.mapper.AfCollectSysDictionaryMapper; +import com.docus.server.archivefile.dao.IAfCollectSysDictionaryDao; import com.docus.server.archivefile.pojo.entity.CollectsysDictionary; -import com.docus.server.archivefile.service.IAfCollectSysDictionary; +import com.docus.server.archivefile.service.IAfCollectSysDictionaryService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + @Service -public class AfCollectSysDictionaryImpl extends BaseServiceImpl implements IAfCollectSysDictionary { +public class AfCollectSysDictionaryImpl implements IAfCollectSysDictionaryService { + @Resource + private IAfCollectSysDictionaryDao collectSysDictionaryDao; + + @Override + public List findCollectSysDictionarys() { + return collectSysDictionaryDao.findAll(); + } } diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java index 6de2418..2bf74ed 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java @@ -1,17 +1,30 @@ package com.docus.server.archivefile.service.impl; -import com.docus.infrastructure.core.db.service.impl.BaseServiceImpl; -import com.docus.server.archivefile.mapper.AfViewCollectionLogMapper; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.archivefile.dao.IAfViewCollectionLogDao; import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog; import com.docus.server.archivefile.service.IAfViewCollectionLogService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** * @author linrf * @date 2023/6/13 17:06 */ @Service -public class AfViewCollectionLogServiceImpl extends BaseServiceImpl implements IAfViewCollectionLogService { +public class AfViewCollectionLogServiceImpl implements IAfViewCollectionLogService { + @Resource + private IAfViewCollectionLogDao collectionLogDao; + @Override + public List findByJzhAndSysCode(List jzhs, String syscode) { + return collectionLogDao.findByJzhAndSysCode(jzhs, syscode); + } + @Override + public void insertBatchAfViewCollectionLogs(List collectionLogs) { + collectionLogDao.saveOrUpdateBatch(collectionLogs, IBaseDao.DEFAULT_BATCH_SIZE); + } } diff --git a/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java b/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java index 91324c2..7b29dca 100644 --- a/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java +++ b/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/ITBasicService.java @@ -1,13 +1,11 @@ package com.docus.server.record.service; -import com.docus.infrastructure.core.db.service.IBaseService; import com.docus.server.record.common.pojo.dto.TBasicDTO; -import com.docus.server.record.common.pojo.entity.TBasic; import java.util.List; import java.util.Map; -public interface ITBasicService extends IBaseService { +public interface ITBasicService { /** * 新增 diff --git a/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java b/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java index 87d5ee9..55d0152 100644 --- a/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java +++ b/common-docus/docus-medical-record/src/main/java/com/docus/server/record/service/impl/TBasicServiceImpl.java @@ -3,7 +3,6 @@ package com.docus.server.record.service.impl; import cn.hutool.core.util.NumberUtil; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; -import com.docus.infrastructure.core.db.service.impl.BaseServiceImpl; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.record.common.pojo.dto.TBasicDTO; import com.docus.server.record.common.pojo.entity.TBasic; @@ -19,7 +18,7 @@ import java.util.List; import java.util.Map; @Service -public class TBasicServiceImpl extends BaseServiceImpl implements ITBasicService { +public class TBasicServiceImpl implements ITBasicService { @Resource private TBasicMapper tBasicMapper; diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerDeptDao.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerDeptDao.java new file mode 100644 index 0000000..311ebf9 --- /dev/null +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerDeptDao.java @@ -0,0 +1,16 @@ +package com.docus.server.sys.infrastructure.dao; + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.sys.common.pojo.dto.DeptModifyParam; +import com.docus.server.sys.common.pojo.entity.PowerDept; + +public interface IPowerDeptDao extends IBaseDao { + + PowerDept getDeptByDeptCode(String deptCode); + + void addDept(DeptModifyParam deptModifyParam); + + void updateDept(DeptModifyParam deptModifyParam); + + void delDeptByDeptCode(String deptCode); +} diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerThirdLoginDao.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerThirdLoginDao.java new file mode 100644 index 0000000..c2c16cd --- /dev/null +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerThirdLoginDao.java @@ -0,0 +1,7 @@ +package com.docus.server.sys.infrastructure.dao; + +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; + +public interface IPowerThirdLoginDao extends IBaseDao { +} diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerUserDao.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerUserDao.java index 12f6ed1..0828d18 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerUserDao.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/IPowerUserDao.java @@ -1,10 +1,10 @@ package com.docus.server.sys.infrastructure.dao; -import com.docus.server.common.IDao; +import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.server.sys.common.pojo.dto.UserModifyParam; import com.docus.server.sys.common.pojo.entity.PowerUser; -public interface IPowerUserDao extends IDao { +public interface IPowerUserDao extends IBaseDao { PowerUser getUserByUserName(String userName); diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerDeptDaoImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerDeptDaoImpl.java new file mode 100644 index 0000000..43d0717 --- /dev/null +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerDeptDaoImpl.java @@ -0,0 +1,32 @@ +package com.docus.server.sys.infrastructure.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.sys.common.pojo.dto.DeptModifyParam; +import com.docus.server.sys.common.pojo.entity.PowerDept; +import com.docus.server.sys.infrastructure.dao.IPowerDeptDao; +import com.docus.server.sys.infrastructure.mapper.PowerDeptMapper; +import org.springframework.stereotype.Repository; + +@Repository +public class PowerDeptDaoImpl extends BaseDaoImpl implements IPowerDeptDao { + + @Override + public PowerDept getDeptByDeptCode(String deptCode) { + return baseMapper.getDeptByDeptCode(deptCode); + } + + @Override + public void addDept(DeptModifyParam deptModifyParam) { + baseMapper.addDept(deptModifyParam); + } + + @Override + public void updateDept(DeptModifyParam deptModifyParam) { + baseMapper.updateDept(deptModifyParam); + } + + @Override + public void delDeptByDeptCode(String deptCode) { + baseMapper.delDeptByDeptCode(deptCode); + } +} diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerThirdLoginDaoImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerThirdLoginDaoImpl.java new file mode 100644 index 0000000..f138e27 --- /dev/null +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerThirdLoginDaoImpl.java @@ -0,0 +1,11 @@ +package com.docus.server.sys.infrastructure.dao.impl; + +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; +import com.docus.server.sys.infrastructure.dao.IPowerThirdLoginDao; +import com.docus.server.sys.infrastructure.mapper.PowerThirdLoginMapper; +import org.springframework.stereotype.Repository; + +@Repository +public class PowerThirdLoginDaoImpl extends BaseDaoImpl implements IPowerThirdLoginDao { +} diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java index 03a420a..198041d 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java @@ -1,12 +1,11 @@ package com.docus.server.sys.service; -import com.docus.infrastructure.core.db.service.IBaseService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.entity.PowerDept; import java.util.List; -public interface IPowerDeptService extends IBaseService { +public interface IPowerDeptService { /** * 科室注册 @@ -30,4 +29,12 @@ public interface IPowerDeptService extends IBaseService { * @param deptDTOList */ void batchInsertOrUpdatePowerDept(List deptDTOList); + + /** + * 通过deptcode 查询科室数据 + * + * @param deptId + * @return + */ + PowerDept findByDeptCode(String deptId); } diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java index 14d2bc3..2e93f9d 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java @@ -1,5 +1,7 @@ package com.docus.server.sys.service; +import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; + /** *

* 第三方登陆 服务类 @@ -10,4 +12,10 @@ package com.docus.server.sys.service; */ public interface IPowerThirdLoginService { + void savePowerThirdLogin(PowerThirdLogin powerThirdLogin); + + PowerThirdLogin findByUserName(String userName); + + void updateThirdLogin(String pwd, String userName); + } 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 76f356b..eb02341 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,6 +1,5 @@ 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; @@ -10,7 +9,7 @@ import java.util.List; /** * 用户服务 */ -public interface IPowerUserService extends IService { +public interface IPowerUserService { /** * 用户注册 * @@ -35,7 +34,7 @@ public interface IPowerUserService extends IService { void batchInsertOrUpdatePowerUser(List users); - PowerUser findOneBy1(String userName, String userValue); + PowerUser findByUserName(String userValue); List findByList1(String userName, Collection userNames); } diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java index af937dd..efc5da5 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerDeptServiceImpl.java @@ -1,12 +1,11 @@ package com.docus.server.sys.service.impl; import com.docus.core.util.Func; -import com.docus.infrastructure.core.db.service.impl.BaseServiceImpl; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.docus.server.sys.common.pojo.dto.DeptModifyParam; import com.docus.server.sys.common.pojo.entity.PowerDept; -import com.docus.server.sys.infrastructure.mapper.PowerDeptMapper; +import com.docus.server.sys.infrastructure.dao.IPowerDeptDao; import com.docus.server.sys.service.IPowerDeptService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,9 +19,11 @@ import java.util.List; * @author wyb */ @Service -public class PowerDeptServiceImpl extends BaseServiceImpl implements IPowerDeptService { +public class PowerDeptServiceImpl implements IPowerDeptService { @Resource private IdService idService; + @Resource + private IPowerDeptDao powerDeptDao; @Transactional @Override @@ -30,30 +31,35 @@ public class PowerDeptServiceImpl extends BaseServiceImpl * 第三方登陆 服务实现类 @@ -13,7 +17,24 @@ import org.springframework.stereotype.Service; */ @Service public class PowerThirdLoginServiceImpl implements IPowerThirdLoginService { + @Resource + private IPowerThirdLoginDao powerThirdLoginDao; + + @Override + public void savePowerThirdLogin(PowerThirdLogin powerThirdLogin) { + powerThirdLoginDao.save(powerThirdLogin); + } + @Override + public PowerThirdLogin findByUserName(String userName) { + return powerThirdLoginDao.findOneBy("user", userName); + } + @Override + public void updateThirdLogin(String pwd, String userName) { + PowerThirdLogin user = findByUserName(userName); + user.setPwd(pwd); + powerThirdLoginDao.updateById(user); + } } 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 447aed4..84d9263 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,7 +2,6 @@ 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; @@ -22,19 +21,13 @@ import java.util.List; * @author wyb */ @Service -public class PowerUserServiceImpl extends BaseService implements IPowerUserService { +public class PowerUserServiceImpl implements IPowerUserService { @Resource private IdService idService; @Resource private UserProperties userProperties; - - private IPowerUserDao userDao; - @Resource - public void setUserDao(IPowerUserDao userDao) { - super.setBaseDao(userDao); - this.userDao = userDao; - } + private IPowerUserDao userDao; @Transactional @Override @@ -43,8 +36,8 @@ public class PowerUserServiceImpl extends BaseService implements IPow } @Override - public PowerUser findOneBy1(String userName, String userValue) { - return userDao.findOneBy(userName, userValue); + public PowerUser findByUserName(String userValue) { + return userDao.findOneBy("userName", userValue); } @Override