修改userviewjob保存逻辑和basicdatareveive.jar保持一致

collect-sdry/src/main/resources/bootstrap.yml

@@ -10,13 +10,20 @@ spring:
       primary: master #设置默认的数据源，默认值为master
       strict: false   #是否弃用严格模式，如果启用在味匹配到指定数据源时抛出异常
       datasource:
-        #公司病案的数据库
+        #公司病案的文件服务数据库
         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
           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
+          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
@@ -124,7 +131,7 @@ mybatis-plus:
       update-strategy: ignored
       field-strategy: NOT_EMPTY
       db-type: MYSQL
-  mapper-locations: classpath*:/baseMapper/*Mapper.xml,file:mybatis.baseMapper/**/*Mapper.xml
+  mapper-locations: classpath*:/mapper/*Mapper.xml,file:mybatis.mapper/**/*Mapper.xml
   type-enums-package: com.docus.server.collect.web.enums
 
 xxl:

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

@@ -1,18 +1,20 @@
 package com.docus.server.collect.user.view;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.docus.core.util.DateUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.docus.core.util.Func;
 import com.docus.core.util.ListUtils;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.his.service.IHisService;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.sys.common.pojo.entity.PowerDept;
+import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
 import com.docus.server.sys.common.pojo.entity.PowerUser;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -46,32 +48,35 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
 
     @Override
     public void batchInsertOrUpdate(List<UserDTO> t) {
-        int insertcount = 0;
+        Collection<Object> userNames = ListUtils.distinctSelect(t, UserDTO::getUserName);
-        int updatecount = 0;
+        List<PowerUser> powerUsers = userService.findByList("userName", userNames);
-        List<String> userNames = ListUtils.distinctSelect(t, UserDTO::getUserName);
-        LambdaQueryWrapper<PowerUser> query = Wrappers.lambdaQuery();
-        if (Func.isNotEmpty(userNames)) {
-            query.in(PowerUser::getUserName, userNames);
-        }
-        List<PowerUser> powerUsers = userService.getBaseMapper().selectList(query);
         List<String> existUserNames = ListUtils.distinctSelect(powerUsers, PowerUser::getUserName);
 
         t.forEach(p -> {
             String userName = p.getUserName();
             if (existUserNames.contains(userName)) {
-                powerThirdLoginService
+                PowerThirdLogin user = thirdLoginService.findOneBy("user", userName);
+                user.setPwd(p.getPwd());
+                thirdLoginService.updateById(user);
             } else {
-                long userid = 0;
+                p.setPwd(userProperties.getPassword());
-                insertcount += repositiory.SaveUser(o, userProperties.getDefpwd());
+                if (Func.isNotBlank(p.getDeptId())) {
-                userid = repositiory.getUserId(userName);
+                    PowerDept powerDept = deptService.findOneBy("deptCode", p.getDeptId());
-                long thirdid = SnowflakeIdWorker.generateId();
+                    p.setDeptId(powerDept.getDeptId().toString());
-                repositiory.SaveThirdLogin(thirdid, userid, userName, String.valueOf(o.get(PWDKey)));
+                }
+                userService.insertOrUpdatePowerUser(p);
+                PowerUser powerUser = userService.findOneBy("userName", userName);
+
+                PowerThirdLogin powerThirdLogin = new PowerThirdLogin();
+                powerThirdLogin.setId(idService.getDateSeq());
+                powerThirdLogin.setPowerUserId(powerUser.getUserId().toString());
+                powerThirdLogin.setUser(userName);
+                powerThirdLogin.setPwd(p.getPwd());
+                powerThirdLogin.setSource(0);
+                powerThirdLogin.setCreateTime(DateUtil.now());
+                thirdLoginService.save(powerThirdLogin);
             }
         });
-
-        log.info("本次" + businessName + "新增：" + insertcount + "笔;更新数据：" + updatecount + "笔");
-
-        userService.batchInsertOrUpdatePowerUser(t);
     }
 
     @Override

common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java

@@ -1,12 +1,14 @@
 package com.docus.server.collect.web.job;
 
 import com.docus.core.util.Func;
+import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.web.domain.TaskConfig;
 import com.docus.server.collect.web.enums.StateEnum;
 import com.docus.server.collect.web.service.ITaskConfigService;
 import com.docus.server.collect.web.utils.PeriodTime;
 import com.docus.server.record.service.ITBasicService;
+import com.docus.server.sys.common.UserProperties;
 import com.docus.server.sys.service.IPowerDeptService;
 import com.docus.server.sys.service.IPowerThirdLoginService;
 import com.docus.server.sys.service.IPowerUserService;
@@ -23,13 +25,17 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
     @Resource
     protected IPowerUserService userService;
     @Resource
-    protected IPowerThirdLoginService powerThirdLoginService;
+    protected IPowerThirdLoginService thirdLoginService;
     @Resource
     protected IPowerDeptService deptService;
     @Autowired
     protected ITBasicService basicService;
     @Resource
     protected ITaskConfigService taskConfigService;
+    @Resource
+    protected UserProperties userProperties;
+    @Resource
+    protected IdService idService;
 
     @Override
     public void startCollectAll(String taskConfigId) {

docus-sys/src/main/java/com/docus/server/sys/common/BaseServiceImpl.java

@@ -16,10 +16,11 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
-public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements IBaseService<T> {
+public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements IBaseService<T> {
 
-    private static final Logger logger = LoggerFactory.getLogger(BaseService.class);
+    private static final Logger logger = LoggerFactory.getLogger(BaseServiceImpl.class);
 
     @Override
     public T findById(String id) {
@@ -29,6 +30,7 @@ public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImp
         return baseMapper.selectById(id);
     }
 
+    @Override
     public List<T> findByIds(Collection<String> ids) {
         if (ids == null || ids.size() == 0) {
             return new ArrayList<>();
@@ -37,13 +39,24 @@ public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImp
     }
 
     /**
-     * 按字段查询，返回所有匹配的记录
+     * 按字段查询，返回所有匹配的记录, eq
      */
+    @Override
     public List<T> findBy(String propertyName, Object propertyValue) {
         String columnName = getColumnName(propertyName);
         return baseMapper.selectList(new QueryWrapper<T>().eq(columnName, propertyValue));
     }
 
+    /**
+     * 按字段查询，返回所有匹配的记录, in
+     */
+    @Override
+    public List<T> findByList(String propertyName, Collection<Object> propertyValue) {
+        String columnName = getColumnName(propertyName);
+        return baseMapper.selectList(new QueryWrapper<T>().in(!Objects.isNull(propertyName), columnName, propertyValue));
+    }
+
+    @Override
     public List<T> findActiveBy(String propertyName, Object propertyValue) {
         String columnName = getColumnName(propertyName);
         QueryWrapper<T> queryWrapper = new QueryWrapper<T>().eq(columnName, propertyValue);
@@ -52,6 +65,7 @@ public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImp
     }
 
     //返回所有匹配的记录并排序
+    @Override
     public List<T> findBy(String propertyName, Object propertyValue, Sort sort) {
         String columnName = getColumnName(propertyName);
         QueryWrapper<T> query = new QueryWrapper<T>().eq(columnName, propertyValue);
@@ -62,6 +76,7 @@ public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImp
     /**
      * 返回所有匹配的Active记录并排序
      */
+    @Override
     public List<T> findActiveBy(String propertyName, Object propertyValue, Sort sort) {
         String columnName = getColumnName(propertyName);
         QueryWrapper<T> query = new QueryWrapper<T>().eq(columnName, propertyValue);
@@ -70,48 +85,65 @@ public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImp
         return baseMapper.selectList(query);
     }
 
-    //按字段查询，返回第-条记录
+    @Override
     public T findOneBy(String propertyName, Object propertyValue) {
         String columnName = getColumnName(propertyName);
-        return baseMapper.selectOne(new QueryWrapper<T>().eq(columnName, propertyValue));
+        List<T> list = baseMapper.selectList(new QueryWrapper<T>().eq(columnName, propertyValue));
+        return (list == null || list.size() == 0) ? null : list.get(0);
+    }
+
+    @Override
+    public T findOneByList(String propertyName, Collection<Object> propertyValue) {
+        String columnName = getColumnName(propertyName);
+        List<T> list = baseMapper.selectList(new QueryWrapper<T>().eq(!Objects.isNull(propertyName), columnName, propertyValue));
+        return (list == null || list.size() == 0) ? null : list.get(0);
     }
 
     //按字段查询，返回第一条Active 记录
+    @Override
     public T findActiveOneBy(String propertyName, Object propertyValue) {
         String columnName = getColumnName(propertyName);
         QueryWrapper<T> queryWrapper = new QueryWrapper<T>().eq(columnName, propertyValue);
         queryWrapper.ne("state", 1);
-        return baseMapper.selectOne(queryWrapper);
+        List<T> list = baseMapper.selectList(queryWrapper);
+        return (list == null || list.size() == 0) ? null : list.get(0);
     }
 
     //* L ambda方式自由组合查询条件
+    @Override
     public List<T> find(LambdaQueryWrapper<T> queryWrapper) {
         return baseMapper.selectList(queryWrapper);
     }
 
     //L ambda方式自由组合查询条件，返回第一条记录
-    public T findone(LambdaQueryWrapper<T> queryWrapper) {
+    @Override
-        return baseMapper.selectOne(queryWrapper);
+    public T findOne(LambdaQueryWrapper<T> queryWrapper) {
+        List<T> list = baseMapper.selectList(queryWrapper);
+        return (list == null || list.size() == 0) ? null : list.get(0);
     }
 
     //返回表所有记录
+    @Override
     public List<T> findAll() {
         return baseMapper.selectList(null);
     }
 
     //返回表所有Active的记录
-    public List<T> findA1lActive() {
+    @Override
+    public List<T> findAllActive() {
         return baseMapper.selectList(Wrappers.<T>query().ne("state", 1));
     }
 
     //返回表所有记录并排序
-    public List<T> findA1l(Sort sort) {
+    @Override
+    public List<T> findAll(Sort sort) {
         QueryWrapper<T> query = new QueryWrapper<T>();
         buildSort(sort, query);
         return baseMapper.selectList(query);
     }
 
     //返回表所有Active记录并排序
+    @Override
     public List<T> findAllActive(Sort sort) {
         QueryWrapper<T> query = new QueryWrapper<T>();
         query.ne("state", 1);
@@ -134,6 +166,7 @@ public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImp
         }
     }
 
+    @Override
     public int deleteByIdList(List<String> idList) {
         if (idList == null || idList.size() == 0) {
             return 0;
@@ -161,4 +194,5 @@ public abstract class BaseService<M extends BaseMapper<T>, T> extends ServiceImp
         }
         throw new RuntimeException("获取不到属性" + propertyName + "的列名");
     }
+
 }

docus-sys/src/main/java/com/docus/server/sys/common/DSKeyConstants.java

@@ -0,0 +1,11 @@
+package com.docus.server.sys.common;
+
+/**
+ * @author linrf
+ * @date 2023/6/9 11:19
+ */
+public class DSKeyConstants {
+
+    public static final String DS_KEY = "system";
+
+}

docus-sys/src/main/java/com/docus/server/sys/common/IBaseService.java

@@ -1,5 +1,6 @@
 package com.docus.server.sys.common;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
@@ -7,16 +8,37 @@ import java.util.List;
 
 public interface IBaseService<T> extends IService<T> {
 
-    public T findById(String id);
+    T findById(String id);
 
-    public List<T> findByIds(Collection<String> ids);
+    List<T> findByIds(Collection<String> ids);
 
     public List<T> findBy(String propertyName, Object propertyValue);
 
-    public List<T> findActiveBy(String propertyName, Object propertyValue);
+    public List<T> findByList(String propertyName, Collection<Object> propertyValue);
 
-    public List<T> findBy(String propertyName, Object propertyValue, Sort sort);
+    List<T> findActiveBy(String propertyName, Object propertyValue);
 
-    public List<T> findActiveBy(String propertyName, Object propertyValue, Sort sort);
+    List<T> findBy(String propertyName, Object propertyValue, Sort sort);
 
+    List<T> findActiveBy(String propertyName, Object propertyValue, Sort sort);
+
+    T findOneBy(String propertyName, Object propertyValue);
+
+    T findOneByList(String propertyName, Collection<Object> propertyValue);
+
+    T findActiveOneBy(String propertyName, Object propertyValue);
+
+    List<T> find(LambdaQueryWrapper<T> queryWrapper);
+
+    T findOne(LambdaQueryWrapper<T> queryWrapper);
+
+    List<T> findAll();
+
+    List<T> findAllActive();
+
+    List<T> findAll(Sort sort);
+
+    List<T> findAllActive(Sort sort);
+
+    int deleteByIdList(List<String> idList);
 }

docus-sys/src/main/java/com/docus/server/sys/common/OperatorType.java

@@ -0,0 +1,9 @@
+package com.docus.server.sys.common;
+
+/**
+ * @author linrf
+ * @date 2023/6/12 15:27
+ */
+public enum OperatorType {
+    IN, EQ
+}

docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerDept.java

@@ -1,5 +1,6 @@
 package com.docus.server.sys.common.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,6 +28,7 @@ public class PowerDept implements Serializable {
     private Long deptId;
 
     @ApiModelProperty(value = "科室代码")
+    @TableField("dept_code")
     private String deptCode;
 
     @ApiModelProperty(value = "科室名称")

docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerThirdLogin.java

@@ -1,6 +1,7 @@
 package com.docus.server.sys.common.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +21,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="PowerThirdLogin对象", description="第三方登陆")
+@ApiModel(value = "PowerThirdLogin对象", description = "第三方登陆")
 public class PowerThirdLogin implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,6 +34,7 @@ public class PowerThirdLogin implements Serializable {
     private String powerUserId;
 
     @ApiModelProperty(value = "用户")
+    @TableField("user")
     private String user;
 
     @ApiModelProperty(value = "密码")

docus-sys/src/main/java/com/docus/server/sys/common/pojo/entity/PowerUser.java

@@ -1,6 +1,7 @@
 package com.docus.server.sys.common.pojo.entity;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,7 +12,7 @@ import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="PowerUser对象", description="用户表")
+@ApiModel(value = "PowerUser对象", description = "用户表")
 public class PowerUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -20,6 +21,7 @@ public class PowerUser implements Serializable {
     private Long userId;
 
     @ApiModelProperty(value = "登陆名")
+    @TableField("user_name")
     private String userName;
 
     @ApiModelProperty(value = "用户密码")
@@ -74,6 +76,7 @@ public class PowerUser implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "所属科室代码 多个以,分隔")
+    @TableField(exist = false)
     private String deptCode;
 
     @ApiModelProperty(value = "权限科室 拥有对科室查阅权限")

docus-sys/src/main/java/com/docus/server/sys/mapper/PowerDeptMapper.java

@@ -1,6 +1,8 @@
 package com.docus.server.sys.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.docus.server.sys.common.DSKeyConstants;
 import com.docus.server.sys.common.pojo.dto.DeptModifyParam;
 import com.docus.server.sys.common.pojo.entity.PowerDept;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,6 +17,7 @@ import org.apache.ibatis.annotations.Param;
  * @since 2023年2月25日22:28:58
  */
 @Mapper
+@DS(DSKeyConstants.DS_KEY)
 public interface PowerDeptMapper extends BaseMapper<PowerDept> {
 
     /**

docus-sys/src/main/java/com/docus/server/sys/mapper/PowerThirdLoginMapper.java

@@ -1,7 +1,10 @@
 package com.docus.server.sys.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.docus.server.sys.common.DSKeyConstants;
 import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +14,8 @@ import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
  * @author jiashi
  * @since 2021-04-26
  */
+@DS(DSKeyConstants.DS_KEY)
+@Mapper
 public interface PowerThirdLoginMapper extends BaseMapper<PowerThirdLogin> {
 
 }

docus-sys/src/main/java/com/docus/server/sys/mapper/PowerUserMapper.java

@@ -1,6 +1,8 @@
 package com.docus.server.sys.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.docus.server.sys.common.DSKeyConstants;
 import com.docus.server.sys.common.pojo.dto.UserModifyParam;
 import com.docus.server.sys.common.pojo.entity.PowerUser;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,6 +17,7 @@ import org.apache.ibatis.annotations.Param;
  * @since 2023年2月25日22:28:58
  */
 @Mapper
+@DS(DSKeyConstants.DS_KEY)
 public interface PowerUserMapper extends BaseMapper<PowerUser> {
 
     /**

docus-sys/src/main/java/com/docus/server/sys/service/IPowerDeptService.java

@@ -1,12 +1,12 @@
 package com.docus.server.sys.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.docus.server.sys.common.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 IService<PowerDept> {
+public interface IPowerDeptService extends IBaseService<PowerDept> {
 
     /**
      * 科室注册

docus-sys/src/main/java/com/docus/server/sys/service/IPowerThirdLoginService.java

@@ -1,6 +1,6 @@
 package com.docus.server.sys.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.docus.server.sys.common.IBaseService;
 import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
 
 /**
@@ -11,6 +11,6 @@ import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
  * @author jiashi
  * @since 2021-04-26
  */
-public interface IPowerThirdLoginService extends IService<PowerThirdLogin> {
+public interface IPowerThirdLoginService extends IBaseService<PowerThirdLogin> {
 
 }

docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java

@@ -1,6 +1,6 @@
 package com.docus.server.sys.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.docus.server.sys.common.IBaseService;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.sys.common.pojo.entity.PowerUser;
 
@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 用户服务
  */
-public interface IPowerUserService extends IService<PowerUser> {
+public interface IPowerUserService extends IBaseService<PowerUser> {
     /**
      * 用户注册
      *

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

@@ -1,8 +1,8 @@
 package com.docus.server.sys.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
+import com.docus.server.sys.common.BaseServiceImpl;
 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;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author wyb
  */
 @Service
-public class PowerDeptServiceImpl extends ServiceImpl<PowerDeptMapper, PowerDept> implements IPowerDeptService {
+public class PowerDeptServiceImpl extends BaseServiceImpl<PowerDeptMapper, PowerDept> implements IPowerDeptService {
     @Resource
     private IdService idService;
 

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

@@ -1,6 +1,6 @@
 package com.docus.server.sys.service.impl;
 
-import com.docus.server.sys.common.BaseService;
+import com.docus.server.sys.common.BaseServiceImpl;
 import com.docus.server.sys.common.pojo.entity.PowerThirdLogin;
 import com.docus.server.sys.mapper.PowerThirdLoginMapper;
 import com.docus.server.sys.service.IPowerThirdLoginService;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  * @since 2021-04-26
  */
 @Service
-public class PowerThirdLoginServiceImpl extends BaseService<PowerThirdLoginMapper, PowerThirdLogin> implements IPowerThirdLoginService {
+public class PowerThirdLoginServiceImpl extends BaseServiceImpl<PowerThirdLoginMapper, PowerThirdLogin> implements IPowerThirdLoginService {
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.docus.server.sys.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
+import com.docus.server.sys.common.BaseServiceImpl;
 import com.docus.server.sys.common.UserProperties;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.sys.common.pojo.dto.UserModifyParam;
@@ -21,7 +21,7 @@ import java.util.List;
  * @author wyb
  */
 @Service
-public class PowerUserServiceImpl extends ServiceImpl<PowerUserMapper, PowerUser> implements IPowerUserService {
+public class PowerUserServiceImpl extends BaseServiceImpl<PowerUserMapper, PowerUser> implements IPowerUserService {
     @Resource
     private IdService idService;
     @Resource

his-sysem/src/main/resources/mapper/HisUserMapper.xml

@@ -5,9 +5,10 @@
 <mapper namespace="com.docus.server.his.infrastructure.mapper.HisUserMapper">
 
     <select id="getUserListView" resultType="com.docus.server.sys.common.pojo.dto.UserDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_user`
+        SELECT `update_date` as update_time ,`user_name` as user_name,`name` as name,`dept_id` as dept_id
-        WHERE  update_time between #{startDate}  and  #{endDate}
+         ,`role_id` as role_id,`user_pwd` as pwd  FROM `his_user`
-        order by update_time asc
+        WHERE  update_date between #{startDate}  and  #{endDate}
+        order by update_date asc
         LIMIT #{offset}, #{pageSize}
     </select>