diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java index 633af87..b64d3b7 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java @@ -280,7 +280,7 @@ import java.util.concurrent.atomic.AtomicInteger; oneUser.setDepartmentName(getDepartmentFullPath(item.getId(), cacheDepartMap, parentCacheMap)); oneUser.setCorpId(corpId); // 设置企业ID //保存用户数据（支持重复调用：存在则更新，不存在则插入） - CorpUser existingUser = userMapper.selectById(oneUser.getUserid()); + CorpUser existingUser = userMapper.selectByUserId(oneUser.getUserid()); if (existingUser != null) { userMapper.updateById(oneUser); } else { diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CorpUserMapper.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CorpUserMapper.java index c26759a..471e606 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CorpUserMapper.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CorpUserMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.excel.wecom.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.excel.wecom.domain.CorpUser; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,5 +14,7 @@ import java.util.List; public interface CorpUserMapper extends BaseMapper { List selectAllUserIds(String corpId); + + CorpUser selectByUserId(@Param("userid") String userid); } diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/WecomTagService.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/WecomTagService.java index b3fb907..af22517 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/WecomTagService.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/WecomTagService.java @@ -46,7 +46,7 @@ public class WecomTagService { groupDomain.setOrderNo(tagGroup.getOrder()); groupDomain.setCorpId(corpId); // 设置企业ID //保存标签组（支持重复调用：存在则更新，不存在则插入） - WecomTagGroupDomain existingGroup = wecomTagGroupMapper.selectById(groupDomain.getTagGroupId()); + WecomTagGroupDomain existingGroup = wecomTagGroupMapper.selectByTagGroupId(corpId,groupDomain.getTagGroupId()); if (existingGroup != null) { wecomTagGroupMapper.updateById(groupDomain); } else { @@ -66,7 +66,7 @@ public class WecomTagService { tagDomain.setCorpId(corpId); // 设置企业ID // 插入标签（支持重复调用：存在则更新，不存在则插入） - WecomTagDomain existingTag = wecomTagMapper.selectById(tagDomain.getTagId()); + WecomTagDomain existingTag = wecomTagMapper.selectByTagId(corpId,tagDomain.getTagId()); if (existingTag != null) { wecomTagMapper.updateById(tagDomain); } else { diff --git a/excel-handle/src/main/resources/mapper/wecom/CorpUserMapper.xml b/excel-handle/src/main/resources/mapper/wecom/CorpUserMapper.xml index 8f480ee..eda6ff6 100644 --- a/excel-handle/src/main/resources/mapper/wecom/CorpUserMapper.xml +++ b/excel-handle/src/main/resources/mapper/wecom/CorpUserMapper.xml @@ -6,4 +6,8 @@ + + diff --git a/excel-handle/src/main/resources/mapper/wecom/WecomTagMapper.xml b/excel-handle/src/main/resources/mapper/wecom/WecomTagMapper.xml index b33da9f..ceab5f3 100644 --- a/excel-handle/src/main/resources/mapper/wecom/WecomTagMapper.xml +++ b/excel-handle/src/main/resources/mapper/wecom/WecomTagMapper.xml @@ -14,7 +14,7 @@ - id, tag_id, tag_group_id, name, create_time, order, sync_time + id, tag_id, tag_group_id, name, create_time, order_no, sync_time diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml new file mode 100644 index 0000000..8dee40d --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -0,0 +1,83 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://mysql-jijin-test:3306/excel-handle?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: jiong1114 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + + redis: + # 地址 + host: redis + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # 密码 + password: + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms