From 349b894466d625ebde32ecb1a821b4d88ca87de7 Mon Sep 17 00:00:00 2001
From: bynt <13586541001@163.com>
Date: Fri, 26 Jul 2024 15:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=BB=91=E8=BF=81=E7=A7=BBdubbo?=
=?UTF-8?q?=E6=9C=8D=E5=8A=A1=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 96 ++++-
.../callback/CallbackController.java | 2 +-
.../pc/CommunityResourceController.java | 21 +-
.../pc/CommunityRobotInfoController.java | 7 +-
.../pc/CustomMethodsController.java | 7 +-
.../pc/CustomerAddFriendController.java | 5 -
.../customer/business/helper/WebHelper.java | 6 +-
.../interceptor/TokenInterceptor.java | 3 +-
...CommunityCustomerDataStatisticsMapper.java | 1 -
...CommunityCustomerGroupInviteLogMapper.java | 1 -
.../mapper/CommunityCustomerGroupMapper.java | 1 -
.../mapper/CommunityCustomerWordsMapper.java | 1 -
.../mapper/CommunityProjectVersionMapper.java | 3 +-
.../mapper/CommunityRobotBlacklistMapper.java | 3 +-
.../mapper/CommunityRobotCustomerMapper.java | 3 +-
.../CommunityRobotDataStatisticsMapper.java | 1 -
.../mapper/CommunityRobotInfoMapper.java | 1 -
.../mapper/CommunityRobotNoticeLogMapper.java | 1 -
.../CommunityRobotSupportConfigMapper.java | 3 +-
.../mapper/CommunityRobotWxGroupMapper.java | 3 +-
.../CommunityRobotWxGroupMemberMapper.java | 3 +-
.../mapper/CommunityRobotWxInfoMapper.java | 3 +-
.../CommunityRobotWxLabelListMapper.java | 1 -
.../mapper/CommunityRobotWxLabelMapper.java | 1 -
.../mapper/CommunityStaticResourceMapper.java | 3 +-
.../mapper/CommunityTextResourceMapper.java | 5 +-
.../mapper/CommunityUpdateLogMapper.java | 3 +-
.../mapper/CommunityXcxAccountMapper.java | 1 -
.../mapper/CommunityXcxResourceMapper.java | 2 +-
.../mapper/TblCustomerConfigMapper.java | 3 +-
.../mapper/TblCustomerSupportMapper.java | 3 +-
.../business/mapper/TblShieldUserMapper.java | 3 +-
.../mapper/TblWxAddFriendLogMapper.java | 3 +-
...TblWxAddFriendRequestContentLogMapper.java | 3 +-
.../mapper/TblWxConversationMapper.java | 3 +-
...blWxFriendCircleCommentUserListMapper.java | 3 +-
.../mapper/TblWxFriendCircleMapper.java | 3 +-
.../business/mapper/TblWxMessageMapper.java | 3 +-
.../business/pojo/bo/CustomerResourceBo.java | 2 +
.../pojo/entity/CommunityCustomerGroup.java | 2 +-
.../CommunityCustomerGroupInviteLog.java | 2 +-
.../entity/CommunityCustomerJoinRobot.java | 9 +-
.../entity/CommunityCustomerMsgCountLog.java | 7 +-
.../entity/CommunityCustomerVisibleRange.java | 2 +-
.../pojo/entity/CommunityCustomerWords.java | 2 +-
.../pojo/entity/CommunityProjectVersion.java | 8 +-
.../pojo/entity/CommunityRobotBlacklist.java | 13 +-
.../pojo/entity/CommunityRobotCustomer.java | 2 +-
.../entity/CommunityRobotSupportConfig.java | 2 +-
.../pojo/entity/CommunityRobotWxGroup.java | 10 +-
.../entity/CommunityRobotWxGroupMember.java | 5 +-
.../pojo/entity/CommunityRobotWxInfo.java | 96 +----
.../pojo/entity/CommunityRobotWxLabel.java | 2 +-
.../entity/CommunityRobotWxLabelList.java | 7 +-
.../pojo/entity/CommunityStaticResource.java | 10 +-
.../pojo/entity/CommunityTextResource.java | 57 ---
.../pojo/entity/CommunityUpdateLog.java | 12 +-
.../pojo/entity/CommunityXcxResource.java | 7 +-
.../business/pojo/entity/StaticResource.java | 87 +++++
.../pojo/entity/TblCustomerConfig.java | 4 +-
.../pojo/entity/TblWxConversation.java | 6 +-
.../business/pojo/entity/TblWxMessage.java | 2 +-
.../business/pojo/model/BaseEntity.java | 47 +++
.../business/pojo/model/BaseServiceImpl.java | 334 ++++++++++++++++++
.../business/pojo/vo/AddFriendRequestVo.java | 1 -
.../service/QwMessageHelpService.java | 2 +-
.../business/service/QwTransferService.java | 8 +-
.../TblCustomerSupportServiceImpl.java | 4 +-
.../service/TblShieldUserServiceImpl.java | 2 +-
.../service/TblWxMessageServiceImpl.java | 4 +-
.../service/WxMessageHelpService.java | 2 +-
.../business/service/WxTransferService.java | 6 +-
.../CommunityCardResourceServiceImpl.java | 2 +-
.../CommunityCustomerInfoServiceImpl.java | 79 ++---
...CommunityCustomerJoinRobotServiceImpl.java | 2 +-
...mmunityCustomerMsgCountLogServiceImpl.java | 2 +-
.../CommunityDockingConfigServiceImpl.java | 4 +-
.../CommunityRobotBlacklistServiceImpl.java | 2 +-
.../CommunityRobotCustomerServiceImpl.java | 5 +-
.../impl/CommunityRobotInfoServiceImpl.java | 2 +-
...ommunityRobotWxGroupMemberServiceImpl.java | 14 +-
.../CommunityRobotWxGroupServiceImpl.java | 6 +-
.../impl/CommunityRobotWxInfoServiceImpl.java | 4 +-
.../CommunityRobotWxLabelServiceImpl.java | 2 -
.../CommunityStaticResourceServiceImpl.java | 4 +-
.../CommunityTextResourceServiceImpl.java | 25 +-
.../impl/CommunityUpdateLogServiceImpl.java | 2 +-
.../impl/CommunityXcxResourceServiceImpl.java | 2 +-
.../impl/TblWxAddFriendLogServiceImpl.java | 2 +-
.../service/msg/impl/WxMsgNodeService.java | 2 +-
.../common/cache/CaffeineCacheHelper.java | 1 -
.../constant/enums/phone/MsgTypeEnum.java | 2 +-
.../constant/enums/phone/QwMsgTypeEnum.java | 2 +-
.../converter/JsonStringArrayTypeHandler.java | 62 ++++
.../sc/customer/common/minio/MinioConfig.java | 12 +-
.../sc/customer/common/minio/MinioUtil.java | 27 --
.../common/utils/Base64ToMultipartFile.java | 6 +-
.../sc/customer/common/utils/DateUtil.java | 16 +-
.../sc/customer/common/utils/FileUtils.java | 13 +-
.../sc/customer/common/utils/ImgUtils.java | 3 -
.../common/utils/ObjConvertUtils.java | 4 +-
.../sc/customer/common/utils/SignUtil.java | 5 -
.../sc/customer/common/utils/StringUtil.java | 28 +-
.../sc/customer/common/utils/XmlUtils.java | 4 -
.../framework/config/MybatisPlusConfig.java | 6 +-
.../helper/callback/PhoneCallbackHelper.java | 2 +-
.../helper/callback/WxCallbackHelper.java | 7 +-
.../helper/callback/core/CacheDataHelper.java | 2 +-
.../callback/core/RequestCoreHelper.java | 1 -
.../helper/callback/ext/FissionQwHelper.java | 2 +-
.../helper/callback/ext/FissionWxHelper.java | 2 +-
.../eco/sc/customer/helper/qny/QnyParam.java | 2 -
.../helper/rpc/FissionCustomerHelper.java | 4 +-
.../helper/rpc/RpcCustomerMsgServiceImpl.java | 3 +-
.../RpcCustomerVisibleRangesServiceImpl.java | 7 +-
.../helper/ChannelHandlerContextHelper.java | 5 +-
.../ClipBoardTalkToFriendTaskHelper.java | 2 +-
.../rpc/helper/ConversationReadHelper.java | 2 +-
.../helper/RequestChatRoomInfoTaskHelper.java | 2 +-
.../helper/RequestTalkDetailTaskHelper.java | 2 +-
.../rpc/helper/TalkToFriendTaskHelper.java | 16 +-
.../helper/TriggerChatroomPushTaskHelper.java | 2 +-
.../TriggerConversationPushTaskHelper.java | 4 +-
.../helper/TriggerFriendPushTaskHelper.java | 2 +-
.../TriggerHistoryMsgPushTaskHelper.java | 2 +-
.../qw/QwClipBoardTalkToFriendTaskHelper.java | 2 +-
.../helper/qw/QwTalkToFriendTaskHelper.java | 2 +-
src/main/resources/bootstrap.yml | 52 +--
src/main/resources/log4j.properties | 4 +
src/main/resources/logback-client.xml | 69 ----
src/main/resources/logback-spring.xml | 88 +++++
131 files changed, 1006 insertions(+), 618 deletions(-)
delete mode 100644 src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityTextResource.java
create mode 100644 src/main/java/com/eco/sc/customer/business/pojo/entity/StaticResource.java
create mode 100644 src/main/java/com/eco/sc/customer/business/pojo/model/BaseEntity.java
create mode 100644 src/main/java/com/eco/sc/customer/business/pojo/model/BaseServiceImpl.java
create mode 100644 src/main/java/com/eco/sc/customer/common/converter/JsonStringArrayTypeHandler.java
create mode 100644 src/main/resources/log4j.properties
delete mode 100644 src/main/resources/logback-client.xml
create mode 100644 src/main/resources/logback-spring.xml
diff --git a/pom.xml b/pom.xml
index da933a9..be2fd0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,12 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
+
+
+ jsr311-api
+ javax.ws.rs
+
+
@@ -55,6 +61,14 @@
org.springframework.boot
spring-boot-starter-tomcat
+
+ log4j-to-slf4j
+ org.apache.logging.log4j
+
+
+ logback-classic
+ ch.qos.logback
+
@@ -85,6 +99,7 @@
mysql
mysql-connector-java
+ 8.0.20
@@ -282,6 +297,14 @@
hutool-all
cn.hutool
+
+ lombok
+ org.projectlombok
+
+
+ fastjson
+ com.alibaba
+
@@ -321,6 +344,14 @@
xxl-job-core
com.xuxueli
+
+ lombok
+ org.projectlombok
+
+
+ fastjson
+ com.alibaba
+
@@ -362,6 +393,55 @@
common
0.0.1
+
+
+
+ org.apache.dubbo
+ dubbo-rpc-rest
+ 2.7.3
+
+
+ commons-logging
+ commons-logging
+
+
+ fastjson
+ com.alibaba
+
+
+ javassist
+ org.javassist
+
+
+ objenesis
+ org.objenesis
+
+
+ kryo
+ com.esotericsoftware
+
+
+ netty-all
+ io.netty
+
+
+ resteasy-jaxrs
+ org.jboss.resteasy
+
+
+
+
+
+
+ org.jboss.resteasy
+ resteasy-jaxrs
+ 3.6.3.Final
+
+
+
+ ch.qos.logback
+ logback-classic
+
@@ -480,7 +560,7 @@
local
172.18.0.228:8848
d5123679-020d-46d6-8ac8-f17bdd08e8e2
-
+ classpath:logback-spring.xml
true
@@ -488,12 +568,12 @@
- inner
+ dev
- inner
- 172.18.0.228:8848
- d5123679-020d-46d6-8ac8-f17bdd08e8e2
-
+ dev
+ 127.0.0.1:8848
+ 981765f6-2a67-4031-8aac-2f78b6e6a559
+ classpath:logback-spring.xml
true
@@ -506,7 +586,7 @@
prod
172.18.0.228:8848
d5123679-020d-46d6-8ac8-f17bdd08e8e2
- classpath:logback-client.xml
+ classpath:logback-spring.xml
@@ -516,7 +596,7 @@
prod_wss
172.18.0.228:8848
d5123679-020d-46d6-8ac8-f17bdd08e8e2
- classpath:logback-client.xml
+ classpath:logback-spring.xml
diff --git a/src/main/java/com/eco/sc/customer/business/controller/callback/CallbackController.java b/src/main/java/com/eco/sc/customer/business/controller/callback/CallbackController.java
index b3647fd..0787cb3 100644
--- a/src/main/java/com/eco/sc/customer/business/controller/callback/CallbackController.java
+++ b/src/main/java/com/eco/sc/customer/business/controller/callback/CallbackController.java
@@ -32,7 +32,7 @@ public class CallbackController {
@Resource
private PcWxCallbackHelper pcWxCallbackHelper;
- @PostMapping(value = {"/wxCallback/wx", "/api/wxCallback"})
+ @PostMapping(value = {"/wxCallback/wx", "/api/wechat/callback"})
public ServerResponse> handlerWxCallback(@RequestBody String body) {
CallbackInfo callbackInfo = JSONObject.parseObject(body, CallbackInfo.class);
wxCallbackHelper.dispatchCallBack(callbackInfo);
diff --git a/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityResourceController.java b/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityResourceController.java
index 72be9bd..6001226 100644
--- a/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityResourceController.java
+++ b/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityResourceController.java
@@ -1,16 +1,15 @@
package com.eco.sc.customer.business.controller.pc;
-import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.base.entity.CommunityCustomerInfo;
+import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.sc.customer.business.pojo.bo.CustomerResourceBo;
import com.eco.sc.customer.business.service.impl.*;
import com.eco.sc.customer.common.ResultInfo;
-import com.eco.common.base.enums.WxContentTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -38,7 +37,7 @@ public class CommunityResourceController {
/**
* 素材库
*/
- @RequestMapping(value = "/listByType", method = RequestMethod.POST)
+ @PostMapping(value = "/listByType")
public ResultInfo resource(@RequestBody PageParam pageParam) {
CustomerResourceBo entity = pageParam.getEntity();
@@ -47,19 +46,7 @@ public class CommunityResourceController {
if (communityCustomerInfo == null) {
return ResultInfo.fail("客服不存在!");
}
- if (entity.getContentTypeEnum().getNumber() == WxContentTypeEnum.Text.getNumber()) {
- return ResultInfo.success(communityTextResourceService.search(pageParam, communityCustomerInfo));
- } else if (entity.getContentTypeEnum().getNumber() == WxContentTypeEnum.Picture.getNumber()
- || entity.getContentTypeEnum().getNumber() == WxContentTypeEnum.Video.getNumber()
- || entity.getContentTypeEnum().getNumber() == WxContentTypeEnum.Voice.getNumber()) {
- return ResultInfo.success(communityStaticResourceService.search(pageParam, entity.getContentTypeEnum(), communityCustomerInfo));
- } else if (entity.getContentTypeEnum().getNumber() == WxContentTypeEnum.Link.getNumber()) {
- return ResultInfo.success(communityCardResourceService.search(pageParam, communityCustomerInfo));
- } else if (entity.getContentTypeEnum().getNumber() == WxContentTypeEnum.WeApp.getNumber()) {
- return ResultInfo.success(communityXcxResourceService.search(pageParam, communityCustomerInfo));
- }
-
- return ResultInfo.fail("未知素材类型");
+ return ResultInfo.success(communityTextResourceService.search(pageParam, communityCustomerInfo));
}
}
diff --git a/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityRobotInfoController.java b/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityRobotInfoController.java
index 5320240..d4f38ab 100644
--- a/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityRobotInfoController.java
+++ b/src/main/java/com/eco/sc/customer/business/controller/pc/CommunityRobotInfoController.java
@@ -1,14 +1,9 @@
package com.eco.sc.customer.business.controller.pc;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.eco.common.commonbase.mybatis.PageParam;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotInfo;
import com.eco.sc.customer.business.service.impl.CommunityRobotInfoServiceImpl;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
-
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
diff --git a/src/main/java/com/eco/sc/customer/business/controller/pc/CustomMethodsController.java b/src/main/java/com/eco/sc/customer/business/controller/pc/CustomMethodsController.java
index 63aa096..fd2465f 100644
--- a/src/main/java/com/eco/sc/customer/business/controller/pc/CustomMethodsController.java
+++ b/src/main/java/com/eco/sc/customer/business/controller/pc/CustomMethodsController.java
@@ -5,16 +5,19 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.eco.common.base.dto.SupportCustomerDto;
+import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.base.vo.ConversationVo;
import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.commonbase.utils.CollectionUtil;
-import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.fission.common.pojo.vo.CustomerGroupVo;
import com.eco.fission.common.pojo.vo.CustomerSysWordsRepVo;
import com.eco.sc.customer.business.helper.WebHelper;
import com.eco.sc.customer.business.pojo.bo.AddGroupBo;
import com.eco.sc.customer.business.pojo.bo.AddToWhitelistBo;
-import com.eco.sc.customer.business.pojo.dto.*;
+import com.eco.sc.customer.business.pojo.dto.AddFriendDto;
+import com.eco.sc.customer.business.pojo.dto.AddTalkDto;
+import com.eco.sc.customer.business.pojo.dto.DeleteTalkDto;
+import com.eco.sc.customer.business.pojo.dto.PrivateMsgDto;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotCustomer;
import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendLog;
import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendRequestContentLog;
diff --git a/src/main/java/com/eco/sc/customer/business/controller/pc/CustomerAddFriendController.java b/src/main/java/com/eco/sc/customer/business/controller/pc/CustomerAddFriendController.java
index 22cfd29..8ca66ed 100644
--- a/src/main/java/com/eco/sc/customer/business/controller/pc/CustomerAddFriendController.java
+++ b/src/main/java/com/eco/sc/customer/business/controller/pc/CustomerAddFriendController.java
@@ -2,18 +2,13 @@ package com.eco.sc.customer.business.controller.pc;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.eco.common.commonbase.entity.dto.ServerResponse;
-import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.fission.common.param.enums.WxAddTypeEnum;
import com.eco.fission.common.pojo.bo.CustomerAddFriendTaskBo;
-import com.eco.fission.common.rpc.RpcCustomerAddFriendService;
import com.eco.sc.customer.business.pojo.bo.AddFriendInfoDto;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
import com.eco.sc.customer.business.service.impl.CommunityRobotWxInfoServiceImpl;
import com.eco.sc.customer.common.ResultInfo;
import com.eco.sc.customer.framework.exception.ServiceException;
-import org.apache.dubbo.config.annotation.Reference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/eco/sc/customer/business/helper/WebHelper.java b/src/main/java/com/eco/sc/customer/business/helper/WebHelper.java
index 69021fb..1172b56 100644
--- a/src/main/java/com/eco/sc/customer/business/helper/WebHelper.java
+++ b/src/main/java/com/eco/sc/customer/business/helper/WebHelper.java
@@ -2,13 +2,14 @@ package com.eco.sc.customer.business.helper;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
-import com.eco.common.commonbase.utils.CollectionUtil;
+import com.eco.common.base.dto.SupportCustomerDto;
import com.eco.common.base.entity.CommunityCustomerInfo;
+import com.eco.common.base.enums.WxContentTypeEnum;
+import com.eco.common.commonbase.utils.CollectionUtil;
import com.eco.common.rpc.NettyConnectionService;
import com.eco.fission.common.pojo.dto.task.CustomerDto;
import com.eco.fission.common.pojo.dto.task.DeviceDto;
import com.eco.sc.customer.business.pojo.dto.PrivateMsgDto;
-import com.eco.common.base.dto.SupportCustomerDto;
import com.eco.sc.customer.business.pojo.entity.TblCustomerConfig;
import com.eco.sc.customer.business.pojo.entity.TblWxConversation;
import com.eco.sc.customer.business.pojo.entity.TblWxMessage;
@@ -25,7 +26,6 @@ import com.eco.sc.customer.business.service.impl.CommunityUpdateLogServiceImpl;
import com.eco.sc.customer.common.ResultInfo;
import com.eco.sc.customer.common.cache.CaffeineCacheHelper;
import com.eco.sc.customer.common.constant.enums.PushTypeEnum;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.WxEnumMsgType;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.common.utils.ObjConvertUtils;
diff --git a/src/main/java/com/eco/sc/customer/business/interceptor/TokenInterceptor.java b/src/main/java/com/eco/sc/customer/business/interceptor/TokenInterceptor.java
index 7f1f5fb..fba57fa 100644
--- a/src/main/java/com/eco/sc/customer/business/interceptor/TokenInterceptor.java
+++ b/src/main/java/com/eco/sc/customer/business/interceptor/TokenInterceptor.java
@@ -43,11 +43,11 @@ public class TokenInterceptor implements HandlerInterceptor {
private static final List URL_WHITE = Arrays.asList(
"/fileUpload2020",
"/wxCallback/wx",
- "/api/wxCallback",
"/wxCallback/pcwx",
"/wxCallback/qw",
"/wxCallback/phone",
"/wxCallback/phoneQw",
+ "/api/wechat/callback",
"/wxCallback/requestFriend",
"/wxCallback/tgRequestFriend",
"/community-docking-config/bindUrl",
@@ -68,6 +68,7 @@ public class TokenInterceptor implements HandlerInterceptor {
if (URL_WHITE.contains(string)) {
return true;
}
+
if (StringUtils.isEmpty(token)) {
fillTokenUnauthorizedResponse(response);
return false;
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerDataStatisticsMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerDataStatisticsMapper.java
index 6520153..9730421 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerDataStatisticsMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerDataStatisticsMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerDataStatistics;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupInviteLogMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupInviteLogMapper.java
index 04fe241..60859ad 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupInviteLogMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupInviteLogMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerGroupInviteLog;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupMapper.java
index 9862ec0..09e2410 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerGroupMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerGroup;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerWordsMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerWordsMapper.java
index 7a910ef..00f5e49 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerWordsMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityCustomerWordsMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerWords;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityProjectVersionMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityProjectVersionMapper.java
index 85931d3..5a868e6 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityProjectVersionMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityProjectVersionMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityProjectVersion;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityProjectVersion;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotBlacklistMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotBlacklistMapper.java
index 20a25d6..7e39c10 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotBlacklistMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotBlacklistMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotBlacklist;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityRobotBlacklist;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotCustomerMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotCustomerMapper.java
index c67eff3..3a7504c 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotCustomerMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotCustomerMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotCustomer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityRobotCustomer;
/**
* 客户表 Mapper 接口
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotDataStatisticsMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotDataStatisticsMapper.java
index e026cc9..91e4abe 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotDataStatisticsMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotDataStatisticsMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotDataStatistics;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotInfoMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotInfoMapper.java
index be2884a..b30e449 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotInfoMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotInfoMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotInfo;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotNoticeLogMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotNoticeLogMapper.java
index 22deceb..c1705c6 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotNoticeLogMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotNoticeLogMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotNoticeLog;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotSupportConfigMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotSupportConfigMapper.java
index 7089f32..f3cba72 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotSupportConfigMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotSupportConfigMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotSupportConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityRobotSupportConfig;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMapper.java
index 5644c14..330a9a5 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroup;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroup;
/**
* 微信群管理 Mapper 接口
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMemberMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMemberMapper.java
index 9442ac0..064d991 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMemberMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxGroupMemberMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroupMember;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroupMember;
/**
* 微信群内成员 Mapper 接口
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxInfoMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxInfoMapper.java
index ee34012..abc3454 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxInfoMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxInfoMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelListMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelListMapper.java
index d9fdcb0..16bcc00 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelListMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelListMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxLabelList;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelMapper.java
index ee53599..69e7eb2 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityRobotWxLabelMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxLabel;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityStaticResourceMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityStaticResourceMapper.java
index 7233c5f..2e43449 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityStaticResourceMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityStaticResourceMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityStaticResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityStaticResource;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityTextResourceMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityTextResourceMapper.java
index 085bb5c..871eafc 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityTextResourceMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityTextResourceMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityTextResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.StaticResource;
/**
*
@@ -13,6 +12,6 @@ import org.springframework.stereotype.Repository;
* @since 2023-02-20
*/
-public interface CommunityTextResourceMapper extends BaseMapper {
+public interface CommunityTextResourceMapper extends BaseMapper {
}
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityUpdateLogMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityUpdateLogMapper.java
index 12181ca..d91f6d7 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityUpdateLogMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityUpdateLogMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityUpdateLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.CommunityUpdateLog;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxAccountMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxAccountMapper.java
index fd091f9..407fa98 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxAccountMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxAccountMapper.java
@@ -2,7 +2,6 @@ package com.eco.sc.customer.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityXcxAccount;
-import org.springframework.stereotype.Repository;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxResourceMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxResourceMapper.java
index 0e7eaa9..2a121c7 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxResourceMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/CommunityXcxResourceMapper.java
@@ -1,7 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.CommunityXcxResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.eco.sc.customer.business.pojo.entity.CommunityXcxResource;
import org.springframework.stereotype.Repository;
/**
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerConfigMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerConfigMapper.java
index 190fb78..bf97308 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerConfigMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerConfigMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblCustomerConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.TblCustomerConfig;
/**
* 客服会话配置 Mapper 接口
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerSupportMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerSupportMapper.java
index 5cc29a7..076fed6 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerSupportMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblCustomerSupportMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblCustomerSupport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.TblCustomerSupport;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblShieldUserMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblShieldUserMapper.java
index f1c55d1..c035e02 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblShieldUserMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblShieldUserMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblShieldUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.TblShieldUser;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendLogMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendLogMapper.java
index ec72b79..e616678 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendLogMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendLogMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendLog;
/**
* 新添加的联系人表 Mapper 接口
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendRequestContentLogMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendRequestContentLogMapper.java
index 33887f5..5ff9731 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendRequestContentLogMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblWxAddFriendRequestContentLogMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendRequestContentLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendRequestContentLog;
/**
* 新添加联系人打招呼内容记录 Mapper 接口
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblWxConversationMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblWxConversationMapper.java
index 606fc17..a22ccd5 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblWxConversationMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblWxConversationMapper.java
@@ -1,9 +1,8 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblWxConversation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.eco.sc.customer.business.pojo.entity.TblWxConversation;
import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
import java.util.Collection;
import java.util.List;
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleCommentUserListMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleCommentUserListMapper.java
index 1fbc567..69af5a0 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleCommentUserListMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleCommentUserListMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblWxFriendCircleCommentUserList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.TblWxFriendCircleCommentUserList;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleMapper.java
index bdcf374..a0058c2 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblWxFriendCircleMapper.java
@@ -1,8 +1,7 @@
package com.eco.sc.customer.business.mapper;
-import com.eco.sc.customer.business.pojo.entity.TblWxFriendCircle;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import com.eco.sc.customer.business.pojo.entity.TblWxFriendCircle;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/mapper/TblWxMessageMapper.java b/src/main/java/com/eco/sc/customer/business/mapper/TblWxMessageMapper.java
index bb6f3bc..e663149 100644
--- a/src/main/java/com/eco/sc/customer/business/mapper/TblWxMessageMapper.java
+++ b/src/main/java/com/eco/sc/customer/business/mapper/TblWxMessageMapper.java
@@ -1,10 +1,9 @@
package com.eco.sc.customer.business.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.eco.sc.customer.business.pojo.dto.RobotCustomerChatCountDto;
import com.eco.sc.customer.business.pojo.entity.TblWxMessage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/bo/CustomerResourceBo.java b/src/main/java/com/eco/sc/customer/business/pojo/bo/CustomerResourceBo.java
index 1457e8f..2168266 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/bo/CustomerResourceBo.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/bo/CustomerResourceBo.java
@@ -12,6 +12,8 @@ public class CustomerResourceBo {
private String kfAccount;
+ private Integer type;
+
/**
* {@link WxContentTypeEnum}
*/
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroup.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroup.java
index c9623e2..c81cf10 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroup.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroup.java
@@ -15,7 +15,7 @@ import lombok.Setter;
*/
@Setter
@Getter
-@TableName(value = "community_customer_group",autoResultMap = true)
+@TableName(value = "tb_customer_group",autoResultMap = true)
public class CommunityCustomerGroup extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroupInviteLog.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroupInviteLog.java
index 7f0164d..72fe74c 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroupInviteLog.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerGroupInviteLog.java
@@ -16,7 +16,7 @@ import lombok.Setter;
*/
@Setter
@Getter
-@TableName(value = "community_customer_group_invite_log",autoResultMap = true)
+@TableName(value = "tb_customer_group_invite_log",autoResultMap = true)
public class CommunityCustomerGroupInviteLog extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerJoinRobot.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerJoinRobot.java
index c2477da..f0c833e 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerJoinRobot.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerJoinRobot.java
@@ -1,11 +1,10 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Setter;
import lombok.Getter;
-import lombok.EqualsAndHashCode;
+import lombok.Setter;
/**
*
@@ -17,7 +16,7 @@ import lombok.EqualsAndHashCode;
*/
@Setter
@Getter
-@TableName(value = "community_customer_join_robot",autoResultMap = true)
+@TableName(value = "tb_customer_join_robot",autoResultMap = true)
public class CommunityCustomerJoinRobot extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -38,7 +37,7 @@ public class CommunityCustomerJoinRobot extends BaseEntity {
* 机器人ID
*/
@TableField("robot_id")
- private Integer robotId;
+ private Long robotId;
/**
* 机器人微信ID
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerMsgCountLog.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerMsgCountLog.java
index 7fe5992..2353143 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerMsgCountLog.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerMsgCountLog.java
@@ -1,11 +1,10 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Setter;
import lombok.Getter;
-import lombok.EqualsAndHashCode;
+import lombok.Setter;
/**
*
@@ -17,7 +16,7 @@ import lombok.EqualsAndHashCode;
*/
@Setter
@Getter
-@TableName(value = "community_customer_msg_count_log",autoResultMap = true)
+@TableName(value = "tb_customer_msg_count_log",autoResultMap = true)
public class CommunityCustomerMsgCountLog extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerVisibleRange.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerVisibleRange.java
index 652cbf9..ce15dde 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerVisibleRange.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerVisibleRange.java
@@ -15,7 +15,7 @@ import lombok.Setter;
*/
@Setter
@Getter
-@TableName(value = "community_customer_visible_range", autoResultMap = true)
+@TableName(value = "tb_customer_visible_range", autoResultMap = true)
public class CommunityCustomerVisibleRange extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerWords.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerWords.java
index 08456a2..12e282c 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerWords.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityCustomerWords.java
@@ -16,7 +16,7 @@ import lombok.Setter;
*/
@Setter
@Getter
-@TableName(value = "community_customer_words",autoResultMap = true)
+@TableName(value = "tb_customer_words",autoResultMap = true)
public class CommunityCustomerWords extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityProjectVersion.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityProjectVersion.java
index 3c1fd97..d912d7d 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityProjectVersion.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityProjectVersion.java
@@ -3,11 +3,7 @@ package com.eco.sc.customer.business.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
import java.util.Date;
@@ -23,7 +19,7 @@ import java.util.Date;
@Builder
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName(value = "community_project_version", autoResultMap = true)
+@TableName(value = "tb_project_version", autoResultMap = true)
public class CommunityProjectVersion extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotBlacklist.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotBlacklist.java
index ff3c29a..a28cda6 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotBlacklist.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotBlacklist.java
@@ -1,16 +1,11 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.Getter;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+
+import java.time.LocalDateTime;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotCustomer.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotCustomer.java
index 52a0f01..dca33f5 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotCustomer.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotCustomer.java
@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Setter
@Getter
-@TableName(value = "community_robot_customer", autoResultMap = true)
+@TableName(value = "tb_robot_customer", autoResultMap = true)
public class CommunityRobotCustomer extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotSupportConfig.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotSupportConfig.java
index 3e99a32..4fabeb6 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotSupportConfig.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotSupportConfig.java
@@ -20,7 +20,7 @@ import java.util.List;
*/
@Setter
@Getter
-@TableName(value = "community_robot_support_config",autoResultMap = true)
+@TableName(value = "tb_robot_support_config",autoResultMap = true)
public class CommunityRobotSupportConfig extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroup.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroup.java
index c454b01..5f56012 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroup.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroup.java
@@ -2,7 +2,7 @@ package com.eco.sc.customer.business.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.eco.common.commonbase.mybatis.BaseEntity;
+import com.eco.sc.customer.business.pojo.model.BaseEntity;
import lombok.Getter;
import lombok.Setter;
@@ -18,7 +18,7 @@ import java.util.Date;
*/
@Setter
@Getter
-@TableName(value = "community_robot_wx_group", autoResultMap = true)
+@TableName(value = "tb_wechat_group", autoResultMap = true)
public class CommunityRobotWxGroup extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -119,11 +119,7 @@ public class CommunityRobotWxGroup extends BaseEntity {
@TableField("chat_room_type")
private Integer chatRoomType;
- /**
- * 企业群ID
- */
- @TableField("corp_id")
- private String corpId;
+
/**
* 企业群名称
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroupMember.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroupMember.java
index 48df5c7..e1888e9 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroupMember.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxGroupMember.java
@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
*/
@Setter
@Getter
-@TableName(value = "community_robot_wx_group_member", autoResultMap = true)
+@TableName(value = "tb_wechat_group_member", autoResultMap = true)
public class CommunityRobotWxGroupMember extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -190,5 +190,8 @@ public class CommunityRobotWxGroupMember extends BaseEntity {
@TableField("wx_identity")
private String wxIdentity;
+ @TableField("group_id")
+ private Long groupId;
+
}
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxInfo.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxInfo.java
index 2552207..d36a79c 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxInfo.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxInfo.java
@@ -2,15 +2,14 @@ package com.eco.sc.customer.business.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.sc.customer.business.pojo.model.BaseEntity;
import lombok.*;
import java.time.LocalDateTime;
import java.util.List;
/**
- *
* 机器人微信相关信息
*
*
@@ -22,7 +21,7 @@ import java.util.List;
@Builder
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName(value = "community_robot_wx_info",autoResultMap = true)
+@TableName(value = "tb_wechat_account", autoResultMap = true)
public class CommunityRobotWxInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -48,8 +47,8 @@ public class CommunityRobotWxInfo extends BaseEntity {
/**
* 首次登录时间
*/
- @TableField("first_login_time")
- private LocalDateTime firstLoginTime;
+ @TableField("login_date")
+ private LocalDateTime loginDate;
/**
* 微信id
@@ -60,86 +59,27 @@ public class CommunityRobotWxInfo extends BaseEntity {
/**
* 微信号
*/
- @TableField("wx_name")
- private String wxName;
+ @TableField("we_chat_no")
+ private String weChatNo;
/**
* 微信昵称
*/
- @TableField("wx_nick")
- private String wxNick;
+ @TableField("nickname")
+ private String nickname;
/**
* 微信头像
*/
- @TableField("wx_img")
- private String wxImg;
+ @TableField("header_url")
+ private String headerUrl;
/**
* 微信签名
*/
- @TableField("wx_sign")
+ @TableField("signature")
private String wxSign;
- /**
- * 社圈封面url
- */
- @TableField("moments_img")
- private String momentsImg;
-
- /**
- * 社圈权限
- */
- @TableField("moments_auth")
- private String momentsAuth;
-
- /**
- * 加我时是否需要验证
- */
- @TableField("is_add_verify")
- private Boolean isAddVerify;
-
- /**
- * 允许陌生人查看十条社圈
- */
- @TableField("is_read_ten_moments")
- private Boolean isReadTenMoments;
-
- /**
- * 允许添加我的方式
- */
- @TableField("add_types")
- private String addTypes;
-
- /**
- * 登录数据
- */
- @TableField("login_data")
- private String loginData;
-
- /**
- * 微信滑块鉴权url
- */
- @TableField("auth_url")
- private String authUrl;
-
- /**
- * 登录sessionId
- */
- @TableField("login_session_id")
- private String loginSessionId;
-
- /**
- * 微信版本
- */
- @TableField("wx_version")
- private String wxVersion;
-
- /**
- * 客户数量
- */
- @TableField("robot_friend_num")
- private Integer robotFriendNum;
/**
* 主客服ID
@@ -147,19 +87,12 @@ public class CommunityRobotWxInfo extends BaseEntity {
@TableField("customer_id")
private Integer customerId;
- /**
- * 登录的IP
- */
- @TableField("login_host")
- private String loginHost;
/**
- * 是否是手机登录
+ * 在线状态
*/
- @Deprecated
- @TableField("wx_login_phone_tag")
- Boolean wxLoginPhoneTag;
-
+ @TableField("status")
+ private Integer status;
/**
* 微信在线状态
*/
@@ -185,6 +118,7 @@ public class CommunityRobotWxInfo extends BaseEntity {
@TableField(exist = false)
private List subCustomerAccount;
+
/**
* 是否是企微设备
*
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabel.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabel.java
index ff97405..9299a64 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabel.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabel.java
@@ -17,7 +17,7 @@ import lombok.Setter;
*/
@Setter
@Getter
-@TableName(value = "community_robot_wx_label",autoResultMap = true)
+@TableName(value = "tb_robot_wx_label",autoResultMap = true)
public class CommunityRobotWxLabel extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabelList.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabelList.java
index 7973c49..ba5b824 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabelList.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityRobotWxLabelList.java
@@ -1,11 +1,10 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Setter;
import lombok.Getter;
-import lombok.EqualsAndHashCode;
+import lombok.Setter;
/**
*
@@ -17,7 +16,7 @@ import lombok.EqualsAndHashCode;
*/
@Setter
@Getter
-@TableName(value = "community_robot_wx_label_list",autoResultMap = true)
+@TableName(value = "tb_robot_wx_label_list",autoResultMap = true)
public class CommunityRobotWxLabelList extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityStaticResource.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityStaticResource.java
index 15e294c..196565a 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityStaticResource.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityStaticResource.java
@@ -1,15 +1,9 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.Getter;
-import lombok.EqualsAndHashCode;
+import lombok.*;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityTextResource.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityTextResource.java
deleted file mode 100644
index d0d1fb7..0000000
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityTextResource.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.eco.sc.customer.business.pojo.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.Getter;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- * 文本素材
- *
- *
- * @author hans
- * @since 2023-02-20
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName(value = "community_text_resource",autoResultMap = true)
-public class CommunityTextResource extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 社群用户id
- */
- @TableField("user_id")
- private Integer userId;
-
- /**
- * 标题
- */
- @TableField("title")
- private String title;
-
- /**
- * 内容
- */
- @TableField("content")
- private String content;
-
- /**
- * 业务标签
- */
- @TableField("service_label")
- private String serviceLabel;
-
-
-}
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityUpdateLog.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityUpdateLog.java
index a921a90..7b3a3e2 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityUpdateLog.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityUpdateLog.java
@@ -1,14 +1,12 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Setter;
import lombok.Getter;
-import lombok.EqualsAndHashCode;
+import lombok.Setter;
+
+import java.util.Date;
/**
*
@@ -20,7 +18,7 @@ import lombok.EqualsAndHashCode;
*/
@Setter
@Getter
-@TableName(value = "community_update_log",autoResultMap = true)
+@TableName(value = "tb_update_log",autoResultMap = true)
public class CommunityUpdateLog extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityXcxResource.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityXcxResource.java
index 3b2d8d1..7b153f7 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityXcxResource.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/CommunityXcxResource.java
@@ -1,14 +1,11 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.eco.fission.common.param.enums.ResourceLabelEnum;
-import lombok.Setter;
import lombok.Getter;
-import lombok.EqualsAndHashCode;
+import lombok.Setter;
/**
*
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/StaticResource.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/StaticResource.java
new file mode 100644
index 0000000..5956a96
--- /dev/null
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/StaticResource.java
@@ -0,0 +1,87 @@
+package com.eco.sc.customer.business.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.eco.common.commonbase.mybatis.BaseEntity;
+import com.eco.sc.customer.common.converter.JsonStringArrayTypeHandler;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ *
+ * 文本素材
+ *
+ *
+ * @author hans
+ * @since 2023-02-20
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "tb_static_resource",autoResultMap = true)
+public class StaticResource extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * 用户id
+ */
+ @TableField("user_id")
+ private Long userId;
+
+ /**
+ * 标题
+ */
+ @TableField("title")
+ private String title;
+
+ /**
+ * 类型
+ */
+ @TableField("type")
+ private Integer type;
+
+ /**
+ * 资源地址
+ */
+ @TableField("url")
+ private String url;
+
+ /**
+ * 文件地址
+ */
+ @TableField("file_url")
+ private String fileUrl;
+
+ /**
+ * 状态
+ */
+ @TableField("status")
+ private Integer status;
+
+ /**
+ * 描述
+ */
+ @TableField("remark")
+ private String remark;
+ /**
+ * 内容
+ */
+ @TableField("content")
+ private String content;
+
+
+ /**
+ * 业务标签
+ */
+ @TableField(value = "service_label", typeHandler = JsonStringArrayTypeHandler.class)
+ private List serviceLabel;
+
+
+}
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/TblCustomerConfig.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/TblCustomerConfig.java
index 472c0ac..d00b9ed 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/TblCustomerConfig.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/TblCustomerConfig.java
@@ -1,10 +1,10 @@
package com.eco.sc.customer.business.pojo.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Setter;
import lombok.Getter;
+import lombok.Setter;
/**
* 客服会话配置
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxConversation.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxConversation.java
index 6b0e5da..c6b9f50 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxConversation.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxConversation.java
@@ -1,11 +1,11 @@
package com.eco.sc.customer.business.pojo.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.eco.common.commonbase.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.eco.common.base.dto.SupportCustomerDto;
-import lombok.Setter;
+import com.eco.common.commonbase.mybatis.BaseEntity;
import lombok.Getter;
+import lombok.Setter;
/**
* 聊天会话表
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxMessage.java b/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxMessage.java
index 7eb9143..627bcd8 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxMessage.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/entity/TblWxMessage.java
@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.base.enums.WxContentTypeEnum;
+import com.eco.common.commonbase.mybatis.BaseEntity;
import lombok.Getter;
import lombok.Setter;
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/model/BaseEntity.java b/src/main/java/com/eco/sc/customer/business/pojo/model/BaseEntity.java
new file mode 100644
index 0000000..c083f93
--- /dev/null
+++ b/src/main/java/com/eco/sc/customer/business/pojo/model/BaseEntity.java
@@ -0,0 +1,47 @@
+package com.eco.sc.customer.business.pojo.model;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.eco.common.commonbase.utils.serializer.DateToLongSerializer;
+import com.eco.common.commonbase.valid.All;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Enzo
+ * @date : 2024/7/15
+ */
+@Getter
+@Setter
+public abstract class BaseEntity implements Serializable {
+
+
+ /**
+ * 数据库主键id
+ */
+ @NotNull(message = "用户唯一标识不能为空", groups = {All.Update.class})
+ @TableId(type = IdType.AUTO)
+ Long id;
+
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE, update = "now()")
+ @JsonSerialize(using = DateToLongSerializer.class)
+ Date updateTime;
+
+ /**
+ * 创建时间
+ */
+ @TableField(fill = FieldFill.INSERT)
+ @JsonSerialize(using = DateToLongSerializer.class)
+ Date createTime;
+
+}
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/model/BaseServiceImpl.java b/src/main/java/com/eco/sc/customer/business/pojo/model/BaseServiceImpl.java
new file mode 100644
index 0000000..4f53190
--- /dev/null
+++ b/src/main/java/com/eco/sc/customer/business/pojo/model/BaseServiceImpl.java
@@ -0,0 +1,334 @@
+package com.eco.sc.customer.business.pojo.model;
+
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.eco.common.commonbase.mybatis.*;
+import com.eco.common.commonbase.mybatis.join.JoinLambdaQueryWrapper;
+import com.eco.common.commonbase.utils.CollectionUtil;
+import com.eco.common.commonbase.utils.ReflectUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.util.StringUtils;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2024/7/15
+ */
+@Slf4j
+public class BaseServiceImpl, T extends BaseEntity> extends ServiceImpl {
+
+ @Override
+ protected Class currentModelClass() {
+ Type[] genericParamClassArray = ReflectUtil.getGenericParamClassArray(getClass());
+ if (genericParamClassArray == null || genericParamClassArray.length < 2) {
+ log.warn("Warn: {} not set the actual class on superclass generic parameter", getClass().getSimpleName());
+ return null;
+ }
+
+ return (Class) genericParamClassArray[1];
+ }
+
+ @Override
+ protected Class currentMapperClass() {
+ Type[] genericParamClassArray = ReflectUtil.getGenericParamClassArray(getClass());
+ if (genericParamClassArray == null || genericParamClassArray.length < 2) {
+ log.warn("Warn: {} not set the actual class on superMapperClass generic parameter", getClass().getSimpleName());
+ return null;
+ }
+
+ return (Class) genericParamClassArray[0];
+ }
+
+ /**
+ * 查询指定的属性eq的数据
+ */
+ public List listByTargetField(SFunction fieldFunc, Object value) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ lambdaQuery.eq(fieldFunc, value);
+ return baseMapper.selectList(lambdaQuery);
+ }
+
+ /**
+ * 查询指定的属性eq的数据
+ */
+ public List listByTargetFieldIn(SFunction fieldFunc, Collection> valueArray) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ lambdaQuery.in(fieldFunc, valueArray);
+ return baseMapper.selectList(lambdaQuery);
+ }
+
+ public LambdaQueryWrapper getLambdaQuery() {
+ return (LambdaQueryWrapper) Wrappers.lambdaQuery(super.entityClass);
+ }
+
+ public LambdaUpdateWrapper getLambdaUpdate() {
+ LambdaUpdateWrapper lambdaUpdate = (LambdaUpdateWrapper) Wrappers.lambdaUpdate(entityClass);
+ lambdaUpdate.set(T::getUpdateTime, new Date());
+ return lambdaUpdate;
+ }
+
+ @Override
+ public LambdaUpdateChainWrapper lambdaUpdate() {
+ LambdaUpdateChainWrapper lambdaUpdate = super.lambdaUpdate();
+ lambdaUpdate.set(T::getUpdateTime, new Date());
+ return lambdaUpdate;
+ }
+
+ public MyLambdaUpdateWrapper getMyLambdaUpdate() {
+ MyLambdaUpdateWrapper myLambdaUpdateWrapper = new MyLambdaUpdateWrapper(entityClass);
+ myLambdaUpdateWrapper.set(T::getUpdateTime, new Date());
+ return myLambdaUpdateWrapper;
+ }
+
+ public MyLambdaQueryWrapper getMyLambdaQuery() {
+ return new MyLambdaQueryWrapper(entityClass);
+ }
+
+ public JoinLambdaQueryWrapper joinQueryWrapperForOther(Class> queryType) {
+ return new JoinLambdaQueryWrapper(entityClass, queryType);
+ }
+
+ public JoinLambdaQueryWrapper joinQueryWrapperForTable() {
+ return new JoinLambdaQueryWrapper(entityClass, null);
+ }
+
+ public JoinLambdaQueryWrapper joinQueryWrapperForTable(Class kClass) {
+
+ return new JoinLambdaQueryWrapper(kClass, null);
+ }
+
+
+ /**
+ * 分页查询
+ *
+ * @param page
+ * @param queryWrapper
+ * @param
+ * @return
+ */
+ protected > E selectPage(E page, @Param(Constants.WRAPPER) Wrapper queryWrapper) {
+
+ if (queryWrapper instanceof AbstractWrapper) {
+ boolean hasOrder = !StringUtils.isEmpty(queryWrapper.getSqlSegment()) && queryWrapper.getSqlSegment().toUpperCase().contains("ORDER");
+ if (!hasOrder) {
+ AbstractWrapper wrapper = (AbstractWrapper) queryWrapper;
+ if (wrapper instanceof QueryWrapper) {
+ QueryWrapper lambdaQueryWrapper = (QueryWrapper) wrapper;
+ lambdaQueryWrapper.orderBy(true, false, "create_time");
+ }
+ }
+ }
+ return baseMapper.selectPage(page, queryWrapper);
+ }
+
+ @Override
+ public boolean update(Wrapper updateWrapper) {
+ // 如果 update_time 没有手动赋值
+
+ if (StringUtils.isEmpty(updateWrapper.getSqlSet())) {
+ return false;
+ }
+
+ if (!updateWrapper.getSqlSet().contains("update_time")) {
+ if (updateWrapper instanceof LambdaUpdateWrapper) {
+ LambdaUpdateWrapper lambdaUpdateWrapper = (LambdaUpdateWrapper) updateWrapper;
+ lambdaUpdateWrapper.set(T::getUpdateTime, new Date());
+ } else if (updateWrapper instanceof MyLambdaUpdateWrapper) {
+ MyLambdaUpdateWrapper lambdaUpdateWrapper = (MyLambdaUpdateWrapper) updateWrapper;
+ lambdaUpdateWrapper.set(T::getUpdateTime, new Date());
+ }
+
+ }
+ return super.update(null, updateWrapper);
+ }
+
+ @Override
+ public boolean saveBatch(Collection collection) {
+ if (CollectionUtil.isEmpty(collection)) {
+ return false;
+ }
+ if (baseMapper instanceof HBaseMapper) {
+ return ((HBaseMapper) baseMapper).insertBatchSomeColumn(collection) == collection.size();
+ } else {
+ return super.saveBatch(collection);
+ }
+ }
+
+ @Override
+ public boolean updateBatchById(Collection collection) {
+ if (CollectionUtil.isEmpty(collection)) {
+ return false;
+ }
+ if (baseMapper instanceof HBaseMapper) {
+ ArrayList ts = new ArrayList<>(collection);
+ CollectionUtil.splitList(ts, 100);
+
+ return ((HBaseMapper) baseMapper).updateBatchSomeColumn(collection) == collection.size();
+ } else {
+ return super.updateBatchById(collection);
+ }
+// return super.updateBatchById(collection);
+ }
+
+ public boolean saveBatchWithInput(Collection collection) {
+ if (CollectionUtil.isEmpty(collection)) {
+ return false;
+ }
+ if (baseMapper instanceof HBaseMapper) {
+ return ((HBaseMapper) baseMapper).insertBatchSomeColumnWithInput(collection) == collection.size();
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * 修改非空字段
+ */
+ public boolean updateNotNull(T entity) {
+ return update(entity, getLambdaUpdate().eq(BaseEntity::getId, entity.getId()));
+ }
+
+ public T getByEq(SFunction columns, Object value) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ return baseMapper.selectOne(lambdaQuery.eq(columns, value).last(" LIMIT 1"));
+ }
+
+ public boolean delByEq(SFunction columns, Object value) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ return retBool(baseMapper.delete(lambdaQuery.eq(columns, value)));
+ }
+
+ public boolean delByEqIn(SFunction columns, Collection> value) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ return retBool(baseMapper.delete(lambdaQuery.in(columns, value)));
+ }
+
+ public List listByEq(SFunction columns, Object value) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ return baseMapper.selectList(lambdaQuery.eq(columns, value));
+ }
+
+ public List listByNotEq(SFunction columns, Object value) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ return baseMapper.selectList(lambdaQuery.ne(columns, value));
+ }
+
+ /**
+ * 是否存在
+ */
+ public boolean existsQuery(LambdaQueryWrapper queryWrapper) {
+ queryWrapper.last(" limit 1");
+ return retBool(baseMapper.selectCount(queryWrapper));
+ }
+
+ public boolean existsByEq(SFunction columns, Object value) {
+ return existsQuery(getLambdaQuery().eq(columns, value));
+ }
+
+
+ public Integer countByTargetFieldEq(SFunction columns, Object value) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ lambdaQuery.eq(columns, value);
+ return count(lambdaQuery);
+ }
+
+ public boolean updateByFieldEq(T t, SFunction columns, Object value) {
+ LambdaUpdateWrapper lambdaUpdate = getLambdaUpdate();
+ lambdaUpdate.eq(columns, value);
+ return update(t, lambdaUpdate);
+ }
+
+ public boolean updateTargetFieldById(Integer id, SFunction columns, Object value) {
+ LambdaUpdateWrapper lambdaUpdate = getLambdaUpdate();
+ lambdaUpdate.set(columns, value);
+ lambdaUpdate.eq(T::getId, id);
+ return update(lambdaUpdate);
+ }
+
+ public boolean updateTargetFieldByIds(List ids, SFunction columns, Object value) {
+ LambdaUpdateWrapper lambdaUpdate = getLambdaUpdate();
+ lambdaUpdate.set(columns, value);
+ lambdaUpdate.in(T::getId, ids);
+ return update(lambdaUpdate);
+ }
+
+ public boolean saveOrUpdateNotNull(T entity) {
+ if (entity.getId() == null) {
+ return save(entity);
+ }
+ return updateNotNull(entity);
+ }
+
+ /**
+ * 自动分页查询,通过 {@link com.eco.common.commonbase.mybatis.PageParam#getEntity()} 不为空的数据库字段查询
+ */
+ public PageParam autoSelectPage(PageParam page) {
+
+ T entity = page.getEntity();
+ QueryWrapper query = Wrappers.query(entity);
+
+ if (entity != null) {
+
+ TableInfo tableInfo = TableInfoHelper.getTableInfo(entity.getClass());
+ if (tableInfo == null) {
+ throw new RuntimeException("tableInfo not found");
+ }
+
+
+ try {
+ for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) {
+ String column = fieldInfo.getColumn();
+ Field field = fieldInfo.getField();
+ Object value = field.get(entity);
+
+ if (value == null) {
+ continue;
+ }
+
+ query.eq(column, value);
+ }
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ return selectPage(page, query);
+ }
+
+ public boolean delById(Serializable id) {
+
+ return retBool(baseMapper.deleteById(id));
+ }
+
+ public boolean delByQuery(LambdaQueryWrapper wrapper) {
+
+ return retBool(baseMapper.delete(wrapper));
+ }
+
+
+ public OriginSqlBo.OriginSqlBoBuilder getOriginSqlBuilder() {
+ return OriginSqlBo.builder();
+ }
+}
diff --git a/src/main/java/com/eco/sc/customer/business/pojo/vo/AddFriendRequestVo.java b/src/main/java/com/eco/sc/customer/business/pojo/vo/AddFriendRequestVo.java
index 8cea0e5..37d6fd5 100644
--- a/src/main/java/com/eco/sc/customer/business/pojo/vo/AddFriendRequestVo.java
+++ b/src/main/java/com/eco/sc/customer/business/pojo/vo/AddFriendRequestVo.java
@@ -1,6 +1,5 @@
package com.eco.sc.customer.business.pojo.vo;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotCustomer;
import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendRequestContentLog;
import lombok.Data;
diff --git a/src/main/java/com/eco/sc/customer/business/service/QwMessageHelpService.java b/src/main/java/com/eco/sc/customer/business/service/QwMessageHelpService.java
index 04a2150..9c3b889 100644
--- a/src/main/java/com/eco/sc/customer/business/service/QwMessageHelpService.java
+++ b/src/main/java/com/eco/sc/customer/business/service/QwMessageHelpService.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.dto.WeChatMessageDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.sc.customer.business.pojo.bo.HandlerMsgNodeResultBo;
import com.eco.sc.customer.business.pojo.dto.WeChatChatRoomMemberDto;
@@ -14,7 +15,6 @@ import com.eco.sc.customer.business.service.msg.HandlerQwMsgNodeService;
import com.eco.sc.customer.business.service.msg.impl.QwMsgNodeService;
import com.eco.sc.customer.common.ToolsHelper;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.utils.FileHelper;
import com.eco.sc.customer.helper.callback.core.CacheDataHelper;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/eco/sc/customer/business/service/QwTransferService.java b/src/main/java/com/eco/sc/customer/business/service/QwTransferService.java
index 1a228b9..7bea700 100644
--- a/src/main/java/com/eco/sc/customer/business/service/QwTransferService.java
+++ b/src/main/java/com/eco/sc/customer/business/service/QwTransferService.java
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.dto.WeChatMessageDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.fission.common.param.constants.Consts;
import com.eco.fission.common.pojo.dto.task.DeviceDto;
@@ -26,7 +27,6 @@ import com.eco.sc.customer.common.cache.CaffeineCacheHelper;
import com.eco.sc.customer.common.cache.MapValueCacheHelper;
import com.eco.sc.customer.common.constant.ConstParam;
import com.eco.sc.customer.common.constant.enums.CacheKeyEnum;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.WxEnumMsgType;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.common.utils.CollectionUtil;
@@ -621,14 +621,14 @@ public class QwTransferService {
objectWeChatOnlineNotice.put("WeChatId", weChatId);
String nickname = loginResponse.getNickname();
String smallHeadImgUrl = loginResponse.getSmallHeadImgUrl();
- if (StrUtil.isEmpty(nickname) || StrUtil.isEmpty(smallHeadImgUrl)) {
+ /*if (StrUtil.isEmpty(nickname) || StrUtil.isEmpty(smallHeadImgUrl)) {
// 查询单个设备信息
CommunityRobotWxInfo communityRobotWxInfo = communityRobotWxInfoService.getByEq(CommunityRobotWxInfo::getRobotAccount, pit);
if (communityRobotWxInfo != null) {
- nickname = communityRobotWxInfo.getWxNick();
+ nickname = communityRobotWxInfo.getNickname();
smallHeadImgUrl = communityRobotWxInfo.getWxImg();
}
- }
+ }*/
objectWeChatOnlineNotice.put("WeChatNick", nickname);
objectWeChatOnlineNotice.put("IMEI", weChatId);
objectWeChatOnlineNotice.put("Phone", "");
diff --git a/src/main/java/com/eco/sc/customer/business/service/TblCustomerSupportServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/TblCustomerSupportServiceImpl.java
index 259170e..de643eb 100644
--- a/src/main/java/com/eco/sc/customer/business/service/TblCustomerSupportServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/TblCustomerSupportServiceImpl.java
@@ -4,14 +4,14 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.eco.common.commonbase.mybatis.BaseServiceImpl;
+import com.eco.common.base.dto.SupportCustomerDto;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.entity.CommunityCustomerInfo;
+import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.sc.customer.business.helper.WebHelper;
import com.eco.sc.customer.business.mapper.TblCustomerSupportMapper;
import com.eco.sc.customer.business.pojo.bo.TblCustomerSupportBo;
-import com.eco.common.base.dto.SupportCustomerDto;
import com.eco.sc.customer.business.pojo.entity.*;
import com.eco.sc.customer.business.service.impl.CommunityCustomerInfoServiceImpl;
import com.eco.sc.customer.business.service.impl.CommunityRobotSupportConfigServiceImpl;
diff --git a/src/main/java/com/eco/sc/customer/business/service/TblShieldUserServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/TblShieldUserServiceImpl.java
index 65ba6cb..1026b14 100644
--- a/src/main/java/com/eco/sc/customer/business/service/TblShieldUserServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/TblShieldUserServiceImpl.java
@@ -3,8 +3,8 @@ package com.eco.sc.customer.business.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
-import com.eco.sc.customer.business.pojo.entity.TblShieldUser;
import com.eco.sc.customer.business.mapper.TblShieldUserMapper;
+import com.eco.sc.customer.business.pojo.entity.TblShieldUser;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/src/main/java/com/eco/sc/customer/business/service/TblWxMessageServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/TblWxMessageServiceImpl.java
index c47188d..0d03352 100644
--- a/src/main/java/com/eco/sc/customer/business/service/TblWxMessageServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/TblWxMessageServiceImpl.java
@@ -7,9 +7,10 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
-import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.sc.customer.business.mapper.TblWxMessageMapper;
import com.eco.sc.customer.business.pojo.SlidePage;
import com.eco.sc.customer.business.pojo.dto.ChatRecordsQueryDto;
@@ -24,7 +25,6 @@ import com.eco.sc.customer.business.service.impl.CommunityCustomerGroupInviteLog
import com.eco.sc.customer.business.service.mongo.WxMessageServiceImpl;
import com.eco.sc.customer.common.ResultInfo;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.WxEnumMsgType;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.common.utils.CollectionUtil;
diff --git a/src/main/java/com/eco/sc/customer/business/service/WxMessageHelpService.java b/src/main/java/com/eco/sc/customer/business/service/WxMessageHelpService.java
index d9d0aa5..b7894ed 100644
--- a/src/main/java/com/eco/sc/customer/business/service/WxMessageHelpService.java
+++ b/src/main/java/com/eco/sc/customer/business/service/WxMessageHelpService.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.dto.WeChatMessageDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.sc.customer.business.pojo.bo.HandlerMsgNodeResultBo;
import com.eco.sc.customer.business.pojo.dto.WeChatChatRoomMemberDto;
@@ -17,7 +18,6 @@ import com.eco.sc.customer.business.service.msg.HandlerMsgNodeService;
import com.eco.sc.customer.business.service.msg.impl.WxMsgNodeService;
import com.eco.sc.customer.common.ToolsHelper;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.helper.callback.core.CacheDataHelper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/eco/sc/customer/business/service/WxTransferService.java b/src/main/java/com/eco/sc/customer/business/service/WxTransferService.java
index d872721..27a072b 100644
--- a/src/main/java/com/eco/sc/customer/business/service/WxTransferService.java
+++ b/src/main/java/com/eco/sc/customer/business/service/WxTransferService.java
@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.dto.WeChatMessageDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.fission.common.param.constants.Consts;
import com.eco.fission.common.pojo.dto.phone.MsgCallBackVo;
@@ -27,7 +28,6 @@ import com.eco.sc.customer.common.cache.CaffeineCacheHelper;
import com.eco.sc.customer.common.cache.MapValueCacheHelper;
import com.eco.sc.customer.common.constant.ConstParam;
import com.eco.sc.customer.common.constant.enums.CacheKeyEnum;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.WxEnumMsgType;
import com.eco.sc.customer.common.redis.queue.NoticeMajorDelayQueue;
import com.eco.sc.customer.common.redis.queue.NoticeSpecialDelayQueue;
@@ -979,8 +979,8 @@ public class WxTransferService {
// 查询单个设备信息
CommunityRobotWxInfo communityRobotWxInfo = communityRobotWxInfoService.getByEq(CommunityRobotWxInfo::getRobotAccount, pit);
if (communityRobotWxInfo != null) {
- nickname = communityRobotWxInfo.getWxNick();
- smallHeadImgUrl = communityRobotWxInfo.getWxImg();
+ nickname = communityRobotWxInfo.getNickname();
+ smallHeadImgUrl = communityRobotWxInfo.getHeaderUrl();
}
}
objectWeChatOnlineNotice.put("WeChatNick", nickname);
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCardResourceServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCardResourceServiceImpl.java
index a8c0221..625a4d8 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCardResourceServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCardResourceServiceImpl.java
@@ -3,9 +3,9 @@ package com.eco.sc.customer.business.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.common.commonbase.mybatis.PageParam;
-import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.fission.common.param.enums.ResourceLabelEnum;
import com.eco.sc.customer.business.mapper.CommunityCardResourceMapper;
import com.eco.sc.customer.business.pojo.bo.CustomerResourceBo;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerInfoServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerInfoServiceImpl.java
index faea2e7..d324ac6 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerInfoServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.eco.sc.customer.business.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -14,9 +15,7 @@ import com.eco.fission.common.param.constants.Consts;
import com.eco.fission.common.pojo.dto.task.DeviceDto;
import com.eco.sc.customer.business.mapper.CommunityCustomerInfoMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerJoinRobot;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotInfo;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
-import com.eco.sc.customer.common.constant.enums.RobotStatusEnum;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -25,13 +24,10 @@ import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_PROTOCOL;
-
/**
* 客服 服务实现类
*
@@ -41,7 +37,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_PROTOCOL;
*/
@Service
@DS("scrm")
-@org.apache.dubbo.config.annotation.Service(protocol = DUBBO_PROTOCOL, timeout = 10000)
+@org.apache.dubbo.config.annotation.Service(protocol = {"rest", "dubbo"}, timeout = 10000)
public class CommunityCustomerInfoServiceImpl extends BaseServiceImpl implements CommunityCustomerInfoService {
@Resource
@@ -140,38 +136,29 @@ public class CommunityCustomerInfoServiceImpl extends BaseServiceImpl robotInfos = CompletableFuture.supplyAsync(() -> {
- List customerJoinRobots = communityCustomerJoinRobotService.listByCustomerAccount(account);
- return customerJoinRobots.stream()
- .map(CommunityCustomerJoinRobot::getRobotId)
- .collect(Collectors.toSet());
- }).thenApplyAsync((integers) -> {
- List communityRobotInfos = communityRobotInfoService.listByTargetField(CommunityRobotInfo::getCustomerId, customerId);
- if (CollectionUtil.isNotEmpty(integers)) {
- List robotInfoList = communityRobotInfoService.listByIds(integers);
- communityRobotInfos.addAll(robotInfoList);
- }
- return communityRobotInfos;
- }).join();
-
- if (CollectionUtil.isNotEmpty(robotInfos)) {
- Map integerRobotInfoMap = CollectionUtil.convertToMapByFunc(robotInfos, CommunityRobotInfo::getId);
- List robotIds = robotInfos.stream().map(CommunityRobotInfo::getId).distinct().collect(Collectors.toList());
- if (CollectionUtil.isEmpty(robotIds)) {
- return deviceDtos;
- }
- List robotWxInfos = communityRobotWxInfoService.listByRobotIds(robotIds);
- for (CommunityRobotWxInfo robotWxInfo : robotWxInfos) {
+ List wxInfoList = communityRobotWxInfoService.listByTargetField(CommunityRobotWxInfo::getCustomerId, customerId);
+ List customerJoinRobots = communityCustomerJoinRobotService.listByTargetField(CommunityCustomerJoinRobot::getCustomerId, customerId);
+ Set collected = customerJoinRobots.stream().map(CommunityCustomerJoinRobot::getRobotId)
+ .collect(Collectors.toSet());
+ if (CollUtil.isNotEmpty(collected)) {
+ wxInfoList.addAll(communityRobotWxInfoService.listByIds(collected));
+ }
+
+ if (CollectionUtil.isNotEmpty(wxInfoList)) {
+
+ for (CommunityRobotWxInfo robotWxInfo : wxInfoList) {
DeviceDto deviceDto = new DeviceDto();
BeanUtils.copyProperties(robotWxInfo, deviceDto);
- CommunityRobotInfo robotInfo = integerRobotInfoMap.get(robotWxInfo.getRobotId());
+ // CommunityRobotInfo robotInfo = integerRobotInfoMap.get(robotWxInfo.getRobotId());
deviceDto.setOnLine(0);
- if (robotInfo != null) {
- boolean equals = robotInfo.getStatus().equals(RobotStatusEnum.ONLINE);
- deviceDto.setOnLine(equals ? 0 : 1);
- deviceDto.setRobotType(robotInfo.getRobotType());
- if (robotInfo.getCustomerId() != null
- && robotInfo.getCustomerId().intValue() == customerId) {
+ if (robotWxInfo != null) {
+ deviceDto.setWxNick(robotWxInfo.getNickname());
+ deviceDto.setWxId(robotWxInfo.getWxId());
+ deviceDto.setWxImg(robotWxInfo.getHeaderUrl());
+ deviceDto.setOnLine(robotWxInfo.getStatus());
+ deviceDto.setRobotType(1);
+ if (robotWxInfo.getCustomerId() != null
+ && robotWxInfo.getCustomerId().intValue() == customerId) {
deviceDto.setDeviceType(1);
} else {
deviceDto.setDeviceType(2);
@@ -204,18 +191,16 @@ public class CommunityCustomerInfoServiceImpl extends BaseServiceImpl customerJoinRobots = communityCustomerJoinRobotService.listByEq(CommunityCustomerJoinRobot::getRobotId, robotInfo.getId());
- List strings = CollectionUtil.mapFieldsToList(customerJoinRobots, CommunityCustomerJoinRobot::getCustomerAccount);
- wxInfo.setSubCustomerAccount(strings);
+ // CommunityRobotInfo robotInfo = communityRobotInfoService.getById(wxInfo.getRobotId());
+ CommunityCustomerInfo customerInfo = communityCustomerInfoService.getById(wxInfo.getCustomerId());
+ if (customerInfo != null) {
+ wxInfo.setCustomerId(customerInfo.getId());
+ wxInfo.setCustomerAccount(customerInfo.getAccount());
+ wxInfo.setCustomerNick(customerInfo.getNick());
}
+ List customerJoinRobots = communityCustomerJoinRobotService.listByEq(CommunityCustomerJoinRobot::getRobotId, wxInfo.getId());
+ List strings = CollectionUtil.mapFieldsToList(customerJoinRobots, CommunityCustomerJoinRobot::getCustomerAccount);
+ wxInfo.setSubCustomerAccount(strings);
BeanUtils.copyProperties(wxInfo, deviceDto);
}
return deviceDto;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerJoinRobotServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerJoinRobotServiceImpl.java
index 96fcb29..a148e3b 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerJoinRobotServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerJoinRobotServiceImpl.java
@@ -2,8 +2,8 @@ package com.eco.sc.customer.business.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.eco.sc.customer.business.mapper.CommunityCustomerJoinRobotMapper;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
+import com.eco.sc.customer.business.mapper.CommunityCustomerJoinRobotMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerJoinRobot;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerMsgCountLogServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerMsgCountLogServiceImpl.java
index 86e1905..376d26c 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerMsgCountLogServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityCustomerMsgCountLogServiceImpl.java
@@ -3,9 +3,9 @@ package com.eco.sc.customer.business.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
-import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.sc.customer.business.mapper.CommunityCustomerMsgCountLogMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerMsgCountLog;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityDockingConfigServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityDockingConfigServiceImpl.java
index 01c1307..575d86f 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityDockingConfigServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityDockingConfigServiceImpl.java
@@ -7,13 +7,13 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.eco.common.base.entity.CommunityCustomerInfo;
+import com.eco.common.base.entity.CommunityDockingConfig;
+import com.eco.common.base.vo.DockingConfigVo;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.common.rpc.CommunityDockingConfigService;
import com.eco.sc.customer.business.mapper.CommunityDockingConfigMapper;
import com.eco.sc.customer.business.pojo.dto.bind.BindInfoDto;
-import com.eco.common.base.entity.CommunityDockingConfig;
import com.eco.sc.customer.business.pojo.vo.bind.QueryPageVo;
-import com.eco.common.base.vo.DockingConfigVo;
import com.eco.sc.customer.common.ResultInfo;
import com.eco.sc.customer.common.constant.enums.PushTypeEnum;
import com.eco.sc.customer.common.utils.SignUtil;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotBlacklistServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotBlacklistServiceImpl.java
index 4a71e87..3d61475 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotBlacklistServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotBlacklistServiceImpl.java
@@ -2,10 +2,10 @@ package com.eco.sc.customer.business.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.commonbase.exception.ServiceException;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.common.commonbase.utils.CollectionUtil;
-import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.fission.common.param.constants.Consts;
import com.eco.sc.customer.business.mapper.CommunityRobotBlacklistMapper;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotCustomerServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotCustomerServiceImpl.java
index 6154ebe..a4340c5 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotCustomerServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotCustomerServiceImpl.java
@@ -28,7 +28,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
import java.util.stream.Collectors;
/**
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotInfoServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotInfoServiceImpl.java
index 0df4243..fadc2e3 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotInfoServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotInfoServiceImpl.java
@@ -1,8 +1,8 @@
package com.eco.sc.customer.business.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.eco.sc.customer.business.mapper.CommunityRobotInfoMapper;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
+import com.eco.sc.customer.business.mapper.CommunityRobotInfoMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotInfo;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupMemberServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupMemberServiceImpl.java
index 72fe00a..627d89d 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupMemberServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupMemberServiceImpl.java
@@ -6,10 +6,10 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.common.commonbase.utils.CollectionUtil;
-import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.sc.customer.business.mapper.CommunityRobotWxGroupMemberMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotBlacklist;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotCustomer;
@@ -45,6 +45,18 @@ public class CommunityRobotWxGroupMemberServiceImpl extends BaseServiceImpl listByWeChatIdAndGroupId(String weChatId, Long groupId,
+ SFunction... selects) {
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+ if (ArrayUtil.isNotEmpty(selects)) {
+ lambdaQuery.select(selects);
+ }
+ lambdaQuery.eq(CommunityRobotWxGroupMember::getWechatId, weChatId);
+ lambdaQuery.eq(CommunityRobotWxGroupMember::getGroupId, groupId);
+ return list(lambdaQuery);
+ }
/**
* 用群成员昵称生成群昵称
*
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupServiceImpl.java
index e7880fd..6402e9d 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxGroupServiceImpl.java
@@ -10,10 +10,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.eco.common.commonbase.mybatis.BaseServiceImpl;
-import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.exception.ServiceException;
import com.eco.fission.common.param.enums.RobotWxLoginTypeEnum;
import com.eco.sc.customer.business.mapper.CommunityRobotWxGroupMapper;
@@ -21,6 +19,8 @@ import com.eco.sc.customer.business.pojo.dto.WeChatChatRoomMemberDto;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotInfo;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroup;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
+import com.eco.sc.customer.business.pojo.model.BaseEntity;
+import com.eco.sc.customer.business.pojo.model.BaseServiceImpl;
import com.eco.sc.customer.common.utils.CollectionUtil;
import com.eco.sc.customer.helper.callback.core.CacheDataHelper;
import com.eco.sc.customer.helper.callback.core.QwRequestCoreHelper;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxInfoServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxInfoServiceImpl.java
index 530a20c..07d5425 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxInfoServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxInfoServiceImpl.java
@@ -2,10 +2,10 @@ package com.eco.sc.customer.business.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.eco.common.commonbase.mybatis.BaseEntity;
-import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.sc.customer.business.mapper.CommunityRobotWxInfoMapper;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
+import com.eco.sc.customer.business.pojo.model.BaseEntity;
+import com.eco.sc.customer.business.pojo.model.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxLabelServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxLabelServiceImpl.java
index 3e8542a..f7b9e43 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxLabelServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityRobotWxLabelServiceImpl.java
@@ -81,9 +81,7 @@ public class CommunityRobotWxLabelServiceImpl extends BaseServiceImpl {
-
-
- public IPage search(PageParam pageParam, CommunityCustomerInfo communityCustomerInfo) {
-
- LambdaQueryWrapper lambdaQuery = getLambdaQuery();
+public class CommunityTextResourceServiceImpl extends BaseServiceImpl {
- lambdaQuery.eq(CommunityTextResource::getUserId, communityCustomerInfo.getUserId());
- lambdaQuery.eq(CommunityTextResource::getServiceLabel, ResourceLabelEnum.MATERIAL);
- PageParam page = getBaseMapper().selectPage(PageParam.convertPageParam(pageParam), lambdaQuery);
+ public IPage search(PageParam pageParam, CommunityCustomerInfo communityCustomerInfo) {
+ CustomerResourceBo entity = pageParam.getEntity();
+ LambdaQueryWrapper lambdaQuery = getLambdaQuery();
- return page;
+ lambdaQuery.eq(StaticResource::getUserId, communityCustomerInfo.getUserId());
+ if (ObjectUtil.isNotNull(entity.getType())) {
+ lambdaQuery.eq(StaticResource::getType, entity.getType());
+ }
+ return getBaseMapper().selectPage(PageParam.convertPageParam(pageParam), lambdaQuery);
}
}
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityUpdateLogServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityUpdateLogServiceImpl.java
index 5018076..6e548c9 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityUpdateLogServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityUpdateLogServiceImpl.java
@@ -3,8 +3,8 @@ package com.eco.sc.customer.business.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
-import com.eco.sc.customer.business.pojo.entity.CommunityUpdateLog;
import com.eco.sc.customer.business.mapper.CommunityUpdateLogMapper;
+import com.eco.sc.customer.business.pojo.entity.CommunityUpdateLog;
import org.springframework.stereotype.Service;
/**
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityXcxResourceServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityXcxResourceServiceImpl.java
index 4e3784d..619e59c 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/CommunityXcxResourceServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/CommunityXcxResourceServiceImpl.java
@@ -7,9 +7,9 @@ import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.fission.common.param.enums.ResourceLabelEnum;
-import com.eco.sc.customer.business.pojo.entity.CommunityXcxResource;
import com.eco.sc.customer.business.mapper.CommunityXcxResourceMapper;
import com.eco.sc.customer.business.pojo.bo.CustomerResourceBo;
+import com.eco.sc.customer.business.pojo.entity.CommunityXcxResource;
import org.springframework.stereotype.Service;
/**
diff --git a/src/main/java/com/eco/sc/customer/business/service/impl/TblWxAddFriendLogServiceImpl.java b/src/main/java/com/eco/sc/customer/business/service/impl/TblWxAddFriendLogServiceImpl.java
index 642e0cd..7da1d20 100644
--- a/src/main/java/com/eco/sc/customer/business/service/impl/TblWxAddFriendLogServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/business/service/impl/TblWxAddFriendLogServiceImpl.java
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.commonbase.mybatis.BaseServiceImpl;
import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.sc.customer.business.mapper.TblWxAddFriendLogMapper;
-import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.sc.customer.business.pojo.entity.TblWxAddFriendLog;
import com.eco.sc.customer.framework.exception.ServiceException;
import com.eco.sc.customer.framework.exception.ServiceExceptionEnum;
diff --git a/src/main/java/com/eco/sc/customer/business/service/msg/impl/WxMsgNodeService.java b/src/main/java/com/eco/sc/customer/business/service/msg/impl/WxMsgNodeService.java
index edbc8a4..94df157 100644
--- a/src/main/java/com/eco/sc/customer/business/service/msg/impl/WxMsgNodeService.java
+++ b/src/main/java/com/eco/sc/customer/business/service/msg/impl/WxMsgNodeService.java
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.dto.WeChatMessageDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.fission.common.param.enums.FileType;
import com.eco.sc.customer.business.pojo.bo.HandlerMsgNodeResultBo;
@@ -23,7 +24,6 @@ import com.eco.sc.customer.common.ToolsHelper;
import com.eco.sc.customer.common.constant.CallBackCode;
import com.eco.sc.customer.common.constant.ConstParam;
import com.eco.sc.customer.common.constant.enums.PushTypeEnum;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.WxEnumMsgType;
import com.eco.sc.customer.common.utils.*;
import com.eco.sc.customer.framework.config.BaseSpringContext;
diff --git a/src/main/java/com/eco/sc/customer/common/cache/CaffeineCacheHelper.java b/src/main/java/com/eco/sc/customer/common/cache/CaffeineCacheHelper.java
index b1daa5a..928b062 100644
--- a/src/main/java/com/eco/sc/customer/common/cache/CaffeineCacheHelper.java
+++ b/src/main/java/com/eco/sc/customer/common/cache/CaffeineCacheHelper.java
@@ -8,7 +8,6 @@ import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
/**
* @author xiaoxx
diff --git a/src/main/java/com/eco/sc/customer/common/constant/enums/phone/MsgTypeEnum.java b/src/main/java/com/eco/sc/customer/common/constant/enums/phone/MsgTypeEnum.java
index 3ed4be4..4a89ddf 100644
--- a/src/main/java/com/eco/sc/customer/common/constant/enums/phone/MsgTypeEnum.java
+++ b/src/main/java/com/eco/sc/customer/common/constant/enums/phone/MsgTypeEnum.java
@@ -1,8 +1,8 @@
package com.eco.sc.customer.common.constant.enums.phone;
import com.alibaba.fastjson.JSONObject;
-import com.eco.fission.common.pojo.dto.phone.MsgCallBackVo;
import com.eco.common.base.enums.WxContentTypeEnum;
+import com.eco.fission.common.pojo.dto.phone.MsgCallBackVo;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/src/main/java/com/eco/sc/customer/common/constant/enums/phone/QwMsgTypeEnum.java b/src/main/java/com/eco/sc/customer/common/constant/enums/phone/QwMsgTypeEnum.java
index d9666eb..1b977ad 100644
--- a/src/main/java/com/eco/sc/customer/common/constant/enums/phone/QwMsgTypeEnum.java
+++ b/src/main/java/com/eco/sc/customer/common/constant/enums/phone/QwMsgTypeEnum.java
@@ -1,8 +1,8 @@
package com.eco.sc.customer.common.constant.enums.phone;
import com.alibaba.fastjson.JSONObject;
-import com.eco.fission.common.pojo.dto.phone.MsgCallBackVo;
import com.eco.common.base.enums.WxContentTypeEnum;
+import com.eco.fission.common.pojo.dto.phone.MsgCallBackVo;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/src/main/java/com/eco/sc/customer/common/converter/JsonStringArrayTypeHandler.java b/src/main/java/com/eco/sc/customer/common/converter/JsonStringArrayTypeHandler.java
new file mode 100644
index 0000000..3a8dfe9
--- /dev/null
+++ b/src/main/java/com/eco/sc/customer/common/converter/JsonStringArrayTypeHandler.java
@@ -0,0 +1,62 @@
+package com.eco.sc.customer.common.converter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2023/11/2
+ */
+@MappedJdbcTypes({JdbcType.VARCHAR})
+public class JsonStringArrayTypeHandler extends BaseTypeHandler> {
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
+ @Override
+ public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException {
+ ps.setString(i, toJson(parameter));
+ }
+
+ @Override
+ public List getNullableResult(ResultSet rs, String columnName) throws SQLException {
+ return this.toObject(rs.getString(columnName));
+ }
+
+ @Override
+ public List getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+ return this.toObject(rs.getString(columnIndex));
+ }
+
+ @Override
+ public List getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+ return this.toObject(cs.getString(columnIndex));
+ }
+
+ private String toJson(List params) {
+ try {
+ return MAPPER.writeValueAsString(params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "[]";
+ }
+
+ private List toObject(String content) {
+ if (content != null && !content.isEmpty()) {
+ try {
+ return MAPPER.readValue(content, List.class);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/src/main/java/com/eco/sc/customer/common/minio/MinioConfig.java b/src/main/java/com/eco/sc/customer/common/minio/MinioConfig.java
index 78f8fcf..413bb1a 100644
--- a/src/main/java/com/eco/sc/customer/common/minio/MinioConfig.java
+++ b/src/main/java/com/eco/sc/customer/common/minio/MinioConfig.java
@@ -16,10 +16,14 @@ import org.springframework.stereotype.Component;
public class MinioConfig {
private String nginxUrl;
- private String endpoint = "http://127.0.0.1:9009";
- private String accessKey = "leslie";
- private String secretKey = "J2V6hKlBceEsZHscADN5DBLZZYioPzBm";
- private String bucketName = "image";
+
+ private String endpoint;
+
+ private String accessKey;
+
+ private String secretKey;
+
+ private String bucketName;
@Bean
public MinioClient minioClient() {
diff --git a/src/main/java/com/eco/sc/customer/common/minio/MinioUtil.java b/src/main/java/com/eco/sc/customer/common/minio/MinioUtil.java
index ecf4a1a..5c99ba6 100644
--- a/src/main/java/com/eco/sc/customer/common/minio/MinioUtil.java
+++ b/src/main/java/com/eco/sc/customer/common/minio/MinioUtil.java
@@ -3,9 +3,7 @@ package com.eco.sc.customer.common.minio;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
-import com.eco.common.commonbase.utils.DateUtils;
import io.minio.*;
-import io.minio.http.Method;
import io.minio.messages.Bucket;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -24,10 +22,7 @@ import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
/**
* minio文件上传
@@ -146,29 +141,7 @@ public class MinioUtil {
}
}
- public Map getUploadUrl(String fileName, String bucketName) {
- Map stringStringMap = new HashMap<>();
- //获取对应存储平台
- try {
- String presignedObjectUrl = minioClient.getPresignedObjectUrl(
- GetPresignedObjectUrlArgs.builder()
- .method(Method.PUT)
- .bucket(bucketName)
- .object(fileName)
- .expiry(10, TimeUnit.MINUTES)
- .build());
- stringStringMap.put("preUrl", presignedObjectUrl);
- stringStringMap.put("host", minioConfig.getNginxUrl());
- stringStringMap.put("cuHost", minioConfig.getNginxUrl());
- stringStringMap.put("fileName", fileName);
- stringStringMap.put("expire", DateUtils.addMinutes(new Date(), 10).getTime());
- return stringStringMap;
- }
- catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
/**
diff --git a/src/main/java/com/eco/sc/customer/common/utils/Base64ToMultipartFile.java b/src/main/java/com/eco/sc/customer/common/utils/Base64ToMultipartFile.java
index aca8040..acc85cb 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/Base64ToMultipartFile.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/Base64ToMultipartFile.java
@@ -7,11 +7,7 @@ import org.apache.commons.lang.StringEscapeUtils;
import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Decoder;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
/**
* base64转为multipartFile工具类
diff --git a/src/main/java/com/eco/sc/customer/common/utils/DateUtil.java b/src/main/java/com/eco/sc/customer/common/utils/DateUtil.java
index 39777a8..913e72e 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/DateUtil.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/DateUtil.java
@@ -1,13 +1,13 @@
package com.eco.sc.customer.common.utils;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
public class DateUtil {
@@ -88,7 +88,7 @@ public class DateUtil {
cal.add(calendarField, offset);
return cal.getTime();
}
-
+
/**
* 偏移分钟
* @param date 日期
@@ -98,8 +98,8 @@ public class DateUtil {
public static Date offsetMinute(Date date, int offsite) {
return offsetDate(date, Calendar.MINUTE, offsite);
}
-
-
+
+
/**
* 偏移小时
* @param date 日期
@@ -109,7 +109,7 @@ public class DateUtil {
public static Date offsetHour(Date date, int offsite) {
return offsetDate(date, Calendar.HOUR, offsite);
}
-
+
/**
* 偏移秒
* @param date 日期
diff --git a/src/main/java/com/eco/sc/customer/common/utils/FileUtils.java b/src/main/java/com/eco/sc/customer/common/utils/FileUtils.java
index 4891bdc..a10119e 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/FileUtils.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/FileUtils.java
@@ -10,18 +10,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.system.ApplicationHome;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Arrays;
diff --git a/src/main/java/com/eco/sc/customer/common/utils/ImgUtils.java b/src/main/java/com/eco/sc/customer/common/utils/ImgUtils.java
index c301604..69a363f 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/ImgUtils.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/ImgUtils.java
@@ -1,9 +1,6 @@
package com.eco.sc.customer.common.utils;
import lombok.extern.slf4j.Slf4j;
-//import org.bytedeco.javacv.FFmpegFrameGrabber;
-//import org.bytedeco.javacv.Java2DFrameConverter;
-//import org.bytedeco.javacv.OpenCVFrameConverter;
import javax.imageio.ImageIO;
import java.awt.*;
diff --git a/src/main/java/com/eco/sc/customer/common/utils/ObjConvertUtils.java b/src/main/java/com/eco/sc/customer/common/utils/ObjConvertUtils.java
index db571d5..b8f4dec 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/ObjConvertUtils.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/ObjConvertUtils.java
@@ -5,6 +5,8 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
+import com.eco.common.base.vo.ConversationVo;
import com.eco.fission.common.utils.StringUtils;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroup;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroupMember;
@@ -13,9 +15,7 @@ import com.eco.sc.customer.business.pojo.entity.TblWxMessage;
import com.eco.sc.customer.business.pojo.entity.mongo.WxMessage;
import com.eco.sc.customer.business.pojo.vo.CommunityRobotWxGroupMemberVo;
import com.eco.sc.customer.business.pojo.vo.CommunityRobotWxGroupVo;
-import com.eco.common.base.vo.ConversationVo;
import com.eco.sc.customer.business.pojo.vo.WxMessageVo;
-import com.eco.common.base.enums.WxContentTypeEnum;
import org.springframework.beans.BeanUtils;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/eco/sc/customer/common/utils/SignUtil.java b/src/main/java/com/eco/sc/customer/common/utils/SignUtil.java
index 6d92672..c8be074 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/SignUtil.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/SignUtil.java
@@ -1,14 +1,9 @@
package com.eco.sc.customer.common.utils;
-import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
-import org.springframework.util.LinkedMultiValueMap;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
diff --git a/src/main/java/com/eco/sc/customer/common/utils/StringUtil.java b/src/main/java/com/eco/sc/customer/common/utils/StringUtil.java
index 60cc8ef..69faf25 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/StringUtil.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/StringUtil.java
@@ -1,18 +1,18 @@
package com.eco.sc.customer.common.utils;
+import org.springframework.util.StringUtils;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.springframework.util.StringUtils;
-
public class StringUtil {
-
+
private static final String UNDERLINE = "_";
/**
* 首字母变小写
- *
+ *
* @param s
* @return
*/
@@ -23,8 +23,8 @@ public class StringUtil {
return (new StringBuilder()).append(Character.toLowerCase(s.charAt(0))).append(s.substring(1)).toString();
}
}
-
-
+
+
public static List stringToList(String str,String split){
List list = new ArrayList<>();
if(!StringUtils.isEmpty(str)){
@@ -39,8 +39,8 @@ public class StringUtil {
}
return list;
}
-
-
+
+
public static List stringToList(String str){
List list = new ArrayList<>();
if(!StringUtils.isEmpty(str)){
@@ -55,7 +55,7 @@ public class StringUtil {
}
return list;
}
-
+
public static String ListToString(List list){
String s = "";
if(null != list && list.size()>0){
@@ -67,12 +67,12 @@ public class StringUtil {
s = s.substring(0, s.length()-1);
}
return s;
-
+
}
-
+
public static List removeRepeat(List list){
- Set set = new HashSet<>();
- List newList = new ArrayList();
+ Set set = new HashSet<>();
+ List newList = new ArrayList();
for (String cd:list) {
if(set.add(cd)){
newList.add(cd);
@@ -80,7 +80,7 @@ public class StringUtil {
}
return newList;
}
-
+
public static String camelToUnderline(String value) {
if (value == null || "".equals(value.trim())) {
return "";
diff --git a/src/main/java/com/eco/sc/customer/common/utils/XmlUtils.java b/src/main/java/com/eco/sc/customer/common/utils/XmlUtils.java
index be2d48f..765b4fa 100644
--- a/src/main/java/com/eco/sc/customer/common/utils/XmlUtils.java
+++ b/src/main/java/com/eco/sc/customer/common/utils/XmlUtils.java
@@ -1,7 +1,6 @@
package com.eco.sc.customer.common.utils;
-import ch.qos.logback.core.joran.spi.XMLUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
@@ -9,8 +8,6 @@ import net.sf.json.JSON;
import net.sf.json.xml.XMLSerializer;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
import java.util.List;
@@ -19,7 +16,6 @@ import java.util.Optional;
@Slf4j
public class XmlUtils {
- protected static Logger logger = LoggerFactory.getLogger(XMLUtil.class);
public static Element getRootElement(String xmlStr) {
Document document = null;
diff --git a/src/main/java/com/eco/sc/customer/framework/config/MybatisPlusConfig.java b/src/main/java/com/eco/sc/customer/framework/config/MybatisPlusConfig.java
index 1c5adba..79153ef 100644
--- a/src/main/java/com/eco/sc/customer/framework/config/MybatisPlusConfig.java
+++ b/src/main/java/com/eco/sc/customer/framework/config/MybatisPlusConfig.java
@@ -38,10 +38,10 @@ public class MybatisPlusConfig {
return interceptor;
}
- @Bean
+ /*@Bean
public SqlCostInterceptor sqlCostInterceptor() {
return new SqlCostInterceptor();
- }
+ }*/
@Bean
public MyMetaObjectHandler myMetaObjectHandler() {
@@ -52,4 +52,4 @@ public class MybatisPlusConfig {
public HSqlInject hSqlInject() {
return new HSqlInject();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/eco/sc/customer/helper/callback/PhoneCallbackHelper.java b/src/main/java/com/eco/sc/customer/helper/callback/PhoneCallbackHelper.java
index 7fa0180..ab32952 100644
--- a/src/main/java/com/eco/sc/customer/helper/callback/PhoneCallbackHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/callback/PhoneCallbackHelper.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.fission.common.pojo.dto.phone.CallBackVo;
import com.eco.fission.common.pojo.dto.phone.MsgCallBackVo;
@@ -15,7 +16,6 @@ import com.eco.sc.customer.business.service.TblWxConversationServiceImpl;
import com.eco.sc.customer.business.service.TblWxMessageServiceImpl;
import com.eco.sc.customer.business.service.WxTransferService;
import com.eco.sc.customer.business.service.mongo.WxMessageServiceImpl;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.phone.MsgTypeEnum;
import com.eco.sc.customer.common.utils.CollectionUtil;
import com.eco.sc.customer.common.utils.ObjConvertUtils;
diff --git a/src/main/java/com/eco/sc/customer/helper/callback/WxCallbackHelper.java b/src/main/java/com/eco/sc/customer/helper/callback/WxCallbackHelper.java
index 242e390..0b256ee 100644
--- a/src/main/java/com/eco/sc/customer/helper/callback/WxCallbackHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/callback/WxCallbackHelper.java
@@ -1,6 +1,5 @@
package com.eco.sc.customer.helper.callback;
-import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -23,15 +22,15 @@ import com.eco.sc.customer.business.service.impl.TblWxAddFriendLogServiceImpl;
import com.eco.sc.customer.business.service.impl.TblWxAddFriendRequestContentLogServiceImpl;
import com.eco.sc.customer.common.constant.CallBackCode;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.sc.customer.common.utils.*;
+import com.eco.sc.customer.common.utils.CollectionUtil;
+import com.eco.sc.customer.common.utils.FileHelper;
+import com.eco.sc.customer.common.utils.MD5Util;
import com.eco.sc.customer.helper.callback.core.CacheDataHelper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.Set;
diff --git a/src/main/java/com/eco/sc/customer/helper/callback/core/CacheDataHelper.java b/src/main/java/com/eco/sc/customer/helper/callback/core/CacheDataHelper.java
index a44c015..a14c893 100644
--- a/src/main/java/com/eco/sc/customer/helper/callback/core/CacheDataHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/callback/core/CacheDataHelper.java
@@ -3,8 +3,8 @@ package com.eco.sc.customer.helper.callback.core;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.eco.common.commonbase.utils.CollectionUtil;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.commonbase.utils.CollectionUtil;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.sc.customer.business.pojo.dto.WeChatChatRoomMemberDto;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotCustomer;
diff --git a/src/main/java/com/eco/sc/customer/helper/callback/core/RequestCoreHelper.java b/src/main/java/com/eco/sc/customer/helper/callback/core/RequestCoreHelper.java
index afc19ec..9b3dd95 100644
--- a/src/main/java/com/eco/sc/customer/helper/callback/core/RequestCoreHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/callback/core/RequestCoreHelper.java
@@ -4,7 +4,6 @@ import cn.hutool.core.lang.Console;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.redis.RedisCacheHelper;
-import com.eco.common.utils.XmlUtils;
import com.eco.fission.common.param.constants.Consts;
import com.eco.sc.customer.common.constant.ConstParam;
import com.eco.sc.customer.common.rest.HttpService;
diff --git a/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionQwHelper.java b/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionQwHelper.java
index 6285a75..34f92af 100644
--- a/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionQwHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionQwHelper.java
@@ -1,8 +1,8 @@
package com.eco.sc.customer.helper.callback.ext;
import com.alibaba.fastjson.JSONObject;
-import com.eco.sc.customer.common.rest.HttpService;
import com.eco.sc.customer.common.constant.ConstParam;
+import com.eco.sc.customer.common.rest.HttpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionWxHelper.java b/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionWxHelper.java
index c8ba7a0..5dea0c3 100644
--- a/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionWxHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/callback/ext/FissionWxHelper.java
@@ -2,9 +2,9 @@ package com.eco.sc.customer.helper.callback.ext;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.commonbase.exception.ServiceException;
import com.eco.common.commonbase.utils.CollectionUtil;
-import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.fission.common.param.enums.CustomerWordsTypeEnum;
import com.eco.fission.common.pojo.vo.CustomerGroupVo;
import com.eco.fission.common.pojo.vo.CustomerSysWordsRepVo;
diff --git a/src/main/java/com/eco/sc/customer/helper/qny/QnyParam.java b/src/main/java/com/eco/sc/customer/helper/qny/QnyParam.java
index e6ca0fe..6c64e8e 100644
--- a/src/main/java/com/eco/sc/customer/helper/qny/QnyParam.java
+++ b/src/main/java/com/eco/sc/customer/helper/qny/QnyParam.java
@@ -1,8 +1,6 @@
package com.eco.sc.customer.helper.qny;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/FissionCustomerHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/FissionCustomerHelper.java
index 0161dc6..3df2883 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/FissionCustomerHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/FissionCustomerHelper.java
@@ -1,7 +1,6 @@
package com.eco.sc.customer.helper.rpc;
import com.alibaba.fastjson.JSONObject;
-import com.eco.common.commonbase.utils.CollectionUtil;
import com.eco.common.base.entity.CommunityCustomerInfo;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.fission.common.param.constants.Consts;
@@ -14,6 +13,7 @@ import com.eco.sc.customer.common.cache.MapValueCacheHelper;
import com.eco.sc.customer.common.constant.enums.CacheKeyEnum;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.http.HttpStatus;
@@ -103,7 +103,7 @@ public class FissionCustomerHelper {
*/
public List cacheWechat(String account) {
List data = this.listDeviceAllByAccount(account);
- if (CollectionUtil.isEmpty(data)) {
+ if (CollectionUtils.isEmpty(data)) {
return Lists.newArrayList();
}
// 主设备集合
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerMsgServiceImpl.java b/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerMsgServiceImpl.java
index bd0af95..d1ade02 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerMsgServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerMsgServiceImpl.java
@@ -2,13 +2,12 @@ package com.eco.sc.customer.helper.rpc;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.enums.WxContentTypeEnum;
+import com.eco.common.redis.RedisCacheHelper;
import com.eco.fission.common.rpc.RpcCustomerMsgService;
import com.eco.sc.customer.helper.callback.core.CacheDataHelper;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.Service;
import org.springframework.stereotype.Component;
-import com.eco.common.redis.RedisCacheHelper;
-
import javax.annotation.Resource;
import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerVisibleRangesServiceImpl.java b/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerVisibleRangesServiceImpl.java
index 7344eb0..a48ff10 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerVisibleRangesServiceImpl.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/RpcCustomerVisibleRangesServiceImpl.java
@@ -34,15 +34,13 @@ import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
-import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_PROTOCOL;
-
/**
* @author xiaoxx
* @date 2023/3/1 16:12
*/
@Slf4j
@Component
-@Service(protocol = DUBBO_PROTOCOL, timeout = 10000)
+@Service(protocol = {"rest", "dubbo"}, timeout = 10000)
public class RpcCustomerVisibleRangesServiceImpl implements RpcCustomerVisibleRangesService {
@Resource
@@ -109,7 +107,8 @@ public class RpcCustomerVisibleRangesServiceImpl implements RpcCustomerVisibleRa
}
@Override
- public void clearCustomerVisibleRanges(String account, String weChatId, String friendId) {
+ public void clearCustomerVisibleRanges(String account, String weChatId, List friendWxIds) {
+
String cacheKey = caffeineCacheHelper.initCache("CUSTOMER_VISIBLE_RANGES", account, weChatId);
caffeineCacheHelper.deleteByKey(cacheKey);
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/ChannelHandlerContextHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/ChannelHandlerContextHelper.java
index c8f5cc1..3163bb3 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/ChannelHandlerContextHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/ChannelHandlerContextHelper.java
@@ -1,6 +1,7 @@
package com.eco.sc.customer.helper.rpc.helper;
import Jubo.JuLiao.IM.Wx.Proto.ChatRoomChangedNotice;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.rpc.NettyConnectionService;
@@ -247,7 +248,7 @@ public class ChannelHandlerContextHelper {
allAccount = join + "," + allAccount;
}
if (StringUtils.isEmpty(allAccount)) {
- log.info("{} --> 获取客服账号失败", weChatId);
+ log.info("{} {}--> 获取客服账号失败", weChatId, JSONUtil.toJsonStr(allAccount));
return Lists.newArrayList();
}
@@ -267,7 +268,7 @@ public class ChannelHandlerContextHelper {
}
}
} catch (Exception e) {
- log.error("error --> ", e);;
+ log.error("error --> ", e);
}
return returnAccount;
}
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/ClipBoardTalkToFriendTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/ClipBoardTalkToFriendTaskHelper.java
index 9922680..12910cc 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/ClipBoardTalkToFriendTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/ClipBoardTalkToFriendTaskHelper.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.common.rpc.helper.ClipBoardTalkToFriendTaskService;
import com.eco.common.utils.XmlUtils;
@@ -15,7 +16,6 @@ import com.eco.sc.customer.business.service.impl.CommunityCustomerInfoServiceImp
import com.eco.sc.customer.business.service.impl.CommunityRobotCustomerServiceImpl;
import com.eco.sc.customer.business.service.impl.CommunityRobotWxGroupServiceImpl;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.helper.callback.core.CacheDataHelper;
import com.eco.sc.customer.helper.callback.core.RequestCoreHelper;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/ConversationReadHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/ConversationReadHelper.java
index d78f119..b9782b6 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/ConversationReadHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/ConversationReadHelper.java
@@ -2,8 +2,8 @@ package com.eco.sc.customer.helper.rpc.helper;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
-import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.base.dto.WeChatMessageDto;
+import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.rpc.helper.ConversationReadService;
import com.eco.sc.customer.business.pojo.entity.TblWxConversation;
import com.eco.sc.customer.business.service.TblWxConversationServiceImpl;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestChatRoomInfoTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestChatRoomInfoTaskHelper.java
index 17486d0..ca85649 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestChatRoomInfoTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestChatRoomInfoTaskHelper.java
@@ -129,7 +129,7 @@ public class RequestChatRoomInfoTaskHelper implements RequestChatRoomInfoTaskSer
objectChatroomPushNoticeChatRoom.put("ChatRoomAdminEnable", robotWxGroup.getChatRoomAdminEnable());
// 群成员信息
- List tblWxGroupMembers = communityRobotWxGroupMemberService.listByWeChatIdAndChatRoomId(weChatId, robotWxGroup.getChatRoomId());
+ List tblWxGroupMembers = communityRobotWxGroupMemberService.listByWeChatIdAndGroupId(weChatId, robotWxGroup.getId());
List memberList = tblWxGroupMembers.stream().map(CommunityRobotWxGroupMember::getWxId).distinct().collect(Collectors.toList());
objectChatroomPushNoticeChatRoom.put("MemberList", memberList);
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestTalkDetailTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestTalkDetailTaskHelper.java
index 80d9f2c..3d5a742 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestTalkDetailTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/RequestTalkDetailTaskHelper.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.dto.WeChatMessageDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.common.rpc.helper.RequestTalkDetailTaskService;
import com.eco.fission.common.pojo.bo.CallbackInfo;
@@ -14,7 +15,6 @@ import com.eco.sc.customer.business.pojo.entity.mongo.WxMessage;
import com.eco.sc.customer.business.service.TblWxMessageServiceImpl;
import com.eco.sc.customer.business.service.TblWxPrivateMsgLogServiceImpl;
import com.eco.sc.customer.business.service.mongo.WxMessageServiceImpl;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.WxEnumMsgType;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.common.utils.JuXmlUtil;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TalkToFriendTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TalkToFriendTaskHelper.java
index 86d6f93..06fbaf4 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TalkToFriendTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TalkToFriendTaskHelper.java
@@ -14,13 +14,10 @@ import com.eco.common.utils.XmlUtils;
import com.eco.fission.common.db.entity.XcxResource;
import com.eco.fission.common.param.enums.RobotWxLoginTypeEnum;
import com.eco.fission.common.utils.StringUtils;
-import com.eco.sc.customer.business.pojo.entity.CommunityRobotInfo;
+import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxInfo;
import com.eco.sc.customer.business.service.PrivateMsgService;
import com.eco.sc.customer.business.service.WxTransferService;
-import com.eco.sc.customer.business.service.impl.CommunityCustomerInfoServiceImpl;
-import com.eco.sc.customer.business.service.impl.CommunityRobotCustomerServiceImpl;
-import com.eco.sc.customer.business.service.impl.CommunityRobotInfoServiceImpl;
-import com.eco.sc.customer.business.service.impl.CommunityRobotWxGroupServiceImpl;
+import com.eco.sc.customer.business.service.impl.*;
import com.eco.sc.customer.common.constant.ConstParam;
import com.eco.sc.customer.common.utils.*;
import com.eco.sc.customer.framework.exception.ServerResponse;
@@ -65,6 +62,9 @@ public class TalkToFriendTaskHelper implements TalkToFriendTaskService {
@Resource
private PhoneRobotHelper phoneRobotHelper;
+ @Resource
+ private CommunityRobotWxInfoServiceImpl communityRobotWxInfoService;
+
@Resource
private PcWxRobotHelper pcWxRobotHelper;
@Resource
@@ -104,11 +104,11 @@ public class TalkToFriendTaskHelper implements TalkToFriendTaskService {
return;
}
// 消息发送队列
- CommunityRobotInfo robotInfo = communityRobotInfoService.getByWechatId(weChatId);
- if (robotInfo == null) {
+ CommunityRobotWxInfo lastByWxId = communityRobotWxInfoService.getLastByWxId(weChatId);
+ if (lastByWxId == null) {
throw new ServiceException("设备不存在");
}
- RobotWxLoginTypeEnum wxLoginType = robotInfo.getWxLoginType();
+ RobotWxLoginTypeEnum wxLoginType = RobotWxLoginTypeEnum.IPAD;
String msgId = jsonObject.getString("MsgId");
String content = jsonObject.getString("Content");
content = Base64Util.decryptBase64(content.getBytes(StandardCharsets.UTF_8));
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerChatroomPushTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerChatroomPushTaskHelper.java
index 9ff792a..3aedb64 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerChatroomPushTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerChatroomPushTaskHelper.java
@@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.rpc.helper.TriggerChatroomPushTaskService;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroup;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotWxGroupMember;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerConversationPushTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerConversationPushTaskHelper.java
index 30bcb7d..f820757 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerConversationPushTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerConversationPushTaskHelper.java
@@ -8,12 +8,12 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.eco.common.commonbase.mybatis.BaseEntity;
+import com.eco.common.base.dto.SupportCustomerDto;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.commonbase.mybatis.BaseEntity;
import com.eco.common.rpc.helper.TriggerConversationPushTaskService;
import com.eco.fission.common.param.constants.Consts;
import com.eco.fission.common.utils.StringUtils;
-import com.eco.common.base.dto.SupportCustomerDto;
import com.eco.sc.customer.business.pojo.entity.TblCustomerConfig;
import com.eco.sc.customer.business.pojo.entity.TblCustomerSupport;
import com.eco.sc.customer.business.pojo.entity.TblWxConversation;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerFriendPushTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerFriendPushTaskHelper.java
index d1e1730..a94e499 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerFriendPushTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerFriendPushTaskHelper.java
@@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.commonbase.mybatis.PageParam;
import com.eco.common.rpc.helper.TriggerFriendPushTaskService;
import com.eco.fission.common.utils.StringUtils;
import com.eco.sc.customer.business.pojo.entity.CommunityRobotCustomer;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerHistoryMsgPushTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerHistoryMsgPushTaskHelper.java
index affa825..53df688 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerHistoryMsgPushTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/TriggerHistoryMsgPushTaskHelper.java
@@ -3,6 +3,7 @@ package com.eco.sc.customer.helper.rpc.helper;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.rpc.helper.TriggerHistoryMsgPushTaskService;
import com.eco.sc.customer.business.pojo.entity.CommunityCustomerGroupInviteLog;
import com.eco.sc.customer.business.pojo.entity.TblShieldUser;
@@ -11,7 +12,6 @@ import com.eco.sc.customer.business.service.TblShieldUserServiceImpl;
import com.eco.sc.customer.business.service.TblWxMessageServiceImpl;
import com.eco.sc.customer.business.service.impl.CommunityCustomerGroupInviteLogServiceImpl;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.constant.enums.WxEnumMsgType;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.common.utils.CollectionUtil;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwClipBoardTalkToFriendTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwClipBoardTalkToFriendTaskHelper.java
index 1bce7d4..559053b 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwClipBoardTalkToFriendTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwClipBoardTalkToFriendTaskHelper.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.common.rpc.helper.qw.QwClipBoardTalkToFriendTaskService;
import com.eco.sc.customer.business.service.PrivateMsgService;
@@ -13,7 +14,6 @@ import com.eco.sc.customer.business.service.impl.CommunityCustomerInfoServiceImp
import com.eco.sc.customer.business.service.impl.CommunityRobotCustomerServiceImpl;
import com.eco.sc.customer.business.service.impl.CommunityRobotWxGroupServiceImpl;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.helper.callback.core.CacheDataHelper;
import com.eco.sc.customer.helper.callback.core.QwRequestCoreHelper;
diff --git a/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwTalkToFriendTaskHelper.java b/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwTalkToFriendTaskHelper.java
index 2967ffe..e0e49a2 100644
--- a/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwTalkToFriendTaskHelper.java
+++ b/src/main/java/com/eco/sc/customer/helper/rpc/helper/qw/QwTalkToFriendTaskHelper.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.eco.common.base.dto.WeChatChatRoomDto;
import com.eco.common.base.entity.CommunityCustomerInfo;
+import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.common.redis.RedisCacheHelper;
import com.eco.common.rpc.helper.qw.QwTalkToFriendTaskService;
import com.eco.fission.common.param.enums.RobotWxLoginTypeEnum;
@@ -18,7 +19,6 @@ import com.eco.sc.customer.business.service.impl.CommunityRobotCustomerServiceIm
import com.eco.sc.customer.business.service.impl.CommunityRobotInfoServiceImpl;
import com.eco.sc.customer.business.service.impl.CommunityRobotWxGroupServiceImpl;
import com.eco.sc.customer.common.constant.ConstParam;
-import com.eco.common.base.enums.WxContentTypeEnum;
import com.eco.sc.customer.common.utils.Base64Util;
import com.eco.sc.customer.common.utils.FfmpegCmdDurationUtil;
import com.eco.sc.customer.framework.exception.ServerResponse;
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index 2fcae29..92195bc 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -6,6 +6,8 @@ server:
io-threads: 32
worker-threads: 256
spring:
+ main:
+ allow-bean-definition-overriding: true
application:
name: ${spring.cloud.nacos.discovery.service}-@activatedProperties@
profiles:
@@ -15,9 +17,9 @@ spring:
discovery:
server-addr: @addr@
service: customer-service-core
- namespace: d5123679-020d-46d6-8ac8-f17bdd08e8e2
+ namespace: @namespace@
config:
- namespace: d5123679-020d-46d6-8ac8-f17bdd08e8e2
+ namespace: @namespace@
server-addr: @addr@
file-extension: yml
ext-config:
@@ -52,12 +54,12 @@ spring:
url: jdbc:mysql://39.100.77.21:3306/fission_custom_sys?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: y7z7noq2
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
scrm:
- url: jdbc:mysql://39.100.77.21:3306/fission_server_v2?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useAffectedRows=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://39.100.77.21:3306/marketing-scrm?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useAffectedRows=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: root
password: y7z7noq2
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
redis:
database: 11
port: 6379
@@ -71,32 +73,38 @@ mybatis-plus:
# log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
dubbo:
+ config:
+ multiple: true
application:
name: customer-service-core
- protocol:
- id: dubbo
- # host: 192.168.6.201
- port: -1
+ protocols:
+ dubbo:
+ id: dubbo
+ # host: 192.168.6.201
+ port: -1
+ rest:
+ name: rest
+ server: tomcat
+ port: 8082
registry:
- address: nacos://172.18.0.228:8848
+ address: nacos://@addr@
+ register-mode: instance
parameters:
- namespace: d5123679-020d-46d6-8ac8-f17bdd08e8e2
+ namespace: @namespace@
+ group: customer-service-group
metadata-report:
- address: nacos://172.18.0.228:8848
+ address: nacos://@addr@
management:
endpoints:
web:
exposure:
include: '*'
-logging:
- config: @logfile@
- level:
- root: warn
- com:
- eco:
- sc:
- customer:
- common:
- rest: info
+
+minio:
+ endpoint: http://39.185.226.219:28196/ #MinIO服务所在地址
+ accessKey: WXEAqKHtEIgrOFjV #访问的key
+ secretKey: y2ve04h6hctMMdc9pQhwSXAjxAtPcFA4 #访问的秘钥
+ bucketName: bcrm-test #访问的存储桶名
+ expiry: 86400 #过期时间
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000..b4b8f2d
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,4 @@
+log4j.rootLogger=WARN, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
diff --git a/src/main/resources/logback-client.xml b/src/main/resources/logback-client.xml
deleted file mode 100644
index 9d7cbee..0000000
--- a/src/main/resources/logback-client.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${LOG_PATTERN}
-
- UTF-8
-
-
-
-
-
-
- ${APP_HOME}/${APP_NAME}.log
-
-
-
- ${LOG_HOME}/${APP_NAME}.%d{yyyy-MM-dd}.%i.log
-
- 1024MB
- 3
- 5000MB
- true
-
-
-
-
-
- ${LOG_PATTERN}
-
- UTF-8
-
-
-
- INFO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..77340d5
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,88 @@
+
+
+ elAdmin
+
+
+
+
+
+
+
+
+
+
+ %highlight([%-5level]) %cyan(%d{yyyy-MM-dd#HH:mm:ss.SSS}) %yellow([Thread:%thread]) %magenta([Logger:%logger]) -> %msg%n
+ utf-8
+
+
+
+
+
+ ${LOG_DIR}/log.log
+
+
+
+ ${LOG_DIR}/history/%d{yyyy-MM-dd}.gz
+ 30
+
+
+ true
+
+
+ ${LOG_PATTERN}
+ utf-8
+
+
+
+
+ INFO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+