mapper修改成dao层面

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<NoViewConfig> configs = collectionDto.getNoviewconfig();
         Map<String, Object> queuemerge = collectionDto.getQueuemerge();
-        List<CollectsysDictionary> collectsysDictionaries = afCollectSysDictionary.findAll();
+        List<CollectsysDictionary> collectsysDictionaries = collectSysDictionaryService.findCollectSysDictionarys();
         if (!StringUtils.isEmpty(syscodes)) {
             List<String> collectids = Arrays.asList(syscodes.split(","));
             collectsysDictionaries = collectsysDictionaries.stream().filter(t -> collectids.contains(t.getSysCode())).collect(Collectors.toList());

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<T> implements IJobResult<T> {
             }
         }
         log.debug("recordlog:{}", recordlog);
-        LambdaQueryWrapper<AfViewCollectionLog> queryWrapper = Wrappers.lambdaQuery();
+//        LambdaQueryWrapper<AfViewCollectionLog> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.in(AfViewCollectionLog::getJzh, jzhs).eq(AfViewCollectionLog::getSysCode, syscode);
+//        queryWrapper.in(AfViewCollectionLog::getJzh, jzhs).eq(AfViewCollectionLog::getSysCode, syscode);
-        List<AfViewCollectionLog> oldcollects = afViewCollectionLogService.find(queryWrapper);
+        List<AfViewCollectionLog> oldcollects = afViewCollectionLogService.findByJzhAndSysCode(jzhs, syscode);
 //        List<AfViewCollectionLog> oldcollects = getOldConllectionLog(jzhs, syscode);
         List<Map<String, Object>> newcollects = new ArrayList<>();
         List<AfViewCollectionLog> updates = new ArrayList<>();
@@ -290,8 +288,8 @@ public abstract class AbstractViewJobResultImpl<T> implements IJobResult<T> {
             }
         }
 
-        afViewCollectionLogService.saveOrUpdateBatch(adds);
+        afViewCollectionLogService.insertBatchAfViewCollectionLogs(adds);
-        afViewCollectionLogService.saveOrUpdateBatch(updates);
+        afViewCollectionLogService.insertBatchAfViewCollectionLogs(updates);
 
         return newcollects;
     }

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
+          username: docus
-          password: root
+          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
+          username: docus
-          password: root
+          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
+          username: docus
-          password: root
+          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:

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));

common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java

@@ -59,7 +59,7 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
             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<UserDTO> {
         }
 
         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<UserDTO> {
         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);
+        userService.insertOrUpdatePowerUser(p);
-        user.setPwd(pwd);
+        thirdLoginService.savePowerThirdLogin(powerThirdLogin);
-        thirdLoginService.updateById(user);
     }
 
 }

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

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<TaskOriginalMessage> {
+}

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<TaskOriginalMessageMapper, TaskOriginalMessage> implements ITaskOriginalMessageDao {
+}

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<TaskOriginalMessage> messages = messageService.findBy("state", StateEnum.FAIL);
+        List<TaskOriginalMessage> messages = messageService.findByState(StateEnum.FAIL);
 
         for (TaskOriginalMessage message : messages) {
             trackRetryService.doRetry(message);

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);

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<TaskOriginalMessage> {
+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<TaskOriginalMessage> findByState(StateEnum stateEnum);
+
 }

common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java

@@ -23,4 +23,5 @@ public class TrackRetryService {
 
         //to write retry log
     }
+
 }

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<TaskOriginalMessageMapper, TaskOriginalMessage> 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<TaskOriginal
     @Override
     public Long insertTaskOriginalMessage(String json, String xml, CollectTypeEnum collectType, String retryKey) {
         TaskOriginalMessage taskOriginalMessage = converter.toConvertTaskOriginalMessageDO(json, xml, collectType, retryKey);
-        super.save(taskOriginalMessage);
+        taskOriginalMessageDao.save(taskOriginalMessage);
         return taskOriginalMessage.getId();
     }
 
@@ -36,15 +38,18 @@ public class TaskOriginalMessageServiceImpl extends BaseServiceImpl<TaskOriginal
         if (null == id) {
             return;
         }
-        TaskOriginalMessage taskOriginalMessage = super.getById(id);
+        TaskOriginalMessage taskOriginalMessage = taskOriginalMessageDao.findById(id);
         if (Func.isNotEmpty(taskOriginalMessage)) {
             taskOriginalMessage.setJsonStr(json);
             taskOriginalMessage.setUpdateTime(DateUtil.now());
             taskOriginalMessage.setState(stateEnum);
-            if (Func.notNull(exMessageResult)) {
+            taskOriginalMessage.setErrorMsg(exMessageResult);
-                taskOriginalMessage.setErrorMsg(exMessageResult.length() > 500 ? exMessageResult.substring(0, 500) : exMessageResult);
+            taskOriginalMessageDao.updateById(taskOriginalMessage);
-            }
-            super.updateById(taskOriginalMessage);
         }
     }
+
+    @Override
+    public List<TaskOriginalMessage> findByState(StateEnum stateEnum) {
+        return taskOriginalMessageDao.findBy("state", stateEnum);
+    }
 }

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<CollectsysDictionary> {
+}

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<AfViewCollectionLog> {
+    List<AfViewCollectionLog> findByJzhAndSysCode(List<String> jzhs, String syscode);
+}

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<AfCollectSysDictionaryMapper, CollectsysDictionary> implements IAfCollectSysDictionaryDao {
+}

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<AfViewCollectionLogMapper, AfViewCollectionLog> implements IAfViewCollectionLogDao {
+
+    @Override
+    public List<AfViewCollectionLog> findByJzhAndSysCode(List<String> jzhs, String syscode) {
+        LambdaQueryWrapper<AfViewCollectionLog> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.in(AfViewCollectionLog::getJzh, jzhs).eq(AfViewCollectionLog::getSysCode, syscode);
+        return super.find(queryWrapper);
+    }
+
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionary.java

@@ -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<CollectsysDictionary> {
-}

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<CollectsysDictionary> findCollectSysDictionarys();
+
+
+}

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<AfViewCollectionLog> {
+public interface IAfViewCollectionLogService {
+
+    List<AfViewCollectionLog> findByJzhAndSysCode(List<String> jzhs, String syscode);
+
+    void insertBatchAfViewCollectionLogs(List<AfViewCollectionLog> collectionLogs);
+
 }

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.dao.IAfCollectSysDictionaryDao;
-import com.docus.server.archivefile.mapper.AfCollectSysDictionaryMapper;
 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<AfCollectSysDictionaryMapper, CollectsysDictionary> implements IAfCollectSysDictionary {
+public class AfCollectSysDictionaryImpl implements IAfCollectSysDictionaryService {
+    @Resource
+    private IAfCollectSysDictionaryDao collectSysDictionaryDao;
+
+    @Override
+    public List<CollectsysDictionary> findCollectSysDictionarys() {
+        return collectSysDictionaryDao.findAll();
+    }
 }

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.infrastructure.core.db.dao.IBaseDao;
-import com.docus.server.archivefile.mapper.AfViewCollectionLogMapper;
+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<AfViewCollectionLogMapper, AfViewCollectionLog> implements IAfViewCollectionLogService {
+public class AfViewCollectionLogServiceImpl implements IAfViewCollectionLogService {
+    @Resource
+    private IAfViewCollectionLogDao collectionLogDao;
 
+    @Override
+    public List<AfViewCollectionLog> findByJzhAndSysCode(List<String> jzhs, String syscode) {
+        return collectionLogDao.findByJzhAndSysCode(jzhs, syscode);
+    }
 
+    @Override
+    public void insertBatchAfViewCollectionLogs(List<AfViewCollectionLog> collectionLogs) {
+        collectionLogDao.saveOrUpdateBatch(collectionLogs, IBaseDao.DEFAULT_BATCH_SIZE);
+    }
 }

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<TBasic> {
+public interface ITBasicService {
 
     /**
      * 新增

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<TBasicMapper, TBasic> implements ITBasicService {
+public class TBasicServiceImpl implements ITBasicService {
 
     @Resource
     private TBasicMapper tBasicMapper;

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> {
+
+    PowerDept getDeptByDeptCode(String deptCode);
+
+    void addDept(DeptModifyParam deptModifyParam);
+
+    void updateDept(DeptModifyParam deptModifyParam);
+
+    void delDeptByDeptCode(String deptCode);
+}

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<PowerThirdLogin> {
+}

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<PowerUser> {
+public interface IPowerUserDao extends IBaseDao<PowerUser> {
 
     PowerUser getUserByUserName(String userName);
 

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<PowerDeptMapper, PowerDept> 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);
+    }
+}

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<PowerThirdLoginMapper, PowerThirdLogin> implements IPowerThirdLoginDao {
+}

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<PowerDept> {
+public interface IPowerDeptService {
 
     /**
      * 科室注册
@@ -30,4 +29,12 @@ public interface IPowerDeptService extends IBaseService<PowerDept> {
      * @param deptDTOList
      */
     void batchInsertOrUpdatePowerDept(List<DeptDTO> deptDTOList);
+
+    /**
+     * 通过deptcode 查询科室数据
+     *
+     * @param deptId
+     * @return
+     */
+    PowerDept findByDeptCode(String deptId);
 }

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;
+
 /**
  * <p>
  * 第三方登陆 服务类
@@ -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);
+
 }

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<PowerUser> {
+public interface IPowerUserService {
     /**
      * 用户注册
      *
@@ -35,7 +34,7 @@ public interface IPowerUserService extends IService<PowerUser> {
     void batchInsertOrUpdatePowerUser(List<UserDTO> users);
 
 
-    PowerUser findOneBy1(String userName, String userValue);
+    PowerUser findByUserName(String userValue);
 
     List<PowerUser> findByList1(String userName, Collection<Object> userNames);
 }

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<PowerDeptMapper, PowerDept> 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<PowerDeptMapper, Power
         deptDTOList.forEach(this::insertOrUpdatePowerDept);
     }
 
+    @Override
+    public PowerDept findByDeptCode(String deptId) {
+        return powerDeptDao.findOneBy("deptCode", deptId);
+    }
+
     @Transactional
     @Override
     public boolean insertOrUpdatePowerDept(DeptDTO deptDTO) {
-        PowerDept powerDept = baseMapper.getDeptByDeptCode(deptDTO.getDeptCode());
+        PowerDept powerDept = powerDeptDao.getDeptByDeptCode(deptDTO.getDeptCode());
         DeptModifyParam deptModifyParam = deptDTO.transDeptAddParam();
         if (Func.isEmpty(powerDept)) {
             long deptId = idService.getDateSeq();
             deptModifyParam.setDeptId(deptId);
-            baseMapper.addDept(deptModifyParam);
+            powerDeptDao.addDept(deptModifyParam);
             return true;
         }
         deptModifyParam.setDeptId(powerDept.getDeptId());
-        baseMapper.updateDept(deptModifyParam);
+        powerDeptDao.updateDept(deptModifyParam);
         return true;
     }
 
     @Transactional
     @Override
     public boolean delDeptByDeptCode(String deptCode) {
-        PowerDept powerDept = baseMapper.getDeptByDeptCode(deptCode);
+        PowerDept powerDept = powerDeptDao.getDeptByDeptCode(deptCode);
         if (Func.isEmpty(powerDept)) {
             return true;
         }
-        baseMapper.delDeptByDeptCode(deptCode);
+        powerDeptDao.delDeptByDeptCode(deptCode);
         return true;
     }
 }

common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java

@@ -1,8 +1,12 @@
 package com.docus.server.sys.service.impl;
 
+import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
+import com.docus.server.sys.infrastructure.dao.IPowerThirdLoginDao;
 import com.docus.server.sys.service.IPowerThirdLoginService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 第三方登陆 服务实现类
@@ -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);
+    }
 }
 

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<PowerUser> implements IPowerUserService {
+public class PowerUserServiceImpl implements IPowerUserService {
     @Resource
     private IdService idService;
     @Resource
     private UserProperties userProperties;
-
-    private IPowerUserDao userDao;
-
     @Resource
-    public void setUserDao(IPowerUserDao userDao) {
+    private IPowerUserDao userDao;
-        super.setBaseDao(userDao);
-        this.userDao = userDao;
-    }
 
     @Transactional
     @Override
@@ -43,8 +36,8 @@ public class PowerUserServiceImpl extends BaseService<PowerUser> implements IPow
     }
 
     @Override
-    public PowerUser findOneBy1(String userName, String userValue) {
+    public PowerUser findByUserName(String userValue) {
-        return userDao.findOneBy(userName, userValue);
+        return userDao.findOneBy("userName", userValue);
     }
 
     @Override