diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 841206814bd69a85cbe82b990873c30c702d1fc7..642d572ce90e5085986bdd9c9204b9404f028084 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=http://10.252.96.249:8081/repository/maven-public//org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=http://10.252.96.249:8081/repository/maven-public//io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/linkwe-admin/pom.xml b/linkwe-admin/pom.xml
index 49a8ff57a4fe9c408ee868eb3d443624a03a2573..3120daf4437f8bc7256e18e8d73849bef84f6165 100644
--- a/linkwe-admin/pom.xml
+++ b/linkwe-admin/pom.xml
@@ -75,18 +75,13 @@
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-config
+ javax.xml.bind
+ jaxb-api
-
-
-
-
-
- javax.xml.bind
- jaxb-api
+ io.github.leejoker
+ linkwechat-nacos-starter
diff --git a/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java b/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java
index 760220aead86479ae9da0c2c6068749745e0e679..472e53ac769799aa437dad69e424556d5686bc49 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/LinkWeChatApplication.java
@@ -6,7 +6,6 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.scheduling.annotation.EnableAsync;
/**
@@ -16,13 +15,11 @@ import org.springframework.scheduling.annotation.EnableAsync;
*/
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, PageHelperAutoConfiguration.class})
@MapperScan("com.linkwechat.*.mapper")
-@ForestScan(basePackages = {"com.linkwechat.wecom.client","com.linkwechat.wecom.wxclient"})
+@ForestScan(basePackages = {"com.linkwechat.wecom.client", "com.linkwechat.wecom.wxclient"})
@EnableAsync
-@EnableDiscoveryClient
public class LinkWeChatApplication {
public static void main(String[] args) {
-
SpringApplication.run(LinkWeChatApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ LinkWeChat启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/common/CommonController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/common/CommonController.java
index c0deb36aa6a68d1c5fe7550b19408d156ceb9e26..0190466b5497ed8402522699f124cbf91e4be8ef 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/common/CommonController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/common/CommonController.java
@@ -5,19 +5,25 @@ import com.linkwechat.common.config.RuoYiConfig;
import com.linkwechat.common.config.ServerConfig;
import com.linkwechat.common.constant.Constants;
import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.core.domain.FileVo;
import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.common.utils.file.FileUploadUtils;
import com.linkwechat.common.utils.file.FileUtils;
+import com.linkwechat.common.utils.file.MimeTypeUtils;
+import com.linkwechat.framework.web.domain.server.SysFile;
+import com.linkwechat.framework.web.service.FileService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* 通用请求处理
@@ -31,8 +37,9 @@ public class CommonController {
@Autowired
private ServerConfig serverConfig;
+
@Autowired
- private CosConfig cosConfig;
+ private FileService fileService;
/**
* 通用下载请求
@@ -114,23 +121,32 @@ public class CommonController {
* 通用上传请求
*/
@PostMapping("/common/uploadFile2Cos")
- public AjaxResult uploadFile2Cos(MultipartFile file) throws Exception {
+ public AjaxResult uploadFile2Cos(MultipartFile file){
try {
- String fileName = FileUploadUtils.upload2Cos(file, cosConfig);
-
- AjaxResult ajax = AjaxResult.success();
- ajax.put("fileName", fileName);
- ajax.put("url", url(fileName));
- return ajax;
+ SysFile sysFile
+ = fileService.upload(file);
+ return AjaxResult.success(
+ FileVo.builder()
+ .fileName(sysFile.getFileName())
+ .url(sysFile.getImgUrlPrefix()+sysFile.getFileName())
+ .build()
+ );
} catch (Exception e) {
- return AjaxResult.error(e.getMessage());
+ return AjaxResult.error("不支持当前文件上传或文件过大建议传20MB以内的文件");
}
}
- public String url(String fileName){
- return "https://link-wechat-1251309172.cos.ap-nanjing.myqcloud.com/"+fileName;
+ /**
+ * 获取图片
+ */
+ @GetMapping("/common/findImage")
+ public void findImage(HttpServletResponse response,String fileName){
+ fileService.findImage(fileName,response);
}
+
+
+
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/system/SysLoginController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/system/SysLoginController.java
index ed5e2a3fe8cb983fa02c0a3db9c9c53edd71a681..f570f521ade761589220494ddcdfd1b2b4770dd8 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/system/SysLoginController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/system/SysLoginController.java
@@ -1,7 +1,9 @@
package com.linkwechat.web.controller.system;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.linkwechat.common.constant.Constants;
import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.core.domain.entity.SysDept;
import com.linkwechat.common.core.domain.entity.SysMenu;
import com.linkwechat.common.core.domain.entity.SysUser;
import com.linkwechat.common.core.domain.model.LoginBody;
@@ -10,11 +12,13 @@ import com.linkwechat.common.utils.ServletUtils;
import com.linkwechat.framework.web.service.SysLoginService;
import com.linkwechat.framework.web.service.SysPermissionService;
import com.linkwechat.framework.web.service.TokenService;
+import com.linkwechat.system.service.ISysDeptService;
import com.linkwechat.system.service.ISysMenuService;
import com.linkwechat.wecom.client.WeAccessTokenClient;
import com.linkwechat.common.core.domain.entity.WeCorpAccount;
import com.linkwechat.wecom.domain.dto.WeLoginUserInfoDto;
import com.linkwechat.wecom.service.IWeCorpAccountService;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -52,6 +56,9 @@ public class SysLoginController
@Autowired
private WeAccessTokenClient weAccessTokenClient;
+ @Autowired
+ private ISysDeptService iSysDeptService;
+
/**
* 登录方法
@@ -86,6 +93,15 @@ public class SysLoginController
Set roles = permissionService.getRolePermission(user);
// 权限集合
Set permissions = permissionService.getMenuPermission(user);
+
+ List sysDepts = iSysDeptService.selectDeptList(SysDept.builder().parentId(new Long(0)).build());
+
+ if(!CollectionUtils.isEmpty(sysDepts)){
+ user.setCompanyName(
+ sysDepts.stream().findFirst().get().getDeptName()
+ );
+ }
+
//校验用户是否拥有可用corpid
WeCorpAccount wxCorpAccount
= iWxCorpAccountService.findValidWeCorpAccount();
@@ -154,19 +170,31 @@ public class SysLoginController
}
+
/**
- * 租户登录
+ * 通过企业id和企业密钥登录
* @param corpId
* @param corpSecret
* @return
*/
- @GetMapping("/tenantLogin")
- public AjaxResult tenantLogin(String corpId,String corpSecret){
- AjaxResult ajax = AjaxResult.success();
+ @GetMapping("/corpLogin")
+ public AjaxResult corpLogin(String corpId,String corpSecret){
+ WeCorpAccount weCorpAccount = iWxCorpAccountService.getOne(new LambdaQueryWrapper()
+ .eq(WeCorpAccount::getCorpId, corpId)
+ .eq(WeCorpAccount::getCorpSecret, corpSecret)
+ .eq(WeCorpAccount::getDelFlag, Constants.NORMAL_CODE));
- return ajax;
+ if(weCorpAccount == null){
+
+ return AjaxResult.error("当前企业id与企业密码不匹配或不存在");
+ }
+
+ return AjaxResult.success(
+ loginService.noPwdLogin(weCorpAccount.getCorpAccount())
+ );
}
+
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeAppController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeAppController.java
index e911068eb3e2cbf61e03bb297d02ef9f41d08218..eb7ebf684dd174746f80c15cb531e1ca60336dfb 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeAppController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeAppController.java
@@ -34,8 +34,8 @@ public class WeAppController extends BaseController {
- @PostMapping("/updateWeApp")
- public AjaxResult updateWeApp(@RequestBody WeApp weApp){
+ @PutMapping("/updateWeApp")
+ public AjaxResult updateWeApp(@RequestBody WeApp weApp){
iWeAppService.updateWeApp(weApp);
return AjaxResult.success();
}
@@ -47,4 +47,8 @@ public class WeAppController extends BaseController {
+
+
+
+
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCategoryController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCategoryController.java
index f92071599909879db3175d13ed242a1c7d7213ee..9709f0fa9ce8a9949a8f6f97222da5fb6cd8058a 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCategoryController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCategoryController.java
@@ -1,17 +1,21 @@
package com.linkwechat.web.controller.wecom;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.linkwechat.common.annotation.Log;
+import com.linkwechat.common.constant.Constants;
import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.AjaxResult;
import com.linkwechat.common.core.domain.Tree;
import com.linkwechat.common.enums.BusinessType;
import com.linkwechat.wecom.domain.WeCategory;
import com.linkwechat.wecom.service.IWeCategoryService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -22,14 +26,14 @@ import java.util.List;
*/
@RestController
@RequestMapping("/wecom/category")
+@Api("企业微信素材分类")
public class WeCategoryController extends BaseController {
@Autowired
private IWeCategoryService weCategoryService;
- /**
- * 类目树
- */
+
+
// @PreAuthorize("@ss.hasPermi('wechat:category:list')")
@GetMapping("/list")
@ApiOperation("类目树")
@@ -44,7 +48,7 @@ public class WeCategoryController extends BaseController {
@GetMapping(value = "/{id}")
@ApiOperation("通过id查询类目详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return AjaxResult.success(weCategoryService.findWeCategoryById(id));
+ return AjaxResult.success(weCategoryService.getById(id));
}
/**
@@ -55,7 +59,8 @@ public class WeCategoryController extends BaseController {
@PostMapping
@ApiOperation("添加类目")
public AjaxResult add(@RequestBody WeCategory category) {
- return toAjax(weCategoryService.insertWeCategory(category));
+ weCategoryService.insertWeCategory(category);
+ return AjaxResult.success();
}
/**
@@ -66,19 +71,32 @@ public class WeCategoryController extends BaseController {
@PutMapping
@ApiOperation("更新目录")
public AjaxResult edit(@RequestBody WeCategory category) {
- return toAjax(weCategoryService.updateWeCategory(category));
+ weCategoryService.updateWeCategory(category);
+ return AjaxResult.success();
}
/**
* 删除类目
*/
-// @PreAuthorize("@ss.hasPermi('wechat:category:remove')")
+// @PreAuthorize("@ss.hasPermi('wechat:category:remove')") Constants.DELETE_CODE
@Log(title = "删除类目", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@ApiOperation("删除类目")
public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(weCategoryService.deleteWeCategoryByIds(ids));
+ weCategoryService.deleteWeCategoryById(ids);
+// List categorys=new ArrayList<>();
+// for (Long id:ids) {
+// categorys.add(
+// WeCategory.builder()
+// .id(id)
+// .delFlag("55")
+// .build()
+// );
+// }
+// weCategoryService.updateBatchById(categorys);
+
+ return AjaxResult.success();
}
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java
index 293cb70bbbaf6b4538bd76e10cc7bf4370045c73..d9450b2bbd3516446308aa613b20a080dbe997bb 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java
@@ -35,7 +35,12 @@ public class WeChatCollectionController extends BaseController {
@Log(title = "添加收藏", businessType = BusinessType.INSERT)
@PostMapping("addCollection")
public AjaxResult addCollection(@RequestBody WeChatCollectionDto chatCollectionDto) {
- return toAjax(weChatCollectionService.addCollection(chatCollectionDto.getMaterialId(), chatCollectionDto.getUserId()));
+ boolean b =
+ weChatCollectionService.addCollection(chatCollectionDto.getMaterialId(), chatCollectionDto.getUserId());
+ if(weChatCollectionService.addCollection(chatCollectionDto.getMaterialId(), chatCollectionDto.getUserId())){
+ return AjaxResult.success();
+ }
+ return AjaxResult.success("当前素材不可重复收藏");
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatContactMsgController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatContactMsgController.java
new file mode 100644
index 0000000000000000000000000000000000000000..06a348f5416a7bc560fda641c65afc0942f3be69
--- /dev/null
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatContactMsgController.java
@@ -0,0 +1,156 @@
+package com.linkwechat.web.controller.wecom;
+
+import com.alibaba.fastjson.JSONObject;
+import com.linkwechat.common.annotation.Log;
+import com.linkwechat.common.core.controller.BaseController;
+import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.core.page.TableDataInfo;
+import com.linkwechat.common.enums.BusinessType;
+import com.linkwechat.common.utils.poi.ExcelUtil;
+import com.linkwechat.wecom.domain.WeChatContactMsg;
+import com.linkwechat.wecom.domain.vo.WeChatContactMsgVo;
+import com.linkwechat.wecom.service.IWeChatContactMsgService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 会话消息Controller
+ *
+ * @author ruoyi
+ * @date 2021-07-28
+ */
+@Api(tags = "会话存档管理")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/chat/msg" )
+public class WeChatContactMsgController extends BaseController {
+
+ private final IWeChatContactMsgService iWeChatContactMsgService;
+
+ /**
+ * 查询会话消息列表
+ */
+ @ApiOperation("查询会话消息列表")
+ @PreAuthorize("@ss.hasPermi('linkwechat:msg:list')")
+ @GetMapping("/list")
+ public TableDataInfo> list(WeChatContactMsg weChatContactMsg) {
+ startPage();
+ List list = iWeChatContactMsgService.queryList(weChatContactMsg);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出会话消息列表
+ */
+ @ApiOperation("导出会话消息列表")
+ @PreAuthorize("@ss.hasPermi('linkwechat:msg:export')" )
+ @Log(title = "会话消息" , businessType = BusinessType.EXPORT)
+ @GetMapping("/export" )
+ public AjaxResult export(WeChatContactMsg weChatContactMsg) {
+ List list = iWeChatContactMsgService.queryList(weChatContactMsg);
+ ExcelUtil util = new ExcelUtil(WeChatContactMsg.class);
+ return util.exportExcel(list, "msg" );
+ }
+
+ /**
+ * 获取会话消息详细信息
+ */
+ @ApiOperation("获取会话消息详细信息")
+ @PreAuthorize("@ss.hasPermi('linkwechat:msg:query')" )
+ @GetMapping(value = "/{id}" )
+ public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+ return AjaxResult.success(iWeChatContactMsgService.getById(id));
+ }
+
+ /**
+ * 新增会话消息
+ */
+ @ApiOperation("新增会话消息")
+ @PreAuthorize("@ss.hasPermi('linkwechat:msg:add')" )
+ @Log(title = "会话消息" , businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody WeChatContactMsg weChatContactMsg) {
+ return toAjax(iWeChatContactMsgService.save(weChatContactMsg) ? 1 : 0);
+ }
+
+ /**
+ * 修改会话消息
+ */
+ @ApiOperation("修改会话消息")
+ @PreAuthorize("@ss.hasPermi('linkwechat:msg:edit')" )
+ @Log(title = "会话消息" , businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody WeChatContactMsg weChatContactMsg) {
+ return toAjax(iWeChatContactMsgService.updateById(weChatContactMsg) ? 1 : 0);
+ }
+
+ /**
+ * 删除会话消息
+ */
+ @ApiOperation("删除会话消息")
+ @PreAuthorize("@ss.hasPermi('linkwechat:msg:remove')" )
+ @Log(title = "会话消息" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}" )
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(iWeChatContactMsgService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+ }
+
+ /**
+ * 外部联系人/单聊 会话列表
+ */
+ @ApiOperation("外部联系人 会话列表")
+ @Log(title = "外部联系人 会话列表" , businessType = BusinessType.OTHER)
+ @GetMapping("/selectExternalChatList/{fromId}" )
+ public AjaxResult> selectExternalChatList(@PathVariable("fromId") String fromId) {
+ return AjaxResult.success(iWeChatContactMsgService.selectExternalChatList(fromId));
+ }
+
+ /**
+ * 外部联系人/单聊 会话列表
+ */
+ @ApiOperation("单聊 会话列表")
+ @Log(title = "单聊 会话列表" , businessType = BusinessType.OTHER)
+ @GetMapping("/selectAloneChatList" )
+ public AjaxResult> selectAloneChatList(WeChatContactMsg weChatContactMsg) {
+ return AjaxResult.success(iWeChatContactMsgService.selectAloneChatList(weChatContactMsg));
+ }
+
+ /**
+ * 内部联系人 会话列表
+ */
+ @ApiOperation("内部联系人 会话列表")
+ @Log(title = "内部联系人 会话列表" , businessType = BusinessType.OTHER)
+ @GetMapping("/selectInternalChatList" )
+ public AjaxResult> selectInternalChatList(@PathVariable("fromId") String fromId) {
+ return AjaxResult.success(iWeChatContactMsgService.selectInternalChatList(fromId));
+ }
+
+ /**
+ * 群聊 会话列表
+ */
+ @ApiOperation("群聊 会话列表")
+ @Log(title = "群聊 会话列表" , businessType = BusinessType.OTHER)
+ @GetMapping("/selectGroupChatList/{fromId}" )
+ public AjaxResult> selectGroupChatList(@PathVariable("fromId") String fromId) {
+ return AjaxResult.success(iWeChatContactMsgService.selectGroupChatList(fromId));
+ }
+
+ /**
+ * 全文检索 会话列表
+ */
+ @ApiOperation("全文检索 会话列表")
+ @Log(title = "全文检索 会话列表" , businessType = BusinessType.OTHER)
+ @GetMapping("/selectFullSearchChatList" )
+ public TableDataInfo> selectFullSearchChatList(WeChatContactMsg weChatContactMsg) {
+ startPage();
+ List list = iWeChatContactMsgService.selectFullSearchChatList(weChatContactMsg);
+ return getDataTable(list);
+ }
+}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityGroupSopController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityGroupSopController.java
index 8b87b5727305700141b3633064771bee26931a05..c00d8ec20fa0ea43a663c96f0c5d515b20e40de6 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityGroupSopController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityGroupSopController.java
@@ -64,11 +64,13 @@ public class WeCommunityGroupSopController extends BaseController {
// @PreAuthorize("@ss.hasPermi('wecom:communityGroupSop:add')")
@PostMapping(path = "/")
public AjaxResult addGroupSop(@Validated @RequestBody WeGroupSopDto groupSopDto) {
- if (!groupSopService.isRuleNameUnique(groupSopDto.getRuleName())) {
- return AjaxResult.error(HttpStatus.BAD_REQUEST, "规则名称已存在");
- }
+
WeGroupSop weGroupSop = new WeGroupSop();
BeanUtils.copyProperties(groupSopDto, weGroupSop);
+
+ if (groupSopService.isNameOccupied(weGroupSop)) {
+ return AjaxResult.error(HttpStatus.BAD_REQUEST, "规则名称已存在");
+ }
weGroupSop.setCreateBy(SecurityUtils.getUsername());
// 群聊id列表
List groupIdList = groupSopDto.getChatIdList();
@@ -116,14 +118,15 @@ public class WeCommunityGroupSopController extends BaseController {
if (null == groupSopService.getGroupSopById(ruleId)) {
return AjaxResult.error(HttpStatus.NOT_FOUND, "该群SOP规则不存在");
}
+ WeGroupSop weGroupSop = new WeGroupSop();
+ weGroupSop.setRuleId(ruleId);
+ BeanUtils.copyProperties(groupSopDto, weGroupSop);
+
// 校验规则名是否可用
- WeGroupSopVo original = groupSopService.getGroupSopById(ruleId);
- if (!groupSopDto.getRuleName().equals(original.getRuleName()) && !groupSopService.isRuleNameUnique(groupSopDto.getRuleName())) {
+ if (groupSopService.isNameOccupied(weGroupSop)) {
return AjaxResult.error(HttpStatus.BAD_REQUEST, "规则名称已存在");
}
- WeGroupSop weGroupSop = new WeGroupSop();
- BeanUtils.copyProperties(groupSopDto, weGroupSop);
- weGroupSop.setRuleId(ruleId);
+
weGroupSop.setUpdateBy(SecurityUtils.getUsername());
// 群聊id列表
List groupIdList = groupSopDto.getChatIdList();
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityH5Controller.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityH5Controller.java
index 8f0967343ebc1a6018f5c3dc01af757250fa9efb..8c8fb885b4c65470e8d2d78657aaeea5be0a348d 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityH5Controller.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityH5Controller.java
@@ -6,7 +6,7 @@ import com.linkwechat.common.core.domain.entity.SysUser;
import com.linkwechat.common.core.page.TableDataInfo;
import com.linkwechat.common.enums.CommunityTaskType;
import com.linkwechat.system.service.ISysUserService;
-import com.linkwechat.wecom.domain.vo.WeKeywordGroupTaskVo;
+import com.linkwechat.wecom.domain.WeKeywordGroupTask;
import com.linkwechat.wecom.service.IWeCommunityKeywordToGroupService;
import com.linkwechat.wecom.service.IWeGroupSopService;
import com.linkwechat.wecom.service.IWePresTagGroupTaskService;
@@ -106,7 +106,6 @@ public class WeCommunityH5Controller extends BaseController {
}
-
/**
* 用于支持H5页面的名称和关键字检索
*
@@ -116,7 +115,7 @@ public class WeCommunityH5Controller extends BaseController {
@GetMapping(path = "/filter")
public TableDataInfo filter(@RequestParam("word") String word) {
startPage();
- List taskList = keywordToGroupService.filterByNameOrKeyword(word);
+ List taskList = keywordToGroupService.filterByNameOrKeyword(word);
return getDataTable(taskList);
}
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityKeywordGroupController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityKeywordGroupController.java
index 6a42e96430af168dbbd7c1eccf91e6432d68c972..3e6517d0c96b3cba53b71a1064165af4246e5a16 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityKeywordGroupController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityKeywordGroupController.java
@@ -1,57 +1,42 @@
package com.linkwechat.web.controller.wecom;
-import com.linkwechat.common.constant.HttpStatus;
import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.AjaxResult;
import com.linkwechat.common.core.page.TableDataInfo;
import com.linkwechat.common.utils.SecurityUtils;
-import com.linkwechat.common.utils.bean.BeanUtils;
import com.linkwechat.wecom.domain.WeKeywordGroupTask;
-import com.linkwechat.wecom.domain.dto.WeKeywordGroupTaskDto;
-import com.linkwechat.wecom.domain.vo.WeKeywordGroupTaskVo;
import com.linkwechat.wecom.service.IWeCommunityKeywordToGroupService;
-import com.linkwechat.wecom.service.IWeGroupCodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.List;
/**
* 关键词拉群controller
*/
+@Api(tags = "关键词拉群")
@RestController
@RequestMapping(value = "/wecom/communityKeywordGroup")
public class WeCommunityKeywordGroupController extends BaseController {
@Autowired
- private IWeCommunityKeywordToGroupService keywordToGroupService;
+ private IWeCommunityKeywordToGroupService service;
- @Autowired
- private IWeGroupCodeService groupCodeService;
/**
* 根据过滤条件获取关键词拉群任务列表
- *
- * @param taskName 任务名称
- * @param createBy 创建人
- * @param keyword 关键词
- * @param beginTime 开始时间
- * @param endTime 结束时间
- * @return 列表数据
*/
+ @ApiOperation(value = "获取关键词拉群任务列表")
// @PreAuthorize("@ss.hasPermi('wecom:communityKeyword:list')")
@GetMapping(path = "/list")
- public TableDataInfo> list(
- @RequestParam(value = "taskName", required = false) String taskName,
- @RequestParam(value = "createBy", required = false) String createBy,
- @RequestParam(value = "keyword", required = false) String keyword,
- @RequestParam(value = "beginTime", required = false) String beginTime,
- @RequestParam(value = "endTime", required = false) String endTime
- ) {
+ public TableDataInfo> list(WeKeywordGroupTask task) {
startPage();
- List taskList = keywordToGroupService
- .getTaskList(taskName, createBy, keyword, beginTime, endTime);
+ List taskList = service.getTaskList(task);
return getDataTable(taskList);
}
@@ -61,62 +46,43 @@ public class WeCommunityKeywordGroupController extends BaseController {
* @param taskId 任务id
* @return 任务详情
*/
+ @ApiOperation(value = "获取任务详情")
// @PreAuthorize("@ss.hasPermi('wecom:communityKeyword:query')")
@GetMapping(path = "/{taskId}")
- public AjaxResult getTask(@PathVariable("taskId") Long taskId) {
- return AjaxResult.success(keywordToGroupService.getTaskById(taskId));
+ public AjaxResult getTask(@ApiParam("任务id") @PathVariable("taskId") Long taskId) {
+ return AjaxResult.success(service.getTaskById(taskId));
}
/**
* 添加新任务
*
- * @param keywordToGroupDto 添加任务所需的数据
+ * @param task 添加任务所需的数据
* @return 结果
*/
+ @ApiOperation(value = "添加新任务")
// @PreAuthorize("@ss.hasPermi('wecom:communityKeyword:add')")
@PostMapping(path = "/")
- public AjaxResult addTask(@RequestBody @Validated WeKeywordGroupTaskDto keywordToGroupDto) {
- // 群活码必须存在
- if (null == groupCodeService.selectWeGroupCodeById(keywordToGroupDto.getGroupCodeId())) {
- return AjaxResult.error(HttpStatus.NOT_FOUND, "群活码不存在");
+ public AjaxResult addTask(@RequestBody @Validated WeKeywordGroupTask task) {
+ if (service.isNameOccupied(task)) {
+ return AjaxResult.error("关键词拉群任务名称"+ task.getTaskName() +"已存在");
}
- // 任务名称必须唯一
- if (!keywordToGroupService.taskNameIsUnique(keywordToGroupDto.getTaskName())) {
- return AjaxResult.error(HttpStatus.BAD_REQUEST, "任务名称已存在");
- }
- WeKeywordGroupTask task = new WeKeywordGroupTask();
- BeanUtils.copyProperties(keywordToGroupDto, task);
task.setCreateBy(SecurityUtils.getUsername());
- String[] keywords = keywordToGroupDto.getKeywords().split(",");
- return toAjax(keywordToGroupService.addTask(task, keywords));
+ task.setCreateTime(new Date());
+ return toAjax(service.addTask(task));
}
/**
* 根据id及更新数据对指定任务进行更新
- *
- * @param taskId 任务id
- * @param keywordToGroupDto 更新所需数据
- * @return 结果
*/
+ @ApiOperation(value = "更新任务")
// @PreAuthorize("@ss.hasPermi('wecom:communityKeyword:edit')")
- @PutMapping(path = "/{taskId}")
- public AjaxResult updateTask(@PathVariable("taskId") Long taskId, @RequestBody @Validated WeKeywordGroupTaskDto keywordToGroupDto) {
- // 群活码必须存在
- if (null == groupCodeService.selectWeGroupCodeById(keywordToGroupDto.getGroupCodeId())) {
- return AjaxResult.error(HttpStatus.NOT_FOUND, "群活码不存在");
- }
- // 若名称发生更改，则必须唯一
- String inputTaskName = keywordToGroupDto.getTaskName();
- String originalName = keywordToGroupService.getTaskById(taskId).getTaskName();
- if (!originalName.equals(inputTaskName) && !keywordToGroupService.taskNameIsUnique(inputTaskName)) {
- return AjaxResult.error(HttpStatus.BAD_REQUEST, "任务名称已存在");
- }
- WeKeywordGroupTask task = new WeKeywordGroupTask();
- BeanUtils.copyProperties(keywordToGroupDto, task);
+ @PutMapping("/{taskId}")
+ public AjaxResult updateTask(
+ @ApiParam("任务id") @PathVariable("taskId") Long taskId, @RequestBody @Validated WeKeywordGroupTask task) {
task.setTaskId(taskId);
task.setUpdateBy(SecurityUtils.getUsername());
- String[] keywords = keywordToGroupDto.getKeywords().split(",");
- return toAjax(keywordToGroupService.updateTask(task, keywords));
+ task.setUpdateTime(new Date());
+ return toAjax(service.updateTask(task));
}
/**
@@ -125,10 +91,11 @@ public class WeCommunityKeywordGroupController extends BaseController {
* @param ids id列表
* @return 结果
*/
+ @ApiOperation(value = "批量删除任务")
// @PreAuthorize("@ss.hasPermi('wecom:communityKeyword:remove')")
@DeleteMapping(path = "/{ids}")
- public AjaxResult batchDeleteTask(@PathVariable("ids") Long[] ids) {
- return toAjax(keywordToGroupService.batchRemoveTaskByIds(ids));
+ public AjaxResult batchDeleteTask(@ApiParam("待删除任务id数组") @PathVariable("ids") Long[] ids) {
+ return toAjax(service.batchRemoveTaskByIds(ids));
}
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityNewGroupController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityNewGroupController.java
index ea6c1e9410d62cdf68d9d6491a49ed39bdc75cb6..3b8c0cc710afa13e5e839002649f3968fff846e1 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityNewGroupController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityNewGroupController.java
@@ -10,6 +10,7 @@ import com.linkwechat.common.enums.BusinessType;
import com.linkwechat.common.exception.wecom.WeComException;
import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.common.utils.file.FileUtils;
+import com.linkwechat.wecom.domain.WeCommunityNewGroup;
import com.linkwechat.wecom.domain.WeEmpleCode;
import com.linkwechat.wecom.domain.dto.WeCommunityNewGroupDto;
import com.linkwechat.wecom.domain.vo.WeCommunityNewGroupVo;
@@ -28,9 +29,8 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -83,7 +83,6 @@ public class WeCommunityNewGroupController extends BaseController {
exc.printStackTrace();
}
});
- return;
}
/**
@@ -98,34 +97,19 @@ public class WeCommunityNewGroupController extends BaseController {
@Log(title = "员工活码批量下载", businessType = BusinessType.OTHER)
@GetMapping("/downloadBatch")
public void downloadBatch(Long[] ids, HttpServletRequest request, HttpServletResponse response) {
+ List> fileList = weCommunityNewGroupService
+ .selectWeCommunityNewGroupByIds(Arrays.asList(ids))
+ .stream()
+ .map(e -> {
+ WeEmpleCode code = weEmpleCodeService.getById(e.getEmplCodeId());
+ Map fileMap = new HashMap<>();
+ fileMap.put("fileName", code.getUseUserName() + "-" + code.getScenario()+".jpg");
+ fileMap.put("url", code.getQrCode());
+ return fileMap;
+ })
+ .collect(Collectors.toList());
try {
- List weCommunityNewGroupVos = weCommunityNewGroupService.selectWeCommunityNewGroupByIds(Arrays.asList(ids));
- //zip输出流
- ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
- if (CollectionUtil.isNotEmpty(weCommunityNewGroupVos)) {
- for (WeCommunityNewGroupVo communityNewGroupVo : weCommunityNewGroupVos) {
- // 获取改新客拉群对应员工活码的二维码
- WeEmpleCode empleCode = weEmpleCodeService.selectWeEmpleCodeById(communityNewGroupVo.getEmplCodeId());
- String qrCode = empleCode.getQrCode();
- if (StringUtils.isEmpty(qrCode)) {
- continue;
- }
- URL url = new URL(qrCode);
- // 二维码名称使用场景
- String fileName = empleCode.getScenario() + ".png";
- zos.putNextEntry(new ZipEntry(fileName));
- InputStream fis = url.openConnection().getInputStream();
- byte[] buffer = new byte[1024];
- int r = 0;
- while ((r = fis.read(buffer)) != -1) {
- zos.write(buffer, 0, r);
- }
- fis.close();
- }
- }
- //关闭zip输出流
- zos.flush();
- zos.close();
+ FileUtils.batchDownloadFile(fileList, response.getOutputStream());
} catch (IOException e) {
e.printStackTrace();
}
@@ -137,13 +121,9 @@ public class WeCommunityNewGroupController extends BaseController {
@ApiOperation(value = "查询新客自动拉群列表", httpMethod = "GET")
// @PreAuthorize("@ss.hasPermi('wecom:communityNewGroup:list')")
@GetMapping("/list")
- public TableDataInfo> list(
- @RequestParam(value = "emplCodeName", required = false) String emplCodeName,
- @RequestParam(value = "createBy", required = false) String createBy,
- @RequestParam(value = "beginTime", required = false) String beginTime,
- @RequestParam(value = "endTime", required = false) String endTime) {
+ public TableDataInfo> list(WeCommunityNewGroup weCommunityNewGroup) {
startPage();
- List communityNewGroupVos = weCommunityNewGroupService.selectWeCommunityNewGroupList(emplCodeName, createBy, beginTime, endTime);
+ List communityNewGroupVos = weCommunityNewGroupService.selectWeCommunityNewGroupList(weCommunityNewGroup);
return getDataTable(communityNewGroupVos);
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityPresTagGroupController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityPresTagGroupController.java
index 6ab2df6c6cc4b9838918dd992cdabe4675ac051a..dd052af824d714c27f35bee2daef9e39eb03c835 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityPresTagGroupController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCommunityPresTagGroupController.java
@@ -2,6 +2,7 @@ package com.linkwechat.web.controller.wecom;
import com.linkwechat.common.constant.HttpStatus;
+import com.linkwechat.common.constant.WeConstans;
import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.AjaxResult;
import com.linkwechat.common.core.page.TableDataInfo;
@@ -53,23 +54,26 @@ public class WeCommunityPresTagGroupController extends BaseController {
// @PreAuthorize("@ss.hasPermi('wecom:communitytagGroup:add')")
@PostMapping
public AjaxResult addTask(@RequestBody @Validated WePresTagGroupTaskDto wePresTagGroupTaskDto) {
- // 检测任务名是否可用
- if (!taskService.checkTaskNameUnique(wePresTagGroupTaskDto.getTaskName())) {
- return AjaxResult.error("任务名已存在");
- }
- if (null == groupCodeService.selectWeGroupCodeById(wePresTagGroupTaskDto.getGroupCodeId())) {
+ if (null == groupCodeService.getById(wePresTagGroupTaskDto.getGroupCodeId())) {
return AjaxResult.error(HttpStatus.NOT_FOUND, "群活码不存在");
}
- // 创建新任务并保存
WePresTagGroupTask task = new WePresTagGroupTask();
BeanUtils.copyProperties(wePresTagGroupTaskDto, task);
+ // 检测任务名是否可用
+ if (taskService.isNameOccupied(task)) {
+ return AjaxResult.error("任务名已存在");
+ }
task.setCreateBy(SecurityUtils.getUsername());
List tagList = wePresTagGroupTaskDto.getTagList();
List scopeList = wePresTagGroupTaskDto.getScopeList();
int affectedRows = taskService.add(task, tagList, scopeList);
if (affectedRows > 0) {
- // 若保存成功，则进行异步消息推送
- taskService.sendMessage(task);
+ boolean hasScope = StringUtils.isNotEmpty(wePresTagGroupTaskDto.getScopeList());
+ boolean hasTag = StringUtils.isNotEmpty(wePresTagGroupTaskDto.getTagList());
+ List externalIds = taskService
+ .selectExternalUserIds(task.getTaskId(), hasScope, hasTag, wePresTagGroupTaskDto.getSendScope(),
+ wePresTagGroupTaskDto.getCusBeginTime(), wePresTagGroupTaskDto.getCusEndTime());
+ taskService.sendMessage(task, externalIds);
}
return toAjax(affectedRows);
}
@@ -84,7 +88,7 @@ public class WeCommunityPresTagGroupController extends BaseController {
if (StringUtils.isNull(taskVo)) {
return AjaxResult.error(HttpStatus.NOT_FOUND, "群活码不存在");
}
- return AjaxResult.success();
+ return AjaxResult.success(taskVo);
}
/**
@@ -93,15 +97,7 @@ public class WeCommunityPresTagGroupController extends BaseController {
// @PreAuthorize("@ss.hasPermi('wecom:communitytagGroup:edit')")
@PutMapping(path = "/{id}")
public AjaxResult updateTask(@PathVariable("id") Long id, @RequestBody @Validated WePresTagGroupTaskDto wePresTagGroupTaskDto) {
- // 检测任务名是否可用
- WePresTagGroupTaskVo original = taskService.getTaskById(id);
- // 判断名称是否发生变化
- boolean newName = wePresTagGroupTaskDto.getTaskName().equals(original.getTaskName());
- // 新名称不能已存在
- if (!taskService.checkTaskNameUnique(wePresTagGroupTaskDto.getTaskName()) && !newName) {
- return AjaxResult.error("任务名已存在");
- }
- if (null == groupCodeService.selectWeGroupCodeById(wePresTagGroupTaskDto.getGroupCodeId())) {
+ if (null == groupCodeService.getById(wePresTagGroupTaskDto.getGroupCodeId())) {
return AjaxResult.error(HttpStatus.NOT_FOUND, "群活码不存在");
}
return toAjax(taskService.updateTask(id, wePresTagGroupTaskDto));
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeConversationArchiveController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeConversationArchiveController.java
index cacd92e94e47d6bed00ae168e1ab85028b2824f6..8a86e1f520a5fdea07e111daf273b471c7cf99da 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeConversationArchiveController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeConversationArchiveController.java
@@ -1,6 +1,5 @@
package com.linkwechat.web.controller.wecom;
-import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.ConversationArchiveQuery;
@@ -11,7 +10,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCorpAccountController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCorpAccountController.java
index 8925928e9e7496c15b3896574d11cdd3b07b6c07..b1fc9d7d34e123696d289973475a9522a186d25e 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCorpAccountController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCorpAccountController.java
@@ -1,12 +1,16 @@
package com.linkwechat.web.controller.wecom;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.linkwechat.common.annotation.Log;
+import com.linkwechat.common.constant.Constants;
import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.core.domain.entity.WeCorpAccount;
import com.linkwechat.common.core.page.TableDataInfo;
import com.linkwechat.common.enums.BusinessType;
-import com.linkwechat.common.core.domain.entity.WeCorpAccount;
import com.linkwechat.wecom.service.IWeCorpAccountService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,84 +25,76 @@ import java.util.List;
*/
@RestController
@RequestMapping("/wecom/corp")
+@Api("企业id配置接口")
public class WeCorpAccountController extends BaseController
{
@Autowired
private IWeCorpAccountService weCorpAccountService;
- /**
- * 查询企业id相关配置列表
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:corp:list')")
@GetMapping("/list")
+ @ApiOperation("查询企业id相关配置列表")
public TableDataInfo list(WeCorpAccount weCorpAccount)
{
startPage();
- List list = weCorpAccountService.selectWeCorpAccountList(weCorpAccount);
+ List list = weCorpAccountService.list(new LambdaQueryWrapper()
+ .eq(WeCorpAccount::getDelFlag,Constants.NORMAL_CODE)
+ .like(WeCorpAccount::getCompanyName,weCorpAccount.getCompanyName()));
return getDataTable(list);
}
- /**
- * 获取企业id相关配置详细信息
- */
- // @PreAuthorize("@ss.hasPermi('wechat:corp:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return AjaxResult.success(weCorpAccountService.selectWeCorpAccountById(id));
- }
- /**
- * 新增企业id相关配置
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:corp:add')")
@Log(title = "新增企业id相关配置", businessType = BusinessType.INSERT)
@PostMapping
+ @ApiOperation("新增企业id相关配置")
public AjaxResult add(@Validated @RequestBody WeCorpAccount weCorpAccount)
{
- return toAjax(weCorpAccountService.insertWeCorpAccount(weCorpAccount));
+ weCorpAccountService.save(weCorpAccount);
+
+ return AjaxResult.success();
}
- /**
- * 修改企业id相关配置
- */
// @PreAuthorize("@ss.hasPermi('wechat:corp:edit')")
@Log(title = "修改企业id相关配置", businessType = BusinessType.UPDATE)
@PutMapping
+ @ApiOperation("修改企业id相关配置")
public AjaxResult edit(@Validated @RequestBody WeCorpAccount weCorpAccount)
{
- return toAjax(weCorpAccountService.updateWeCorpAccount(weCorpAccount));
+ weCorpAccountService.updateById(weCorpAccount);
+ return AjaxResult.success();
}
- /**
- * 启用有效企业微信账号
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:corp:startVailWeCorpAccount')")
@Log(title = "启用有效企业微信账号", businessType = BusinessType.DELETE)
@PutMapping("/startVailWeCorpAccount/{corpId}")
+ @ApiOperation("启用有效企业微信账号")
public AjaxResult startWeCorpAccount(@PathVariable String corpId)
{
return toAjax(weCorpAccountService.startVailWeCorpAccount(corpId));
}
- /**
- * 客户流失通知开关
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:corp:startCustomerChurnNoticeSwitch')")
@Log(title = "客户流失通知开关", businessType = BusinessType.UPDATE)
@PutMapping("/startCustomerChurnNoticeSwitch/{status}")
+ @ApiOperation("客户流失通知开关")
public AjaxResult startCustomerChurnNoticeSwitch(@PathVariable String status)
{
- return toAjax(weCorpAccountService.startCustomerChurnNoticeSwitch(status));
+ weCorpAccountService.startCustomerChurnNoticeSwitch(status);
+
+ return AjaxResult.success();
}
- /**
- * 客户流失通知开关查询
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:corp:getCustomerChurnNoticeSwitch')")
@Log(title = "客户流失通知开关查询", businessType = BusinessType.OTHER)
@GetMapping("/getCustomerChurnNoticeSwitch")
+ @ApiOperation("客户流失通知开关查询")
public AjaxResult getCustomerChurnNoticeSwitch()
{
return AjaxResult.success("操作成功",weCorpAccountService.getCustomerChurnNoticeSwitch());
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java
index a8e9729b15254526ac8139805dd5824b985b7bf3..d8ca34347ae4dc4051225bf9138e7246d1982e40 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerController.java
@@ -7,15 +7,12 @@ import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.AjaxResult;
import com.linkwechat.common.core.page.TableDataInfo;
import com.linkwechat.common.enums.BusinessType;
-import com.linkwechat.common.utils.Threads;
import com.linkwechat.common.utils.poi.ExcelUtil;
import com.linkwechat.wecom.domain.WeCustomer;
import com.linkwechat.wecom.domain.vo.WeMakeCustomerTag;
import com.linkwechat.wecom.service.IWeCustomerService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +29,9 @@ import java.util.List;
@RequestMapping("/wecom/customer")
public class WeCustomerController extends BaseController
{
+
@Autowired
+ @Lazy
private IWeCustomerService weCustomerService;
@@ -45,7 +44,6 @@ public class WeCustomerController extends BaseController
public TableDataInfo list(WeCustomer weCustomer)
{
startPage();
-
List list = weCustomerService.selectWeCustomerList(weCustomer);
return getDataTable(list);
}
@@ -110,9 +108,6 @@ public class WeCustomerController extends BaseController
@GetMapping("/synchWeCustomer")
public AjaxResult synchWeCustomer() {
try {
- SecurityContext context = SecurityContextHolder.getContext();
- SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL);
- SecurityContextHolder.setContext(context);
weCustomerService.synchWeCustomer();
} catch (Exception e) {
e.printStackTrace();
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerMessagePushController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerMessagePushController.java
index 58b691d7a386a46ae65f1f3165103c48820e3a7b..a4e95fa2229c33bebea6efcd81f704b2ac8b7ec8 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerMessagePushController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerMessagePushController.java
@@ -15,7 +15,10 @@ import com.linkwechat.wecom.service.IWeCustomerMessagePushService;
import com.linkwechat.wecom.service.IWeCustomerMessgaeResultService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
@@ -50,8 +53,10 @@ public class WeCustomerMessagePushController extends BaseController {
@PostMapping(value = "add")
public AjaxResult add(@RequestBody CustomerMessagePushDto customerMessagePushDto) {
try {
+
weCustomerMessagePushService.addWeCustomerMessagePush(customerMessagePushDto);
- } catch (JsonProcessingException | ParseException e) {
+
+ } catch (JsonProcessingException | ParseException | CloneNotSupportedException e) {
e.printStackTrace();
return AjaxResult.error("群发失败");
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java
index eec508c443fd20124cdec9a4eb69927a0473dbc7..c57abc74b34d286eebbb37d31d5c9b2671330f08 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeCustomerPortraitController.java
@@ -51,14 +51,14 @@ public class WeCustomerPortraitController extends BaseController {
/**
* 根据客户id和当前企业员工id获取客户详细信息
* @param externalUserid
- * @param userid
+ * @param userId
* @return
*/
@GetMapping(value = "/findWeCustomerInfo")
- public AjaxResult findWeCustomerInfo(String externalUserid, String userid) throws Exception {
+ public AjaxResult findWeCustomerInfo(String externalUserid, String userId) throws Exception {
return AjaxResult.success(
- iWeCustomerService.findCustomerByOperUseridAndCustomerId(externalUserid,userid)
+ iWeCustomerService.findCustomerByOperUseridAndCustomerId(externalUserid,userId)
);
}
@@ -73,7 +73,6 @@ public class WeCustomerPortraitController extends BaseController {
-
iWeCustomerService.updateWeCustomerPortrait(weCustomerPortrait);
@@ -108,7 +107,6 @@ public class WeCustomerPortraitController extends BaseController {
public AjaxResult updateWeCustomerPorTraitTag(@RequestBody WeMakeCustomerTag weMakeCustomerTag){
-
iWeCustomerService.makeLabel(weMakeCustomerTag);
return AjaxResult.success();
@@ -151,16 +149,16 @@ public class WeCustomerPortraitController extends BaseController {
* @return
*/
@GetMapping(value = "/findTrajectory")
- public TableDataInfo findTrajectory(Integer trajectoryType){
+ public TableDataInfo findTrajectory(String userId,String externalUserid,Integer trajectoryType){
startPage();
LambdaQueryWrapper ne = new LambdaQueryWrapper()
- .ne(WeCustomerTrajectory::getStatus, Constants.DELETE_CODE);
-
+ .ne(WeCustomerTrajectory::getStatus, Constants.DELETE_CODE)
+ .eq(WeCustomerTrajectory::getUserId,userId)
+ .eq(WeCustomerTrajectory::getExternalUserid,externalUserid)
+ .orderByDesc(WeCustomerTrajectory::getCreateTime);
if(trajectoryType != null){
ne.eq(WeCustomerTrajectory::getTrajectoryType, trajectoryType);
}
-
-
return getDataTable(
iWeCustomerTrajectoryService.list(ne)
);
@@ -224,4 +222,6 @@ public class WeCustomerPortraitController extends BaseController {
+
+
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeEmpleCodeController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeEmpleCodeController.java
index 1b0461a9856dce22bd7541229c7c58af6dc65779..3ceeeedd7e097583d5032c47e4733e202ecfc2d4 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeEmpleCodeController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeEmpleCodeController.java
@@ -6,6 +6,7 @@ import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.AjaxResult;
import com.linkwechat.common.core.page.TableDataInfo;
import com.linkwechat.common.enums.BusinessType;
+import com.linkwechat.common.exception.CustomException;
import com.linkwechat.common.exception.wecom.WeComException;
import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.common.utils.file.FileUtils;
@@ -23,9 +24,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -154,38 +153,19 @@ public class WeEmpleCodeController extends BaseController {
@Log(title = "员工活码批量下载", businessType = BusinessType.OTHER)
@GetMapping("/downloadBatch")
public void downloadBatch(String ids, HttpServletRequest request, HttpServletResponse response){
- List idList = Arrays.stream(Optional.ofNullable(ids).orElse("").split(","))
- .filter(StringUtils::isNotEmpty).collect(Collectors.toList());
+ List> fileList = Arrays
+ .stream(Optional.ofNullable(ids).orElse("").split(","))
+ .filter(StringUtils::isNotEmpty)
+ .map(id -> {
+ WeEmpleCode code = weEmpleCodeService.getById(id);
+ Map fileMap = new HashMap<>();
+ fileMap.put("fileName", code.getUseUserName() + "-" + code.getScenario()+".jpg");
+ fileMap.put("url", code.getQrCode());
+ return fileMap;})
+ .collect(Collectors.toList());
try {
- //通过员工活码id查询活码数据
- List weEmpleCodeLsit = weEmpleCodeService.selectWeEmpleCodeByIds(idList);
- //zip输出流
- ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
- if (CollectionUtil.isNotEmpty(weEmpleCodeLsit)){
- for (WeEmpleCode weEmpleCode : weEmpleCodeLsit){
- String qrCode = weEmpleCode.getQrCode();
- if (StringUtils.isEmpty(qrCode)){
- continue;
- }
- URL url = new URL(qrCode);
- //每个二维码名称
- String fileName = weEmpleCode.getUseUserName()+"-"+weEmpleCode.getScenario()+".jpg";
- zos.putNextEntry(new ZipEntry(fileName));
- InputStream fis = url.openConnection().getInputStream();
- byte[] buffer = new byte[1024];
- int r = 0;
- while ((r = fis.read(buffer)) != -1) {
- zos.write(buffer, 0, r);
- }
- fis.close();
- }
- }
- //关闭zip输出流
- zos.flush();
- zos.close();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (Exception e){
+ FileUtils.batchDownloadFile(fileList, response.getOutputStream());
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -196,7 +176,7 @@ public class WeEmpleCodeController extends BaseController {
public void download(String id, HttpServletRequest request, HttpServletResponse response){
WeEmpleCode weEmpleCode = weEmpleCodeService.selectWeEmpleCodeById(Long.valueOf(id));
if (StringUtils.isEmpty(weEmpleCode.getQrCode())){
- return;
+ throw new CustomException("活码不存在");
}else {
try {
FileUtils.downloadFile(weEmpleCode.getQrCode(), response.getOutputStream());
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeGroupCodeController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeGroupCodeController.java
index b912d9288c01d31b93af6c7ca9061923066de7c4..f75f5587b758f3488ea6a4c4e92e6887042edc02 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeGroupCodeController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeGroupCodeController.java
@@ -1,6 +1,5 @@
package com.linkwechat.web.controller.wecom;
-import cn.hutool.core.collection.CollectionUtil;
import com.linkwechat.common.annotation.Log;
import com.linkwechat.common.constant.HttpStatus;
import com.linkwechat.common.constant.WeConstans;
@@ -8,29 +7,27 @@ import com.linkwechat.common.core.controller.BaseController;
import com.linkwechat.common.core.domain.AjaxResult;
import com.linkwechat.common.core.page.TableDataInfo;
import com.linkwechat.common.enums.BusinessType;
+import com.linkwechat.common.utils.QREncode;
import com.linkwechat.common.utils.SecurityUtils;
import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.common.utils.file.FileUtils;
+import com.linkwechat.framework.web.domain.server.SysFile;
+import com.linkwechat.framework.web.service.FileService;
import com.linkwechat.wecom.domain.WeGroupCode;
import com.linkwechat.wecom.domain.WeGroupCodeActual;
import com.linkwechat.wecom.service.IWeGroupCodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
/**
@@ -39,15 +36,24 @@ import java.util.zip.ZipOutputStream;
* @author ruoyi
* @date 2020-10-07
*/
+@Api(tags = "群活码")
@RestController
@RequestMapping("/wecom/groupCode")
public class WeGroupCodeController extends BaseController {
+
+ @Autowired
+ IWeGroupCodeService groupCodeService;
+
@Autowired
- private IWeGroupCodeService groupCodeService;
+ FileService fileService;
+
+ @Value("${H5.domainPrefix}")
+ private String h5DomainPrefix;
/**
* 查询客户群活码列表
*/
+ @ApiOperation(value = "查询客户群活码列表", httpMethod = "GET")
// @PreAuthorize("@ss.hasPermi('drainageCode:group:list')")
@GetMapping("/list")
public TableDataInfo list(WeGroupCode weGroupCode) {
@@ -59,46 +65,39 @@ public class WeGroupCodeController extends BaseController {
/**
* 批量下载群活码
*/
+ @ApiOperation(value = "批量下载群活码", httpMethod = "GET")
// @PreAuthorize("@ss.hasPermi('drainageCode:group:downloadBatch')")
@Log(title = "群活码批量下载", businessType = BusinessType.OTHER)
@GetMapping("/downloadBatch")
public void downloadBatch(String ids, HttpServletRequest request, HttpServletResponse response) {
- List idList = Arrays.stream(Optional.ofNullable(ids).orElse("").split(","))
- .filter(StringUtils::isNotEmpty).collect(Collectors.toList());
+ // 构建文件信息列表
+ List> fileList = Arrays
+ .stream(Optional.ofNullable(ids).orElse("").split(","))
+ .filter(StringUtils::isNotEmpty)
+ .map(id -> {
+ WeGroupCode code = groupCodeService.getById(id);
+ Map fileMap = new HashMap<>();
+ fileMap.put("fileName", code.getActivityName() + ".png");
+ fileMap.put("url", code.getCodeUrl());
+ return fileMap;
+ })
+ .collect(Collectors.toList());
try {
- List weGroupCodeList = groupCodeService.selectWeGroupCodeListByIds(idList);
- ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
- if (CollectionUtil.isNotEmpty(weGroupCodeList)) {
- for (WeGroupCode weGroupCode : weGroupCodeList) {
- String codeUrl = weGroupCode.getCodeUrl();
- if (StringUtils.isEmpty(codeUrl)) {
- continue;
- }
- URL url = new URL(codeUrl);
- String fileName = weGroupCode.getActivityName() + ".png";
- zos.putNextEntry(new ZipEntry(fileName));
- InputStream fis = url.openConnection().getInputStream();
- byte[] buffer = new byte[1024];
- int r = 0;
- while ((r = fis.read(buffer)) != -1) {
- zos.write(buffer, 0, r);
- }
- fis.close();
- }
- }
- //关闭zip输出流
- zos.flush();
- zos.close();
+ FileUtils.batchDownloadFile(fileList, response.getOutputStream());
} catch (IOException e) {
e.printStackTrace();
}
}
+ /**
+ * 下载群活码
+ */
+ @ApiOperation(value = "群活码下载", httpMethod = "GET")
// @PreAuthorize("@ss.hasPermi('drainageCode:group:download')")
@Log(title = "群活码下载", businessType = BusinessType.OTHER)
@GetMapping("/download")
- public void download(String id, HttpServletRequest request, HttpServletResponse response) {
- WeGroupCode weGroupCode = groupCodeService.selectWeGroupCodeById(Long.valueOf(id));
+ public void download(String id, HttpServletResponse response) {
+ WeGroupCode weGroupCode = groupCodeService.getById(Long.valueOf(id));
try {
FileUtils.downloadFile(weGroupCode.getCodeUrl(), response.getOutputStream());
} catch (IOException e) {
@@ -109,14 +108,15 @@ public class WeGroupCodeController extends BaseController {
/**
* 获取客户群活码详细信息
*/
+ @ApiOperation(value = "获取客户群活码详细信息", httpMethod = "GET")
// @PreAuthorize("@ss.hasPermi('drainageCode:group:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- WeGroupCode weGroupCode = groupCodeService.selectWeGroupCodeById(id);
+ WeGroupCode weGroupCode = groupCodeService.getById(id);
if (StringUtils.isNull(weGroupCode)) {
return AjaxResult.error(HttpStatus.NOT_FOUND, "数据不存在");
}
- List weGroupCodeActualList = groupCodeService.selectActualListByGroupCodeId(weGroupCode.getId());
+ List weGroupCodeActualList = groupCodeService.selectActualList(weGroupCode.getId());
weGroupCode.setActualList(weGroupCodeActualList);
return AjaxResult.success(weGroupCode);
}
@@ -124,16 +124,26 @@ public class WeGroupCodeController extends BaseController {
/**
* 新增客户群活码
*/
+ @ApiOperation(value = "新增客户群活码", httpMethod = "POST")
// @PreAuthorize("@ss.hasPermi('drainageCode:group:add')")
@Log(title = "客户群活码", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody WeGroupCode weGroupCode) {
- // 唯一性检查
- if (!groupCodeService.checkActivityNameUnique(weGroupCode)) {
+ // 活码名唯一性检查
+ if (groupCodeService.isNameOccupied(weGroupCode)) {
return AjaxResult.error("添加群活码失败，活码名称 " + weGroupCode.getActivityName() + " 已存在");
}
AjaxResult ajax = AjaxResult.success();
weGroupCode.setCreateBy(SecurityUtils.getUsername());
+ weGroupCode.setCreateTime(new Date());
+ try {
+ // 二维码内容，即该二维码扫码后跳转的页面URL
+ String content = h5DomainPrefix + "/mobile/#/groupCode?id=" + weGroupCode.getId();
+ SysFile sysFile = fileService.upload(QREncode.getQRCodeMultipartFile(content, weGroupCode.getAvatarUrl()));
+ weGroupCode.setCodeUrl(sysFile.getImgUrlPrefix() + sysFile.getFileName());
+ } catch (Exception e) {
+ return AjaxResult.error("创建群活码失败，请稍后再试");
+ }
groupCodeService.insertWeGroupCode(weGroupCode);
ajax.put("id", weGroupCode.getId());
return ajax;
@@ -142,27 +152,33 @@ public class WeGroupCodeController extends BaseController {
/**
* 修改客户群活码
*/
+ @ApiOperation(value = "修改客户群活码", httpMethod = "PUT")
// @PreAuthorize("@ss.hasPermi('drainageCode:group:edit')")
@Log(title = "客户群活码", businessType = BusinessType.UPDATE)
@PutMapping(value = "/{id}")
public AjaxResult edit(@PathVariable("id") Long id, @RequestBody WeGroupCode weGroupCode) {
- WeGroupCode originalCode = groupCodeService.selectWeGroupCodeById(id);
- if (StringUtils.isNull(originalCode)) {
- return AjaxResult.error(HttpStatus.NOT_FOUND, "数据不存在");
- }
- // 唯一性检查
- if (!originalCode.getActivityName().equals(weGroupCode.getActivityName()) &&
- !groupCodeService.checkActivityNameUnique(weGroupCode)) {
- return AjaxResult.error("修改群活码失败，活码名称 " + weGroupCode.getActivityName() + " 已存在");
- }
+ // 活码名唯一性检查
weGroupCode.setId(id);
+ if (groupCodeService.isNameOccupied(weGroupCode)) {
+ return AjaxResult.error("添加群活码失败，活码名称 " + weGroupCode.getActivityName() + " 已存在");
+ }
weGroupCode.setUpdateBy(SecurityUtils.getUsername());
+ weGroupCode.setUpdateTime(new Date());
+ try {
+ // 二维码内容，即该二维码扫码后跳转的页面URL TODO
+ String content = h5DomainPrefix + "/mobile/#/groupCode?id=" + weGroupCode.getId();
+ SysFile sysFile = fileService.upload(QREncode.getQRCodeMultipartFile(content, weGroupCode.getAvatarUrl()));
+ weGroupCode.setCodeUrl(sysFile.getImgUrlPrefix() + sysFile.getFileName());
+ } catch (Exception e) {
+ return AjaxResult.error("创建群活码失败，请稍后再试");
+ }
return toAjax(groupCodeService.updateWeGroupCode(weGroupCode));
}
/**
* 删除客户群活码
*/
+ @ApiOperation(value = "删除客户群活码", httpMethod = "DELETE")
// @PreAuthorize("@ss.hasPermi('drainageCode:group:remove')")
@Log(title = "客户群活码", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@@ -173,10 +189,11 @@ public class WeGroupCodeController extends BaseController {
/**
* 从群活码获取第一个可用的实际码
*/
+ @ApiOperation(value = "从群活码获取第一个可用的实际码", httpMethod = "GET")
@GetMapping("/getActualCode/{groupCodeId}")
- public AjaxResult getActual(@PathVariable("groupCodeId") String groupCodeUuid) {
- WeGroupCode groupCode = groupCodeService.getWeGroupByUuid(groupCodeUuid);
- List actualCodeList = groupCodeService.selectActualListByGroupCodeId(groupCode.getId());
+ public AjaxResult getActual(@PathVariable("groupCodeId") String id) {
+ WeGroupCode groupCode = groupCodeService.getById(id);
+ List actualCodeList = groupCodeService.selectActualList(groupCode.getId());
WeGroupCodeActual groupCodeActual = null;
for (WeGroupCodeActual item : actualCodeList) {
// 获取第一个可用的实际码
@@ -193,7 +210,7 @@ public class WeGroupCodeController extends BaseController {
data.put("tipMsg", groupCode.getTipMsg());
data.put("guide", groupCode.getGuide());
data.put("actualQRCode", groupCodeActual.getActualGroupQrCode());
- data.put("isOpenTip", groupCode.getJoinGroupIsTip().toString());
+ data.put("isOpenTip", groupCode.getShowTip().toString());
data.put("serviceQrCode", groupCode.getCustomerServerQrCode());
data.put("groupName", groupCodeActual.getChatGroupName());
ajax.put("data", data);
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java
index 443666a0b0630f4e8cfb111531e697533ebb1dc1..8c01ac6b43e7d33f6fa55f42280ed2925cc28551 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeMaterialController.java
@@ -13,15 +13,15 @@ import com.linkwechat.wecom.domain.dto.WeMediaDto;
import com.linkwechat.wecom.domain.vo.WeMaterialFileVO;
import com.linkwechat.wecom.service.IWeMaterialService;
import com.linkwechat.wecom.service.IWePosterService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;
@@ -31,6 +31,7 @@ import java.util.stream.Collectors;
* @author KEWEN
* @date 2020-10-08
*/
+@Api("企业微信素材管理")
@RestController
@RequestMapping("/wecom/material")
public class WeMaterialController extends BaseController {
@@ -42,23 +43,22 @@ public class WeMaterialController extends BaseController {
@Resource
private IWePosterService wePosterService;
- /**
- * 查询素材列表
- */
+
// @PreAuthorize("@ss.hasPermi('wecom:material:list')")
@GetMapping("/list")
+ @ApiOperation("查询素材列表")
public TableDataInfo list(@RequestParam(value = "categoryId", required = false) String categoryId
, @RequestParam(value = "search", required = false) String search,@RequestParam(value = "mediaType") String mediaType) {
startPage();
List list;
if(StringUtils.isNotBlank(mediaType) && mediaType.equals(MediaType.POSTER.getType())){
list = wePosterService.list(StringUtils.isBlank(categoryId)?null:Long.valueOf(categoryId),search).stream().map(wePoster -> {
- WeMaterial weMaterial = new WeMaterial();
- weMaterial.setMaterialName(wePoster.getTitle());
- weMaterial.setMaterialUrl(wePoster.getSampleImgPath());
- weMaterial.setCategoryId(wePoster.getCategoryId());
- weMaterial.setId(wePoster.getId());
- return weMaterial;
+ WeMaterial weMaterial = new WeMaterial();
+ weMaterial.setMaterialName(wePoster.getTitle());
+ weMaterial.setMaterialUrl(wePoster.getSampleImgPath());
+ weMaterial.setCategoryId(wePoster.getCategoryId());
+ weMaterial.setId(wePoster.getId());
+ return weMaterial;
}).collect(Collectors.toList());
}else {
list = materialService.findWeMaterials(categoryId, search,mediaType);
@@ -67,9 +67,8 @@ public class WeMaterialController extends BaseController {
return getDataTable(list);
}
- /**
- * 查询素材详细信息
- */
+
+
// @PreAuthorize("@ss.hasPermi('wechat:material:query')")
@GetMapping(value = "/{id}")
@ApiOperation("查询素材详细信息")
@@ -77,9 +76,7 @@ public class WeMaterialController extends BaseController {
return AjaxResult.success(materialService.findWeMaterialById(id));
}
- /**
- * 添加素材信息
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:material:add')")
@Log(title = "添加素材信息", businessType = BusinessType.INSERT)
@PostMapping
@@ -88,9 +85,7 @@ public class WeMaterialController extends BaseController {
return toAjax(materialService.insertWeMaterial(material));
}
- /**
- * 更新素材信息
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:material:edit')")
@Log(title = "更新素材信息", businessType = BusinessType.UPDATE)
@PutMapping
@@ -99,20 +94,18 @@ public class WeMaterialController extends BaseController {
return toAjax(materialService.updateWeMaterial(material));
}
- /**
- * 删除素材信息
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:material:remove')")
@Log(title = "删除素材信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@ApiOperation("删除素材信息")
public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(materialService.deleteWeMaterialByIds(ids));
+ materialService.deleteWeMaterialByIds(ids);
+
+ return AjaxResult.success();
}
- /**
- * 上传素材信息
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:material:upload')")
@Log(title = "上传素材信息", businessType = BusinessType.OTHER)
@PostMapping("/upload")
@@ -122,9 +115,7 @@ public class WeMaterialController extends BaseController {
return AjaxResult.success(weMaterialFileVO);
}
- /**
- * 更换分组
- */
+
// @PreAuthorize("@ss.hasPermi('wechat:material:resetCategory')")
@Log(title = "更换分组", businessType = BusinessType.OTHER)
@PutMapping("/resetCategory")
@@ -134,15 +125,59 @@ public class WeMaterialController extends BaseController {
return AjaxResult.success();
}
+// //@PreAuthorize("@ss.hasPermi('wechat:material:temporaryMaterialMediaId')")
+// @Log(title = "获取素材media_id", businessType = BusinessType.OTHER)
+// @PostMapping("/temporaryMaterialMediaId")
+// @ApiOperation("获取素材media_id")
+// public AjaxResult temporaryMaterialMediaId(@RequestBody TemporaryMaterialDto temporaryMaterialDto){
+// WeMediaDto weMediaDto = materialService.uploadTemporaryMaterial(temporaryMaterialDto.getUrl(),
+// temporaryMaterialDto.getType()
+// ,temporaryMaterialDto.getName());
+// return AjaxResult.success(weMediaDto);
+// }
+
//@PreAuthorize("@ss.hasPermi('wechat:material:temporaryMaterialMediaId')")
@Log(title = "获取素材media_id", businessType = BusinessType.OTHER)
- @PostMapping("/temporaryMaterialMediaId")
- @ApiOperation("获取素材media_id")
- public AjaxResult temporaryMaterialMediaId(@RequestBody TemporaryMaterialDto temporaryMaterialDto){
+ @GetMapping("/temporaryMaterialMediaId")
+ @ApiOperation("H5端发送获取素材media_id")
+ public AjaxResult temporaryMaterialMediaId(String url,String type,String name){
+ WeMediaDto weMediaDto = materialService.uploadTemporaryMaterial(url,
+ type
+ ,name);
+ return AjaxResult.success(weMediaDto);
+ }
+
+
+ //@PreAuthorize("@ss.hasPermi('wechat:material:temporaryMaterialMediaId')")
+ @Log(title = "获取素材media_id", businessType = BusinessType.OTHER)
+ @PostMapping("/temporaryMaterialMediaIdForWeb")
+ @ApiOperation("web端发送获取素材media_id")
+ public AjaxResult temporaryMaterialMediaIdForWeb(@RequestBody TemporaryMaterialDto temporaryMaterialDto){
+
WeMediaDto weMediaDto = materialService.uploadTemporaryMaterial(temporaryMaterialDto.getUrl(),
- temporaryMaterialDto.getType()
+ MediaType.of( temporaryMaterialDto.getType()).get().getMediaType()
,temporaryMaterialDto.getName());
return AjaxResult.success(weMediaDto);
}
+
+
+
+
+
+
+ @Log(title = "上传素材图片", businessType = BusinessType.OTHER)
+ @PostMapping("/uploadimg")
+ @ApiOperation("上传素材图片")
+ public AjaxResult uploadImg(MultipartFile file, HttpServletRequest request){
+ System.out.println(request.getServerName());
+ WeMediaDto weMediaDto=new WeMediaDto();
+// WeMediaDto weMediaDto = materialService.uploadImg(file);
+// weMediaDto.setFileName(file.getResource().getFilename()); weMaterialFileVO.getMaterialUrl()+
+ WeMaterialFileVO weMaterialFileVO = materialService.uploadWeMaterialFile(file, MediaType.IMAGE.getType());
+ weMediaDto.setFileName(weMaterialFileVO.getMaterialName());
+ weMediaDto.setUrl(weMaterialFileVO.getMaterialUrl()+weMaterialFileVO.getMaterialName());
+ return AjaxResult.success(weMediaDto);
+ }
+
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeSensitiveController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeSensitiveController.java
index 1721e6fce2d97c54152ccdbbdba82b2ea2067b40..030a756cd6d7a690f7a0fae6a612740c52830b28 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeSensitiveController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeSensitiveController.java
@@ -9,8 +9,9 @@ import com.linkwechat.common.enums.BusinessType;
import com.linkwechat.wecom.domain.WeSensitive;
import com.linkwechat.wecom.domain.query.WeSensitiveHitQuery;
import com.linkwechat.wecom.service.IWeSensitiveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -26,6 +27,7 @@ import java.util.stream.Collectors;
*/
@RestController
@RequestMapping("/wecom/sensitive")
+@Api(tags = "敏感词管理")
public class WeSensitiveController extends BaseController {
@Autowired
private IWeSensitiveService weSensitiveService;
@@ -35,6 +37,7 @@ public class WeSensitiveController extends BaseController {
*/
// @PreAuthorize("@ss.hasPermi('wecom:sensitive:list')")
@GetMapping("/list")
+ @ApiOperation("查询敏感词列表")
public TableDataInfo list(WeSensitive weSensitive) {
startPage();
List list = weSensitiveService.selectWeSensitiveList(weSensitive);
@@ -46,6 +49,7 @@ public class WeSensitiveController extends BaseController {
*/
// @PreAuthorize("@ss.hasPermi('wecom:sensitive:query')")
@GetMapping(value = "/{id}")
+ @ApiOperation("查询敏感词详情")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(weSensitiveService.selectWeSensitiveById(id));
}
@@ -56,6 +60,7 @@ public class WeSensitiveController extends BaseController {
// @PreAuthorize("@ss.hasPermi('wecom:sensitive:add')")
@Log(title = "敏感词设置", businessType = BusinessType.INSERT)
@PostMapping
+ @ApiOperation("添加敏感词")
public AjaxResult add(@Valid @RequestBody WeSensitive weSensitive) {
return toAjax(weSensitiveService.insertWeSensitive(weSensitive));
}
@@ -66,6 +71,7 @@ public class WeSensitiveController extends BaseController {
// @PreAuthorize("@ss.hasPermi('wecom:sensitive:edit')")
@Log(title = "敏感词设置", businessType = BusinessType.UPDATE)
@PutMapping
+ @ApiOperation("修改敏感词")
public AjaxResult edit(@Valid @RequestBody WeSensitive weSensitive) {
Long id = weSensitive.getId();
WeSensitive originData = weSensitiveService.selectWeSensitiveById(id);
@@ -81,6 +87,7 @@ public class WeSensitiveController extends BaseController {
// @PreAuthorize("@ss.hasPermi('wecom:sensitive:remove')")
@Log(title = "敏感词设置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
+ @ApiOperation("删除敏感词")
public AjaxResult remove(@PathVariable("ids") String ids) {
String[] id = ids.split(",");
Long[] idArray = new Long[id.length];
@@ -93,6 +100,7 @@ public class WeSensitiveController extends BaseController {
*/
// @PreAuthorize("@ss.hasPermi('wecom:sensitivehit:list')")
@GetMapping("/hit/list")
+ @ApiOperation("敏感词命中查询")
public TableDataInfo hitList(WeSensitiveHitQuery query) {
return getDataTable(weSensitiveService.getHitSensitiveList(query));
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeTaskFissionController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeTaskFissionController.java
index cef8aa5885791353374b4b4eb5c123c862d85798..84e0755acba55cd4c1040a4063496af32bd4ad0e 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeTaskFissionController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeTaskFissionController.java
@@ -2,6 +2,7 @@ package com.linkwechat.web.controller.wecom;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
//import com.alibaba.nacos.common.utils.CollectionUtils;
import com.google.common.collect.Lists;
@@ -17,6 +18,8 @@ import com.linkwechat.common.utils.DateUtils;
import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.common.utils.file.FileUploadUtils;
import com.linkwechat.common.utils.poi.ExcelUtil;
+import com.linkwechat.framework.web.domain.server.SysFile;
+import com.linkwechat.framework.web.service.FileService;
import com.linkwechat.wecom.domain.WeCustomer;
import com.linkwechat.wecom.domain.WeTaskFission;
import com.linkwechat.wecom.domain.dto.WeChatUserDTO;
@@ -54,9 +57,13 @@ import java.util.Objects;
public class WeTaskFissionController extends BaseController {
@Autowired
private IWeTaskFissionService weTaskFissionService;
+
@Autowired
private CosConfig cosConfig;
+ @Autowired
+ private FileService fileService;
+
/**
* 查询任务宝列表
*/
@@ -151,6 +158,12 @@ public class WeTaskFissionController extends BaseController {
CopyOptions options = CopyOptions.create();
options.setIgnoreNullValue(true);
BeanUtil.copyProperties(weTaskFission, fissionTask, options);
+ if (CollectionUtil.isNotEmpty(weTaskFission.getTaskFissionStaffs())) {
+ fissionTask.setTaskFissionStaffs(weTaskFission.getTaskFissionStaffs());
+ }
+ if (CollectionUtil.isNotEmpty(weTaskFission.getTaskFissionWeGroups())) {
+ fissionTask.setTaskFissionWeGroups(weTaskFission.getTaskFissionWeGroups());
+ }
Long id = weTaskFissionService.updateWeTaskFission(fissionTask);
JSONObject json = new JSONObject();
json.put("id", id);
@@ -219,10 +232,13 @@ public class WeTaskFissionController extends BaseController {
@Log(title = "上传兑奖图片", businessType = BusinessType.OTHER)
@PostMapping("/upload")
@ApiOperation(value = "上传兑奖图片", httpMethod = "POST")
- public AjaxResult upload(@RequestParam(value = "file") MultipartFile file) throws IOException {
- String url = FileUploadUtils.upload2Cos(file, cosConfig);
+ public AjaxResult upload(@RequestParam(value = "file") MultipartFile file) throws Exception {
+
+ SysFile sysFile
+ = fileService.upload(file);
+// String url = FileUploadUtils.upload2Cos(file, cosConfig);
JSONObject json = new JSONObject();
- json.put("rewardImageUrl", url);
+ json.put("rewardImageUrl", sysFile.getImgUrlPrefix()+sysFile.getFileName());
return AjaxResult.success(json);
}
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeUserController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeUserController.java
index 1d34cd2bfe563e0f64f96f344509931358f4702f..c8cf7f6ac5d8456df998ba74a3fa8fab524ded32 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeUserController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeUserController.java
@@ -13,6 +13,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +36,7 @@ import java.util.List;
public class WeUserController extends BaseController {
@Autowired
+ @Lazy
private IWeUserService weUserService;
@@ -157,15 +162,17 @@ public class WeUserController extends BaseController {
*/
// @PreAuthorize("@ss.hasPermi('contacts:organization:sync')")
@GetMapping({"/synchWeUser"})
- public AjaxResult synchWeUser() {
-
-
- weUserService.synchWeUser();
-
+ public AjaxResult synchWeUser(){
+ try {
+ weUserService.synchWeUser();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
return AjaxResult.success(WeConstans.SYNCH_TIP);
}
+
/**
* 删除用户
*
diff --git a/linkwe-admin/src/main/resources/application-druid.yml b/linkwe-admin/src/main/resources/application-druid.yml
deleted file mode 100644
index 72489d2ce91c71e5ea7cdd04bee9ac85fa94c2a2..0000000000000000000000000000000000000000
--- a/linkwe-admin/src/main/resources/application-druid.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-# 数据源配置
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 主库数据源
- master:
- url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:link-wechat-prod}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: ${DB_USER:root}
- password: ${DB_PASS:root}
- # 从库数据源
- slave:
- # 从数据源开关/默认关闭
- enabled: false
- url:
- username:
- password:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username:
- login-password:
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
diff --git a/linkwe-admin/src/main/resources/application.yml b/linkwe-admin/src/main/resources/application.yml
index 680d8fe98b9537d0fe9f1a4dd16173ee6f4c0a91..cbbd0ddc6feedd0bde286357d5253bebebfad1ce 100644
--- a/linkwe-admin/src/main/resources/application.yml
+++ b/linkwe-admin/src/main/resources/application.yml
@@ -6,21 +6,65 @@ ruoyi:
version: 3.1.0
# 版权年份
copyrightYear: 2019
+ startTenant: false
# 实例演示开关
demoEnabled: true
+ file:
+ startCosUpload: true
+#腾讯云对象存储
+ cos:
+ secretId:
+ secretKey:
+ #link-wechat-1251309172.cos.ap-nanjing.myqcloud.com
+ region:
+ bucketName:
+ cosImgUrlPrefix:
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /app/project/pic）
- profile: /app/project/pic
+ #profile: /data/jenkins_home/app/project/
# 获取ip地址开关
- addressEnabled: false
+ addressEnabled: true
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
# 企业微信用户首次登录系统默认密码
weUserDefaultPwd: 123456
+ #匿名访问的URL
+ anonUrl:
+ - /login
+ - /captchaImage
+ - /findWxQrLoginInfo
+ - /wxQrLogin
+ - /profile/**
+ - /common/download**
+ - /common/download/resource**
+ - /common/download/url**
+ - /swagger-ui.html
+ - /swagger-resources/**
+ - /webjars/**
+ - /*/api-docs
+ - /druid/**
+ - /wecom/callback/**
+ - /wecom/chat/item/list
+ - /wecom/chat/collection/list
+ - /wecom/chat/collection/cancleCollection
+ - /wecom/chat/collection/addCollection
+ - /wecom/chat/side/h5List
+ - /wecom/ticket/**
+ - /wecom/user/getUserInfo
+ - /wecom/portrait/**
+ - /wecom/fission/poster
+ - /wecom/fission/complete/**
+ - /wecom/fission/*/progress/*
+ - /wecom/reward/getRewardByFissionId/**
+ - /wecom/groupCode/getActualCode/**
+ - /wecom/community/h5/**
+ - /weixin/auth/**
+ - /wecom/material/temporaryMaterialMediaId
+ - /common/findFile
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8090
- port: ${APP_PORT:8090}
+ port: 8090
servlet:
# 应用的访问路径
context-path: /
@@ -37,29 +81,83 @@ logging:
level:
com.ruoyi: debug
org.springframework: warn
- path: ./logs
path:
log: ./logs
#H5地址路径
H5:
- url: www.baidu.com
-
+ domainPrefix: http://linkwechat.cn/
+ url: http://h5.linkwechat.cn/index.html
+ fissionUrl: http://h5.linkwechat.cn/index.html
+ fissionGroupUrl: http://h5.linkwechat.cn/fission.html
# Spring配置
spring:
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
- profiles:
- active: druid
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 主库数据源
+ master:
+ url: jdbc:mysql://127.0.0.1:10179/link-wechat-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: root
+ # 从库数据源
+ slave:
+ # 从数据源开关/默认关闭
+ enabled: false
+ url:
+ username:
+ password:
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间，单位是毫秒
+ minEvictableIdleTimeMillis: 300000
+ # 配置一个连接在池中最大生存的时间，单位是毫秒
+ maxEvictableIdleTimeMillis: 900000
+ # 配置检测连接是否有效
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单，不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username:
+ login-password:
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
# 文件上传
servlet:
- multipart:
- # 单个文件大小
- max-file-size: 10MB
- # 设置总上传的文件大小
- max-request-size: 20MB
+ multipart:
+ # 单个文件大小
+ max-file-size: 10MB
+ # 设置总上传的文件大小
+ max-request-size: 20MB
task:
execution:
pool:
@@ -73,9 +171,9 @@ spring:
# redis 配置
redis:
# 地址
- host: ${REDIS_HOST:localhost}
+ host: 127.0.0.1
# 端口，默认为6379
- port: ${REDIS_PORT:6379}
+ port: 6379
# 密码
password:
# 连接超时时间
@@ -92,27 +190,26 @@ spring:
max-wait: -1ms
-
# token配置
token:
- # 令牌自定义标识
- header: Authorization
- # 令牌密钥
- secret: abcdefghijklmnopqrstuvwxyz
- # 令牌有效期（默认30分钟）
- expireTime: 30
+ # 令牌自定义标识
+ header: Authorization
+ # 令牌密钥
+ secret: abcdefghijklmnopqrstuvwxyz
+ # 令牌有效期（默认30分钟）
+ expireTime: 30
mybatis-plus:
- mapper-locations: classpath*:mapper/**/*Mapper.xml
- type-aliases-package: com.linkwechat.**.domain
- type-handlers-package: com.linkwechat.framework.handler.GenericTypeHandler,com.linkwechat.framework.handler.StringArrayJoinTypeHandler
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- global-config:
- db-config:
- logic-delete-field: delFlag
- logic-delete-value: 1
- logic-not-delete-value: 0
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.linkwechat.**.domain
+ type-handlers-package: com.linkwechat.framework.handler.GenericTypeHandler,com.linkwechat.framework.handler.StringArrayJoinTypeHandler
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ global-config:
+ db-config:
+ logic-delete-field: delFlag
+ logic-delete-value: 1
+ logic-not-delete-value: 0
## MyBatis配置
#mybatis:
@@ -147,89 +244,102 @@ xss:
urlPatterns: /system/*,/monitor/*,/tool/*
# elasticsearch配置
-elasticsearch:
- schema: http
- address: ${ES_ADDRESS:localhost}
- userName: ""
- password: ""
- connectTimeout: 10000
- socketTimeout: 10000
- connectionRequestTimeout: 10000
- maxConnectNum: 100
- maxConnectPerRoute: 100
+#elasticsearch:
+# schema: http
+# address:
+# userName: ""
+# password: ""
+# connectTimeout: 10000
+# socketTimeout: 10000
+# connectionRequestTimeout: 10000
+# maxConnectNum: 100
+# maxConnectPerRoute: 100
# forest配置
forest:
- interceptors: com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor
backend: httpclient
retry-count: 1 # 请求失败后重试次数，默认为0次不重试
max-retry-interval: 1000 #重试间隔时间
connect-timeout: 3000 #链接超时时间
timeout: 3000 # 请求超时时间
-
+ variables: #全局变量 企微和微信接口地址
+ weComServerUrl: https://qyapi.weixin.qq.com/
+ weComePrefix: cgi-bin
+ wxServerUrl: https://api.weixin.qq.com/
+ wxPrefix: sns
wecome:
- chatKey: finance
+ chatKey: finance_new
serverUrl: https://qyapi.weixin.qq.com/
weComePrefix: cgi-bin
noAccessTokenUrl:
- - /gettoken
- - /service/get_provider_token
- - /wecom/chat/side/list
- - /wecom/chat/item/list
- - /wecom/chat/collection/addCollection
- - /wecom/chat/collection/cancleCollection
- - /wecom/chat/collection/list
+ - /gettoken
+ - /service/get_provider_token
+ - /wecom/chat/side/list
+ - /wecom/chat/item/list
+ - /wecom/chat/collection/addCollection
+ - /wecom/chat/collection/cancleCollection
+ - /wecom/chat/collection/list
needContactTokenUrl:
- - /externalcontact/get_follow_user_list
- - /externalcontact/add_contact_way
- - /externalcontact/update_contact_way
- - /externalcontact/add_corp_tag
- - /externalcontact/get_corp_tag_list
- - /externalcontact/del_corp_tag
- - /externalcontact/edit_corp_tag
- - /externalcontact/list
- - /externalcontact/get
- - /externalcontact/batch/get_by_user
- - /externalcontact/groupchat/list
- - /externalcontact/groupchat/get
- - /externalcontact/mark_tag
- - /externalcontact/transfer
- - /externalcontact/groupchat/transfer
- - /externalcontact/get_unassigned_list
- - /externalcontact/send_welcome_msg
- - /externalcontact/unionid_to_external_userid
- - /externalcontact/add_msg_template
- - /externalcontact/get_group_msg_result
- - /externalcontact/get_user_behavior_data
- - /externalcontact/groupchat/statistic
- fileUplodUrl: /media/upload,/media/uploadimg
+ - /externalcontact/get_follow_user_list
+ - /externalcontact/add_contact_way
+ - /externalcontact/update_contact_way
+ - /externalcontact/add_corp_tag
+ - /externalcontact/get_corp_tag_list
+ - /externalcontact/del_corp_tag
+ - /externalcontact/edit_corp_tag
+ - /externalcontact/list
+ - /externalcontact/get
+ - /externalcontact/batch/get_by_user
+ - /externalcontact/groupchat/list
+ - /externalcontact/groupchat/get
+ - /externalcontact/mark_tag
+ - /externalcontact/transfer
+ - /externalcontact/groupchat/transfer
+ - /externalcontact/get_unassigned_list
+ - /externalcontact/send_welcome_msg
+ - /externalcontact/unionid_to_external_userid
+ - /externalcontact/add_msg_template
+ - /externalcontact/get_group_msg_result
+ - /externalcontact/get_user_behavior_data
+ - /externalcontact/groupchat/statistic
+ - /externalcontact/groupchat/statistic_group_by_day
+ fileUplodUrl: /media/upload,/media/uploadimg
needProviderTokenUrl:
- - /service/get_login_info
+ - /service/get_login_info
needChatTokenUrl:
- - /msgaudit/get_permit_user_list
- - /msgaudit/check_single_agree
- - /msgaudit/check_room_agree
- - /msgaudit/groupchat/get
+ - /msgaudit/get_permit_user_list
+ - /msgaudit/check_single_agree
+ - /msgaudit/check_room_agree
+ - /msgaudit/groupchat/get
thirdAppUrl:
- - /user/getuserinfo
- - /get_jsapi_ticket
- - /ticket/get
- - /message/send
+ - /user/getuserinfo
+ - /get_jsapi_ticket
+ - /ticket/get
+ - /agent/list
+ - /message/send
+ - /agent/get
+ - /agent/set
+ needTenant:
+ - we_department
+ - we_user
+ - we_customer
+ - we_flower_customer_rel
+ - we_flower_customer_tag_rel
+ - we_group
+ - we_group_member
+ - we_tag_group
+ - we_tag
#企微回调通知配置
callBack:
- appIdOrCorpId: ww24262ce93851488f
- token: jtQ1aGHgSmH2UHNBIndUtUe6B6EwfR
- encodingAesKey: Vga4HWv7nFbRDYK8iAaQbxmkuecpo2BAfmXAyWwcXMO
+ appIdOrCorpId:
+ token:
+ encodingAesKey:
# JS SDK 身份校验url
authorizeUrl: https://open.weixin.qq.com/connect/oauth2/authorize
# JS SDK身份校验成功后的redirect url
- authorizeRedirectUrl: http://www.linkwechat.cn/mobile/#/task
-#腾讯云对象存储
-cos:
- secretId: AKIDQRCizIeUGl13vakkDQMH0VkjhPr1rBBv
- secretKey: e3D8oFetseC0f8OX9XeV7UcTDiyyQ8cr
- #link-wechat-1251309172.cos.ap-nanjing.myqcloud.com
- region: ap-nanjing
- bucketName: link-wechat-1251309172
- imgUrlPrefix: https://link-wechat-1251309172.cos.ap-nanjing.myqcloud.com/
\ No newline at end of file
+ authorizeRedirectUrl:
+
+weixin:
+ appid:
+ secret:
\ No newline at end of file
diff --git a/linkwe-admin/src/main/resources/bootstrap.properties b/linkwe-admin/src/main/resources/bootstrap.properties
index 39a9563d13612cc35b3b6c041fe07559f9d3c603..eea9d7e9fa3317286cc08523e4db627d2a644538 100644
--- a/linkwe-admin/src/main/resources/bootstrap.properties
+++ b/linkwe-admin/src/main/resources/bootstrap.properties
@@ -1,4 +1,3 @@
-#spring.cloud.nacos.config.server-addr=
-#spring.cloud.nacos.config.namespace=
-#spring.application.name=
-#spring.cloud.nacos.config.file-extension=
\ No newline at end of file
+linkwechat.nacos.host=119.45.28.29
+linkwechat.nacos.port=10848
+linkwechat.nacos.namespace=01cf833f-249e-4483-a286-46d37f018fe7
\ No newline at end of file
diff --git a/linkwe-common/pom.xml b/linkwe-common/pom.xml
index 8fc65e25c9fb2e3e0cb46682aec2814444a02b54..e295705613b90bc4a621feab0a4d2f965dc6de7f 100644
--- a/linkwe-common/pom.xml
+++ b/linkwe-common/pom.xml
@@ -39,12 +39,6 @@
com.github.pagehelper
pagehelper-spring-boot-starter
-
-
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
-
-
@@ -260,6 +254,22 @@
bcpkix-jdk15on
1.68
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+
+ com.github.jsqlparser
+ jsqlparser
+
+
+
+ org.springframework
+ spring-test
+
+
\ No newline at end of file
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/config/CosConfig.java b/linkwe-common/src/main/java/com/linkwechat/common/config/CosConfig.java
index ba15b5f88a83379a9ce73871cd408f6a352c240a..659fe217891e4ff07e634695fca5fe5d0b30a2cc 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/config/CosConfig.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/config/CosConfig.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
* @author Kewen
*/
@Component
-@ConfigurationProperties(prefix = "cos")
+//@ConfigurationProperties(prefix = "cos")
@Data
public class CosConfig {
@@ -20,6 +20,6 @@ public class CosConfig {
private String bucketName;
- private String imgUrlPrefix;
+ private String cosImgUrlPrefix;
}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/config/ElasticSearchConfig.java b/linkwe-common/src/main/java/com/linkwechat/common/config/ElasticSearchConfig.java
index 69a7b5f5fb55b0dbc3de8e3bfc41b22a011557fd..edaf1f2e81b41e8e7fd48d5b367d0a67b738894a 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/config/ElasticSearchConfig.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/config/ElasticSearchConfig.java
@@ -1,3 +1,4 @@
+/*
package com.linkwechat.common.config;
import org.apache.http.HttpHost;
@@ -14,23 +15,29 @@ import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
import java.util.List;
+*/
/**
* @author danmo
* @description ElasticSearch 配置
* @date 2020/12/4 9:59
- **/
+ **//*
+
@Configuration
public class ElasticSearchConfig {
- /**
+ */
+/**
* 协议
- */
+ *//*
+
@Value("${elasticsearch.schema:http}")
private String schema;
- /**
+ */
+/**
* 集群地址，如果有多个用“,”隔开
- */
+ *//*
+
@Value("${elasticsearch.address}")
private String address;
@@ -39,33 +46,43 @@ public class ElasticSearchConfig {
@Value("${elasticsearch.password}")
private String password;
- /**
+ */
+/**
* 连接超时时间
- */
+ *//*
+
@Value("${elasticsearch.connectTimeout:5000}")
private int connectTimeout;
- /**
+ */
+/**
* Socket 连接超时时间
- */
+ *//*
+
@Value("${elasticsearch.socketTimeout:10000}")
private int socketTimeout;
- /**
+ */
+/**
* 获取连接的超时时间
- */
+ *//*
+
@Value("${elasticsearch.connectionRequestTimeout:5000}")
private int connectionRequestTimeout;
- /**
+ */
+/**
* 最大连接数
- */
+ *//*
+
@Value("${elasticsearch.maxConnectNum:100}")
private int maxConnectNum;
- /**
+ */
+/**
* 最大路由连接数
- */
+ *//*
+
@Value("${elasticsearch.maxConnectPerRoute:100}")
private int maxConnectPerRoute;
@@ -102,4 +119,4 @@ public class ElasticSearchConfig {
return new RestHighLevelClient(builder);
}
-}
\ No newline at end of file
+}*/
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/config/FileConfig.java b/linkwe-common/src/main/java/com/linkwechat/common/config/FileConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..0cec7438722de4d1f9001d52dff64d00f89f5bfe
--- /dev/null
+++ b/linkwe-common/src/main/java/com/linkwechat/common/config/FileConfig.java
@@ -0,0 +1,14 @@
+package com.linkwechat.common.config;
+
+import lombok.Data;
+
+@Data
+public class FileConfig {
+
+ /**是否开启云存储*/
+ private boolean startCosUpload=false;
+ /**腾讯云存储相关配置*/
+ private CosConfig cos;
+ /**文件前缀*/
+ private String imgUrlPrefix;
+}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/config/RuoYiConfig.java b/linkwe-common/src/main/java/com/linkwechat/common/config/RuoYiConfig.java
index a82a02ced4801583f0ee9790032f52d577e04d60..2a714311afba5474d2b5590bc973ec7c7d9edbcf 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/config/RuoYiConfig.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/config/RuoYiConfig.java
@@ -1,5 +1,6 @@
package com.linkwechat.common.config;
+import com.linkwechat.common.utils.OsUtils;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -33,6 +34,18 @@ public class RuoYiConfig
/** 企业微信账号登录系统默认密码 */
private static String weUserDefaultPwd="123456";
+
+ private FileConfig file;
+
+
+ /**是否开启多租户*/
+ private boolean startTenant=false;
+
+
+
+ /**匿名访问的URL*/
+ private String[] anonUrl;
+
public String getName()
{
return name;
@@ -75,7 +88,11 @@ public class RuoYiConfig
public static String getProfile()
{
- return profile;
+ if(OsUtils.isWindows()){
+ return "D:/linkWeChat/uploadPath";
+
+ }
+ return "/linkWeChat/uploadPath";
}
public void setProfile(String profile)
@@ -132,4 +149,28 @@ public class RuoYiConfig
public void setWeUserDefaultPwd(String weUserDefaultPwd) {
RuoYiConfig.weUserDefaultPwd = weUserDefaultPwd;
}
+
+ public String[] getAnonUrl() {
+ return anonUrl;
+ }
+
+ public void setAnonUrl(String[] anonUrl) {
+ this.anonUrl = anonUrl;
+ }
+
+ public FileConfig getFile() {
+ return file;
+ }
+
+ public void setFile(FileConfig file) {
+ this.file = file;
+ }
+
+ public boolean isStartTenant() {
+ return startTenant;
+ }
+
+ public void setStartTenant(boolean startTenant) {
+ this.startTenant = startTenant;
+ }
}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/config/WeComeConfig.java b/linkwe-common/src/main/java/com/linkwechat/common/config/WeComeConfig.java
index aad15899d68ca51453f23ac2c74169aadde4d090..7d53d65dae71a5f3a9d16b67b2826b9d1f47e4cc 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/config/WeComeConfig.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/config/WeComeConfig.java
@@ -36,4 +36,7 @@ public class WeComeConfig {
/** 第三方自建应用得url*/
private String[] thirdAppUrl;
+
+ /**多租户相关表*/
+ private String[] needTenant=new String[]{};
}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/constant/Constants.java b/linkwe-common/src/main/java/com/linkwechat/common/constant/Constants.java
index 621e4667553ea7d55efc6d66263a2c857c6a6d0f..40c2dcc1e2229e5aa7201331f0808d76ba8ffd99 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/constant/Constants.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/constant/Constants.java
@@ -163,7 +163,7 @@ public class Constants
public static final String DEFAULT_WECOME_CORP_ADMIN="CROP_ADMIN_ROLE";
/**完成待办*/
- public static final String HANDLE_SUCCESS="1";
+ public static final String HANDLE_SUCCESS="3";
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/constant/WeConstans.java b/linkwe-common/src/main/java/com/linkwechat/common/constant/WeConstans.java
index d51c77cfc0d30c47ccb8b71917989cbc766c4fa9..e8d333468f57ace60e55629fdc78de62fba4717d 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/constant/WeConstans.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/constant/WeConstans.java
@@ -404,4 +404,8 @@ public class WeConstans {
*/
public static final String SEND_MESSAGE_CUSTOMER_PART = "1";
+ /**
+ * 会话消息订阅的频道
+ */
+ public static final String CONVERSATION_MSG_CHANNEL = "CONVERSATION_MSG_CHANNEL";
}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/core/domain/FileVo.java b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/FileVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..57fb68d5efb018a0470db3f313bbc034ea4d024c
--- /dev/null
+++ b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/FileVo.java
@@ -0,0 +1,17 @@
+package com.linkwechat.common.core.domain;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @description:
+ * @author: HaoN
+ * @create: 2021-07-13 15:25
+ **/
+@Data
+@Builder
+public class FileVo {
+ private String fileName;
+ private String url;
+}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysDept.java b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysDept.java
index 6f168b1a0bf846662f991d8a71779deba58c3e54..f050a27a05a435625e18becb161e4adff56b92e1 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysDept.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysDept.java
@@ -5,6 +5,10 @@ import java.util.List;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.linkwechat.common.core.domain.BaseEntity;
@@ -14,6 +18,9 @@ import com.linkwechat.common.core.domain.BaseEntity;
*
* @author ruoyi
*/
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class SysDept extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysUser.java b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysUser.java
index b0dd5cc35734c977b265f306191958a2a711562e..3c03a15bb94ac12d6ddbd07244fb071fab66758e 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysUser.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/SysUser.java
@@ -50,6 +50,9 @@ public class SysUser extends BaseEntity
/** 用户类型（00系统用户）(11:企业微信用户) */
private String userType;
+ /**当前微信用户对应微信端的id*/
+ private String weUserId;
+
/** 用户邮箱 */
@Excel(name = "用户邮箱")
private String email;
@@ -106,6 +109,9 @@ public class SysUser extends BaseEntity
private boolean validCropId=false;
+ private String companyName;
+
+
private WeCorpAccount weCorpAccount;
public SysUser()
@@ -316,6 +322,15 @@ public class SysUser extends BaseEntity
this.postIds = postIds;
}
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/WeCorpAccount.java b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/WeCorpAccount.java
index 58e077c3739d19abe97684c7b69ca08f77269959..89ecca5005a40a35648b7c425794005d7b4f4189 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/WeCorpAccount.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/core/domain/entity/WeCorpAccount.java
@@ -1,5 +1,8 @@
package com.linkwechat.common.core.domain.entity;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.linkwechat.common.constant.Constants;
import com.linkwechat.common.core.domain.BaseEntity;
import com.linkwechat.common.utils.SnowFlakeUtil;
import io.swagger.annotations.ApiModel;
@@ -8,7 +11,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import springfox.documentation.annotations.ApiIgnore;
import javax.validation.constraints.NotBlank;
@@ -23,11 +25,14 @@ import javax.validation.constraints.NotBlank;
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("企业id配置相关实体")
+@TableName("we_corp_account")
public class WeCorpAccount extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
+ @TableId
+ @ApiModelProperty("主键")
private Long id= SnowFlakeUtil.nextId();
/** 企业名称 */
@@ -36,12 +41,12 @@ public class WeCorpAccount extends BaseEntity
private String companyName;
/** 企业ID */
- @ApiModelProperty("企业ID")
+ @ApiModelProperty("企业corpId")
@NotBlank(message = "企业ID不能为空")
private String corpId;
/** 应用的密钥凭证 */
- @ApiModelProperty("应用的密钥凭证")
+ @ApiModelProperty("企业为corpSecret")
@NotBlank(message = "应用的密钥凭证不能为空")
private String corpSecret;
@@ -75,9 +80,11 @@ public class WeCorpAccount extends BaseEntity
private String wxQrLoginRedirectUri;
@ApiModelProperty("客户流失通知开关 0:关闭 1:开启")
- private String customerChurnNoticeSwitch = new String("0");
+ private String customerChurnNoticeSwitch = Constants.NORMAL_CODE;
+ @ApiModelProperty("会话存档私钥")
+ private String financePrivateKey;
@ApiModelProperty("企业管理员账号")
- private String cropAccount;
+ private String corpAccount;
}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/core/redis/RedisCache.java b/linkwe-common/src/main/java/com/linkwechat/common/core/redis/RedisCache.java
index 0a0313145192f7d190303723c92ab2e8b640362e..9910f5bfd806aebd0fb0e1c3a6d3c635a0424f8c 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/core/redis/RedisCache.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/core/redis/RedisCache.java
@@ -5,11 +5,14 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+
+import com.alibaba.fastjson.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
/**
* spring redis 工具类
@@ -224,4 +227,16 @@ public class RedisCache
{
return redisTemplate.keys(pattern);
}
+
+
+ /**
+ * 将给定的消息发布到给定的频道
+ *
+ * @param channel 要发布到的频道
+ * @param message 消息内容
+ */
+ public void convertAndSend(String channel, Object message)
+ {
+ redisTemplate.convertAndSend(channel,message);
+ }
}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/enums/GroupMessageType.java b/linkwe-common/src/main/java/com/linkwechat/common/enums/GroupMessageType.java
index 421aeec753bd7d7f60c61a3249e20dd1c1405e19..e2ef0e687b41488730982a7224974fc404e59d6e 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/enums/GroupMessageType.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/enums/GroupMessageType.java
@@ -33,6 +33,11 @@ public enum GroupMessageType {
*/
TEXT_IMAGE("4", "text_image"),
+ /**
+ * 视频
+ */
+ VIDEO("5", "video")
+
;
/**
* 媒体类型
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/enums/TrajectorySceneType.java b/linkwe-common/src/main/java/com/linkwechat/common/enums/TrajectorySceneType.java
new file mode 100644
index 0000000000000000000000000000000000000000..3e930930a28a432982199f420d8254ce8ade0717
--- /dev/null
+++ b/linkwe-common/src/main/java/com/linkwechat/common/enums/TrajectorySceneType.java
@@ -0,0 +1,47 @@
+package com.linkwechat.common.enums;
+
+public enum TrajectorySceneType {
+
+ TRAJECTORY_TYPE_XXDT_BCZL(TrajectoryType.TRAJECTORY_TYPE_XXDT.getType(),"信息动态-补充资料",1),
+ TRAJECTORY_TYPE_XXDT_SZBQ(TrajectoryType.TRAJECTORY_TYPE_XXDT.getType(),"信息动态-设置标签",2);
+
+
+ private String name;
+
+ private Integer type;
+
+
+ private Integer key;
+
+
+ TrajectorySceneType( Integer type,String name,Integer key) {
+ this.name = name;
+ this.type = type;
+ this.key=key;
+ }
+
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/enums/TrajectoryType.java b/linkwe-common/src/main/java/com/linkwechat/common/enums/TrajectoryType.java
new file mode 100644
index 0000000000000000000000000000000000000000..a15a43e2d8ef37e3b248a784b9ab6ac0de3c1469
--- /dev/null
+++ b/linkwe-common/src/main/java/com/linkwechat/common/enums/TrajectoryType.java
@@ -0,0 +1,49 @@
+package com.linkwechat.common.enums;
+
+import lombok.Getter;
+
+import java.util.stream.Stream;
+
+/**
+ * 客户轨迹枚举
+ */
+@Getter
+public enum TrajectoryType {
+
+
+ TRAJECTORY_TYPE_XXDT(1,"信息动态"),
+ TRAJECTORY_TYPE_SJDT(2,"社交动态"),
+
+ TRAJECTORY_TYPE_HDGZ(3,"活动规则"),
+
+ TRAJECTORY_TYPE_DBDT(4,"待办动态");
+
+ private String name;
+
+ private Integer type;
+
+
+ TrajectoryType( Integer type,String name) {
+ this.name = name;
+ this.type = type;
+ }
+
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+
+}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/utils/OsUtils.java b/linkwe-common/src/main/java/com/linkwechat/common/utils/OsUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..598598fed8b7ac681cb9e9b16f168e3e1e426e8c
--- /dev/null
+++ b/linkwe-common/src/main/java/com/linkwechat/common/utils/OsUtils.java
@@ -0,0 +1,14 @@
+package com.linkwechat.common.utils;
+
+
+/**
+ * 操作系统相关判断
+ */
+public class OsUtils {
+
+ public static boolean isWindows() {
+ String osName = System.getProperties().getProperty("os.name");
+ System.out.println("current system is " + osName);
+ return osName.toUpperCase().indexOf("WINDOWS") != -1;
+ }
+}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/utils/QREncode.java b/linkwe-common/src/main/java/com/linkwechat/common/utils/QREncode.java
index c7161b4a50a1f8a5648896b5ae171216fce489a0..0bc6018c74d2dbfb6b62abb56b906f5a09ce3970 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/utils/QREncode.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/utils/QREncode.java
@@ -19,6 +19,8 @@ import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.linkwechat.common.constant.Constants;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
public class QREncode {
@@ -186,6 +188,15 @@ public class QREncode {
}
}
+ public static MultipartFile getQRCodeMultipartFile(String content, String logoUrl) throws IOException {
+ BufferedImage bufferedImage = crateQRCode(content, logoUrl);
+ //读取图片转换为 BufferedImage
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ImageIO.write( bufferedImage, "jpg", baos );
+ //转换为MultipartFile
+ return new MockMultipartFile("groupQrCode","groupQrCode.jpg","text/plain", baos.toByteArray());
+ }
+
@SuppressWarnings({"unchecked", "rawtypes"})
public static void main(String[] args) throws Exception {
String text = "http://open.weixin.qq.com/qr/code/?username=LinkWeChat2021";
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUploadUtils.java b/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUploadUtils.java
index 38ef677c1e0ccb76fca1c8ab843405b2e5860c67..c1c95e84bcff26985927ae2d35d9e78121935f91 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUploadUtils.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUploadUtils.java
@@ -56,6 +56,8 @@ public class FileUploadUtils {
return defaultBaseDir;
}
+
+
/**
* 以默认配置进行文件上传
*
@@ -194,11 +196,10 @@ public class FileUploadUtils {
COSClient cosClient = new COSClient(cred, clientConfig);
// 指定要上传到 COS 上对象键
- String key = "exampleobject";
ObjectMetadata objectMetadata = new ObjectMetadata();
PutObjectRequest putObjectRequest = new PutObjectRequest(cosConfig.getBucketName(), fileName,file.getInputStream(),objectMetadata);
PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
- log.info("{}","https://link-wechat-1251309172.cos.ap-nanjing.myqcloud.com/"+fileName);
+ log.info("{}",cosConfig.getCosImgUrlPrefix()+fileName);
log.info("腾讯cos上传信息：{}",new ObjectMapper().writeValueAsString(putObjectResult));
cosClient.shutdown();
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUtil.java b/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..c8829c0690c0147c91e9c46c2110422c4ec986bb
--- /dev/null
+++ b/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUtil.java
@@ -0,0 +1,90 @@
+package com.linkwechat.common.utils.file;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.linkwechat.common.config.RuoYiConfig;
+import com.linkwechat.common.utils.OsUtils;
+import com.linkwechat.common.utils.spring.SpringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+
+
+/**
+ * 文件服务
+ */
+@Slf4j
+public class FileUtil {
+
+
+ private static RuoYiConfig ruoYiConfig = SpringUtils.getBean(RuoYiConfig.class);
+
+
+ private static final String WINDOWSFILEPATH="D:/linkWeChat/uploadPath";
+
+
+ private static final String LINUXFILEPATH="/linkWeChat/uploadPath";
+
+ /**
+ * 文件上传
+ * @param file
+ * @return
+ * @throws IOException
+ */
+ public static JSONObject upload(MultipartFile file) throws Exception {
+
+ try {
+ FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ String fileName="";
+ String imgUrlPrefix="";
+ if(ruoYiConfig.getFile().isStartCosUpload()){//开启云上传
+ //开启云上传开关则云上传，不然上传本地
+ fileName = FileUploadUtils.upload2Cos(file, ruoYiConfig.getFile().getCos());
+ imgUrlPrefix = ruoYiConfig.getFile().getCos().getCosImgUrlPrefix();
+ }else {//本地上传
+ File osFile=OsUtils.isWindows()?new File(WINDOWSFILEPATH):new File(LINUXFILEPATH);
+ if(!osFile.exists()){
+ osFile.mkdirs();
+ }
+ fileName = FileUploadUtils.upload(osFile.getPath(), file);
+ imgUrlPrefix = ruoYiConfig.getFile().getImgUrlPrefix();
+ }
+ JSONObject reust = new JSONObject();
+ reust.put("fileName",fileName);
+ reust.put("imgUrlPrefix",imgUrlPrefix);
+ return reust;
+
+ }catch (Exception e){
+ throw e;
+ }
+
+ }
+
+
+ /**
+ * 获取图片(本地,或者网络图片)
+ * @param fileName
+ * @param rp
+ */
+ public void findImage(String fileName, HttpServletResponse rp){
+ try {
+ String fileDownUrl="";
+ rp.setContentType("image/png");
+ if(ruoYiConfig.getFile().isStartCosUpload()) {//开启云上传
+ fileDownUrl= ruoYiConfig.getFile().getCos().getCosImgUrlPrefix();
+ FileUtils.downloadFile(fileDownUrl+fileName,rp.getOutputStream());
+ }else{
+ fileDownUrl=OsUtils.isWindows()?WINDOWSFILEPATH+"/"+fileName:LINUXFILEPATH+"/"+fileName;
+ FileUtils.writeBytes(fileDownUrl,rp.getOutputStream());
+ }
+ }catch (Exception e){
+ log.error("图片获取异常:"+e.getMessage());
+
+ }
+ }
+
+
+}
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUtils.java b/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUtils.java
index a100824da5257f91572caf047e8387512f02392d..49c2d8eeb20257c0712e2db4ef4301b0add71f2c 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUtils.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/utils/file/FileUtils.java
@@ -1,10 +1,14 @@
package com.linkwechat.common.utils.file;
+import com.linkwechat.common.utils.StringUtils;
+
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import javax.servlet.http.HttpServletRequest;
@@ -74,6 +78,40 @@ public class FileUtils extends org.apache.commons.io.FileUtils
}
}
+ /**
+ * 批量下载文件，打包为zip。
+ * @param fileList 文件列表，每个元素应包含fileName、url，前者即为文件名，后者为下载所需链接
+ * @param os 输出流
+ */
+ public static void batchDownloadFile(List> fileList, OutputStream os) {
+ try {
+ ZipOutputStream zos = new ZipOutputStream(os);
+ for (Map fileInfo: fileList) {
+ String fileName = fileInfo.get("fileName");
+ String url = fileInfo.get("url");
+ // 跳过不包含指定键位的对象
+ if (StringUtils.isEmpty(url) || StringUtils.isEmpty(fileName)){
+ continue;
+ }
+ URL _url = new URL(url);
+ zos.putNextEntry(new ZipEntry(fileName));
+ InputStream fis = _url.openConnection().getInputStream();
+ byte[] buffer = new byte[1024];
+ int r = 0;
+ while ((r = fis.read(buffer)) != -1) {
+ zos.write(buffer, 0, r);
+ }
+ fis.close();
+ }
+ //关闭zip输出流
+ zos.flush();
+ zos.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
/**
*
* @param urlPath 下载路径
diff --git a/linkwe-common/src/main/java/com/linkwechat/common/utils/wecom/RSAUtil.java b/linkwe-common/src/main/java/com/linkwechat/common/utils/wecom/RSAUtil.java
index a959faebbb05f0288c45321ad4b10aefb64ee9f6..8180ef5729aff69ecd362a8309702f9310fc3cae 100644
--- a/linkwe-common/src/main/java/com/linkwechat/common/utils/wecom/RSAUtil.java
+++ b/linkwe-common/src/main/java/com/linkwechat/common/utils/wecom/RSAUtil.java
@@ -1,5 +1,6 @@
package com.linkwechat.common.utils.wecom;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openssl.PEMKeyPair;
import org.bouncycastle.openssl.PEMParser;
import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
@@ -21,6 +22,13 @@ import java.util.Base64;
* @date 2020/12/7 23:37
**/
public class RSAUtil {
+ static{
+ try{
+ Security.addProvider(new BouncyCastleProvider());
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+ }
/**
* RSA pkcs1 2048bit 解密工具,
* 获取私钥PrivateKey
diff --git a/linkwe-common/src/main/java/com/tencent/wework/Finance.java b/linkwe-common/src/main/java/com/tencent/wework/Finance.java
index 935920bef0a20c659d7b0996b1b3ed1446247a0d..aea17197f08257f89c25be30564994a0018caa12 100644
--- a/linkwe-common/src/main/java/com/tencent/wework/Finance.java
+++ b/linkwe-common/src/main/java/com/tencent/wework/Finance.java
@@ -1,6 +1,8 @@
package com.tencent.wework;
+import com.linkwechat.common.utils.OsUtils;
+
public class Finance {
public native static long NewSdk();
@@ -111,21 +113,17 @@ public class Finance {
public native static int IsMediaDataFinish(long mediaData);
static {
- if (isWindows()) {
+ if (OsUtils.isWindows()) {
System.loadLibrary("libeay32");
System.loadLibrary("libprotobuf");
System.loadLibrary("ssleay32");
System.loadLibrary("libcurl");
System.loadLibrary("WeWorkFinanceSdk");
} else {
- System.load("/data/jenkins_home/app/projects/libWeWorkFinanceSdk_Java.so");
+ System.load("/app/projects/libWeWorkFinanceSdk_Java.so");
}
}
- public static boolean isWindows() {
- String osName = System.getProperties().getProperty("os.name");
- System.out.println("current system is " + osName);
- return osName.toUpperCase().indexOf("WINDOWS") != -1;
- }
+
}
\ No newline at end of file
diff --git a/linkwe-common/src/main/java/com/tencent/wework/FinanceUtils.java b/linkwe-common/src/main/java/com/tencent/wework/FinanceService.java
similarity index 49%
rename from linkwe-common/src/main/java/com/tencent/wework/FinanceUtils.java
rename to linkwe-common/src/main/java/com/tencent/wework/FinanceService.java
index ba9a8dc7c21dcd76f1ec7c2c19479d7def6009dc..15f32f460140da490bc16b9f0341c29406a15fc1 100644
--- a/linkwe-common/src/main/java/com/tencent/wework/FinanceUtils.java
+++ b/linkwe-common/src/main/java/com/tencent/wework/FinanceService.java
@@ -1,12 +1,10 @@
package com.tencent.wework;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.io.FileUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.linkwechat.common.config.CosConfig;
import com.linkwechat.common.config.RuoYiConfig;
-import com.linkwechat.common.constant.WeConstans;
-import com.linkwechat.common.core.redis.RedisCache;
import com.linkwechat.common.utils.DateUtils;
import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.common.utils.file.FileUploadUtils;
@@ -18,11 +16,13 @@ import lombok.extern.slf4j.Slf4j;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.InputStream;
import java.security.PrivateKey;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
/**
* @author danmo
@@ -30,119 +30,127 @@ import java.util.concurrent.atomic.AtomicLong;
* @date 2020/12/2 16:01
**/
@Slf4j
-public class FinanceUtils {
+public class FinanceService{
+
/**
* NewSdk返回的sdk指针
*/
- private static volatile long sdk = 0;
+ private long sdk = 0;
/**
* 超时时间，单位秒
*/
- private final static long timeout = 5 * 60;
+ private final long timeout = 5 * 60;
- private static String downloadWeWorkPath = RuoYiConfig.getDownloadWeWorkPath();
+ /**
+ * 企业id
+ */
+ private String corpId;
/**
- * 初始化
- *
+ * 会话存档密钥
+ */
+ private String secret;
+
+ /**
+ * 会话私钥
+ */
+ private String privateKey;
+
+ /**
+ * 代理
+ */
+ private String proxy;
+
+ /**
+ * 代理密码
+ */
+ private String passwd;
+
+ /**
+ * 一次拉取的消息条数，最大值1000条，超过1000条会返回错误
+ */
+ private final long LIMIT = 1_000L;
+
+ private RuoYiConfig ruoYiConfig;
+
+ public FinanceService(String corpId, String secret, String privateKey){
+ this(corpId,secret,privateKey,"","");
+ }
+ /**
+ * 构造器
* @param corpId 企业id
* @param secret 会话存档密钥
+ * @param privateKey 会话私钥
+ */
+ public FinanceService(String corpId, String secret, String privateKey, String proxy, String passwd){
+ this.corpId = corpId;
+ this.secret = secret;
+ this.privateKey = privateKey;
+ this.proxy = proxy;
+ this.passwd = passwd;
+ ruoYiConfig = SpringUtils.getBean(RuoYiConfig.class);
+ //初始化
+ initSDK();
+ }
+
+ /**
+ * 初始化
*/
- public static void initSDK(String corpId, String secret) {
- if (sdk == 0) {
+ private void initSDK() {
+ if (0 == sdk) {
sdk = Finance.NewSdk();
Finance.Init(sdk, corpId, secret);
}
}
- private final static String privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" +
- "MIIEpAIBAAKCAQEAjGwIQIMGDJonMQdX3OJzZN0YVoYbORK1FU/8vhwdI9ixxSGW\n" +
- "nrAQc6r8k3g1QTXzmKAxdVlAa1OGZCpl5X5A6C9JwDhFpuN+SKJxfxtHNv1oBk0r\n" +
- "LnDftsdlibZFQn3fiMomxKyU8eujWBe31+pLQXaTSdSHcNhb+NrBa7AtNUr/c7bK\n" +
- "nnFUZHDpXFB4Z0BhK1cRh2NN7ppLNnIJXpduGrwGtLdx++LsBaX2vjO4qW/DKP2Z\n" +
- "3gZON1tGoofS1IPhCg0naoRN3lL7ctFAyxOr2ualGOc6hpvBGfjnBKU42aoaKQEi\n" +
- "7tVJHChonZXMRcm4mdPu5371IzPeR3NYlP3ESQIDAQABAoIBAEux8MDV4GzqrDXB\n" +
- "v5tSduHoTTZXFFWvv+29MIFKpmqsZSfe81KXlkbD5WOZaRu9+ZJMyFx5wEAaxlc4\n" +
- "g7UyWcrPsvHrY6CTAYAmEQhzq+/4qhq7fouKTQ46boHNv4gYUmdqkXtzjNbcLzFN\n" +
- "l8zMf8TKJpul9VzfRLThN2LVlYkkETcCukzZrK+aSCi6E/dL+noL1ndZYmWF5kbB\n" +
- "lk881x5CdbusYBtoxfh6ie0EXfCyK4duX3OdvXRcSpTdqiqTcrtt9oinh4ZHV930\n" +
- "BCTPkGGz5UL3C243W3dlzuonNXqwl++FCSyRMVONYSgb4NRJn4fvehjGtXyAv3Sz\n" +
- "nSAVoAECgYEA9dhYk4DT2Hclaqo/0ugQvUp7oIPN9qFgrZ6nU94SHkdrBqhFrCmz\n" +
- "32GeYGSsQJQx3T9Kuip7oGX9AOKn3f30NrcuAe9VzzWAkCKQgQgmtMVySAPWCVr9\n" +
- "4MH77hc3ijxr6iGd70BQ7EDyVQGRvZqOLl1wu7yZ9vhbVHA87KpgHf0CgYEAkjjn\n" +
- "mNudh+rs8ibrGu+md8bXJdxHtIbncXF5VsV7wi4HlHfKnWqy+z2If1akm2iacnsi\n" +
- "XDVqyYNExdtoxmbPc/R9ZJ8jP0FLPoWACcjP03r9H+5eiXrmniZbElGshnwKHFFh\n" +
- "ZlY1xPAXFgEjh10DDG1wK6/9eB13o+NdP7c7yz0CgYEA3HujNOadF84DaJ43j1dB\n" +
- "bAKYzWRoG4CvzAY12ymW5kD244mWssjT4MsT1y9yrJg8AEj7I+tl5HyTY2/jTVys\n" +
- "4UV3pZSYSLWbD6lwH8jHrehGjf+ivdE1T5Wp8+YukXOO9PQhSKlN6hR1QXee1YT/\n" +
- "buWubTDAhJZIknn2qepDOaECgYA/OnITLCwTYOey0ldpn2V5d7cC/RzYmFkuOeZB\n" +
- "OkYIsoS+k4o+xau9bl8+yQWG2hWnGU3DV6nkl2m+sOC+oihkuL0cLKA+MwrJb0rt\n" +
- "cDNF/HHGQ/oHMujUTDunUT/sK2jn09ztNqwri7I/5qApYXP3BL+zdHeDYCKi8Kca\n" +
- "7S3i9QKBgQCgKgQf8u+oRojMH14iJssAyNEhZgmJ85s/BeiUmMuW5K8iZZ5pnVuq\n" +
- "8nc/IJGVPHRTObdGCd1L4d5UERiX46Z1BjYv/nuK5DScDcB3mq6K9VXJLNE+MxwW\n" +
- "wOVT+6FjmBRucGXczAkWXCH7++y6gYzE+OuRIdv5sVkE24gNG7sawg==\n" +
- "-----END RSA PRIVATE KEY-----";
-
/**
* 拉取聊天记录
*
* @param seq 消息的seq值，标识消息的序号
- * @param proxy 代理
- * @param passwd 密码
*/
- public static List getChatData(long seq, String proxy, String passwd, RedisCache redisCache) {
- List resList = new ArrayList<>();
+ public void getChatData(long seq, Consumer consumer) {
long slice = Finance.NewSlice();
- int ret = Finance.GetChatData(sdk, seq, WeConstans.LIMIT, proxy, passwd, timeout, slice);
+ int ret = Finance.GetChatData(sdk, seq, LIMIT, proxy, passwd, timeout, slice);
if (ret != 0) {
log.info("getChatData ret " + ret);
- return null;
+ return;
}
String content = Finance.GetContentFromSlice(slice);
- JSONArray chatdataArr = JSONObject.parseObject(content).getJSONArray("chatdata");
+ JSONArray chatDataArr = JSONObject.parseObject(content).getJSONArray("chatdata");
log.info("开始执行数据解析:------------");
AtomicLong LocalSEQ = new AtomicLong();
- if (CollectionUtil.isNotEmpty(chatdataArr)) {
- chatdataArr.stream().map(data -> (JSONObject) data).forEach(data -> {
- try {
- LocalSEQ.set(data.getLong("seq"));
- JSONObject jsonObject = decryptChatRecord(sdk, data.getString("encrypt_random_key"),
- data.getString("encrypt_chat_msg"), privateKey);
- if (jsonObject == null) {
- return;
- }
+ if (CollectionUtil.isNotEmpty(chatDataArr)) {
+ chatDataArr.stream().map(data -> (JSONObject) data).forEach(data -> {
+ LocalSEQ.set(data.getLong("seq"));
+ JSONObject jsonObject = decryptChatRecord(sdk, data.getString("encrypt_random_key"), data.getString("encrypt_chat_msg"));
+ if (jsonObject != null) {
jsonObject.put("seq", LocalSEQ.get());
- resList.add(jsonObject);
- } catch (Exception e) {
- e.printStackTrace();
+ consumer.accept(jsonObject);
}
});
log.info("数据解析完成:------------");
}
Finance.FreeSlice(slice);
- redisCache.setCacheObject(WeConstans.CONTACT_SEQ_KEY, LocalSEQ.get());
- return resList;
}
/**
* @param sdk 初始化时候获取到的值
- * @param ncrypt_random_key 企业微信返回的随机密钥
- * @param encrypt_chat_msg 企业微信返回的单条记录的密文消息
- * @param privateKey 企业微信管理后台设置的私钥,!!!版本记得对应上!!!
+ * @param encryptRandomKey 企业微信返回的随机密钥
+ * @param encryptChatMsg 企业微信返回的单条记录的密文消息
* @return JSONObject 返回不同格式的聊天数据,格式有二十来种
* 详情请看官网 https://open.work.weixin.qq.com/api/doc/90000/90135/91774#%E6%B6%88%E6%81%AF%E6%A0%BC%E5%BC%8F
*/
- private static JSONObject decryptChatRecord(Long sdk, String ncrypt_random_key, String encrypt_chat_msg, String privateKey) {
+ private JSONObject decryptChatRecord(Long sdk, String encryptRandomKey, String encryptChatMsg) {
Long msg = null;
try {
//获取私钥
PrivateKey privateKeyObj = RSAUtil.getPrivateKey(privateKey);
- String str = RSAUtil.decryptRSA(ncrypt_random_key, privateKeyObj);
+ String str = RSAUtil.decryptRSA(encryptRandomKey, privateKeyObj);
//初始化参数slice
msg = Finance.NewSlice();
//解密
- Finance.DecryptData(sdk, str, encrypt_chat_msg, msg);
+ Finance.DecryptData(sdk, str, encryptChatMsg, msg);
String jsonDataStr = Finance.GetContentFromSlice(msg);
JSONObject realJsonData = JSONObject.parseObject(jsonDataStr);
String msgType = realJsonData.getString("msgtype");
@@ -162,7 +170,7 @@ public class FinanceUtils {
}
}
- private static void getSwitchType(JSONObject realJsonData, String msgType) {
+ private void getSwitchType(JSONObject realJsonData, String msgType) {
switch (msgType) {
case "image":
setMediaImageData(realJsonData, msgType);
@@ -191,14 +199,14 @@ public class FinanceUtils {
}
}
- private static void setMediaMeetingVoiceCallData(JSONObject realJsonData, String msgType) {
+ private void setMediaMeetingVoiceCallData(JSONObject realJsonData, String msgType) {
JSONObject meetingVoiceCall = Optional.ofNullable(realJsonData.getJSONObject(msgType))
.orElse(realJsonData.getJSONObject("content"));
String fileName = meetingVoiceCall.getString("filename");
getPath(realJsonData, msgType, fileName);
}
- private static void setMediaMixedData(JSONObject realJsonData, String msgType) {
+ private void setMediaMixedData(JSONObject realJsonData, String msgType) {
JSONObject mixedData = realJsonData.getJSONObject(msgType);
JSONArray items = mixedData.getJSONArray("item");
items.stream().map(item -> (JSONObject) item).forEach(item -> {
@@ -206,7 +214,7 @@ public class FinanceUtils {
});
}
- private static void setMediaFileData(JSONObject realJsonData, String msgType) {
+ private void setMediaFileData(JSONObject realJsonData, String msgType) {
JSONObject emotionData = Optional.ofNullable(realJsonData.getJSONObject(msgType))
.orElse(realJsonData.getJSONObject("content"));
String filename = emotionData.getString("filename");
@@ -216,22 +224,22 @@ public class FinanceUtils {
}
- private static void setMediaImageData(JSONObject realJsonData, String msgType) {
+ private void setMediaImageData(JSONObject realJsonData, String msgType) {
String fileName = IdUtils.simpleUUID() + ".jpg";
getPath(realJsonData, msgType, fileName);
}
- private static void setMediaVoiceData(JSONObject realJsonData, String msgType) {
+ private void setMediaVoiceData(JSONObject realJsonData, String msgType) {
String fileName = IdUtils.simpleUUID() + ".mp3";
getPath(realJsonData, msgType, fileName);
}
- private static void setMediaVideoData(JSONObject realJsonData, String msgType) {
+ private void setMediaVideoData(JSONObject realJsonData, String msgType) {
String fileName = IdUtils.simpleUUID() + ".mp4";
getPath(realJsonData, msgType, fileName);
}
- private static void setMediaEmotionData(JSONObject realJsonData, String msgType) {
+ private void setMediaEmotionData(JSONObject realJsonData, String msgType) {
String fileName = "";
JSONObject emotionData = realJsonData.getJSONObject(msgType);
Integer type = emotionData.getInteger("type");
@@ -248,47 +256,22 @@ public class FinanceUtils {
getPath(realJsonData, msgType, fileName);
}
- /*//本地存储
- private static void getPath(JSONObject realJsonData, String msgType, String fileName) {
+ private void getPath(JSONObject realJsonData, String msgType, String fileName) {
String filePath = getFilePath(msgType);
JSONObject data = Optional.ofNullable(realJsonData.getJSONObject(msgType))
.orElse(realJsonData.getJSONObject("content"));
String sdkfileid = data.getString("sdkfileid");
try {
- getMediaData(sdkfileid, "", "", filePath, fileName);
- } catch (Exception e) {
- e.printStackTrace();
- }
- String currentDir = StringUtils.substring(filePath,downloadWeWorkPath.length()+1);
- String pathFileName;
- if(org.apache.commons.lang3.StringUtils.isBlank(currentDir)){
- pathFileName = Constants.RESOURCE_PREFIX + "/" +fileName;
- }else {
- pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
- }
- data.put("attachment", pathFileName);
- if (realJsonData.containsKey("content")) {
- realJsonData.put("content", data);
- } else {
- realJsonData.put(msgType, data);
- }
-
- }*/
-
- //云存储
- private static void getPath(JSONObject realJsonData, String msgType, String fileName) {
- String filePath = getFilePath(msgType);
- JSONObject data = Optional.ofNullable(realJsonData.getJSONObject(msgType))
- .orElse(realJsonData.getJSONObject("content"));
- String sdkfileid = data.getString("sdkfileid");
- try {
- getMediaData(sdkfileid, "", "", filePath, fileName);
- CosConfig cosConfig = SpringUtils.getBean(CosConfig.class);
- String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
- StringBuilder cosUrl = new StringBuilder(cosConfig.getImgUrlPrefix());
- String cosFilePath = FileUploadUtils.upload2Cos(new FileInputStream(new File(filePath, fileName)), suffix, cosConfig);
- cosUrl.append(cosFilePath);
- data.put("attachment", cosUrl.toString());
+ getMediaData(sdkfileid, filePath, fileName);
+ if(ruoYiConfig.getFile().isStartCosUpload()) {
+ //开启云上传开关则云上传，不然上传本地
+ InputStream inputStream = new FileInputStream(new File(filePath,fileName));
+ String fileFullName = FileUploadUtils.upload2Cos(inputStream, FileUtil.getSuffix(fileName), ruoYiConfig.getFile().getCos());
+ String imgUrlPrefix = ruoYiConfig.getFile().getCos().getCosImgUrlPrefix();
+ data.put("attachment", imgUrlPrefix + fileFullName);
+ }else {
+ data.put("attachment", filePath + "/" + fileName);
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -300,15 +283,15 @@ public class FinanceUtils {
}
- private static String getFilePath(String msgType) {
- return StringUtils.format(downloadWeWorkPath, msgType, DateUtils.getDate());
+ private String getFilePath(String msgType) {
+ return RuoYiConfig.getProfile() + "/" + msgType + "/" + DateUtils.getDate();
}
- private static void getMediaData(String sdkFileid, String proxy, String passwd, String filePath, String fileName) {
+ private void getMediaData(String sdkFileId, String filePath, String fileName) {
String indexbuf = "";
while (true) {
- long media_data = Finance.NewMediaData();
- int ret = Finance.GetMediaData(sdk, indexbuf, sdkFileid, proxy, passwd, timeout, media_data);
+ long mediaData = Finance.NewMediaData();
+ int ret = Finance.GetMediaData(sdk, indexbuf, sdkFileId, proxy, passwd, timeout, mediaData);
log.info("getMediaData ret:" + ret);
if (ret != 0) {
return;
@@ -323,17 +306,17 @@ public class FinanceUtils {
file.createNewFile();
}
FileOutputStream outputStream = new FileOutputStream(file, true);
- outputStream.write(Finance.GetData(media_data));
+ outputStream.write(Finance.GetData(mediaData));
outputStream.close();
} catch (Exception e) {
e.printStackTrace();
}
- if (Finance.IsMediaDataFinish(media_data) == 1) {
- Finance.FreeMediaData(media_data);
+ if (Finance.IsMediaDataFinish(mediaData) == 1) {
+ Finance.FreeMediaData(mediaData);
break;
} else {
- indexbuf = Finance.GetOutIndexBuf(media_data);
- Finance.FreeMediaData(media_data);
+ indexbuf = Finance.GetOutIndexBuf(mediaData);
+ Finance.FreeMediaData(mediaData);
}
}
}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/JsonSerializerManage.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/JsonSerializerManage.java
index 58ee9b095e2bedf64369d3fae87a860edda7f002..b2fe47b4e48a80df08f8ae80ef211861333e6137 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/config/JsonSerializerManage.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/JsonSerializerManage.java
@@ -19,7 +19,7 @@ public class JsonSerializerManage {
@Bean
public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
ObjectMapper objectMapper = builder.createXmlMapper(false).build();
- objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+// objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
SimpleModule module = new SimpleModule();
module.addSerializer(Long.class, ToStringSerializer.instance);
module.addSerializer(Long.TYPE, ToStringSerializer.instance);
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java
index d379fecf0728f98cdab84ba08fe86e33aa527cb5..20675571bec9f77390ff35e15b99cfc3766bb3c5 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/MyBatisPlusConfig.java
@@ -1,10 +1,23 @@
package com.linkwechat.framework.config;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.github.pagehelper.PageInterceptor;
+import com.linkwechat.common.config.RuoYiConfig;
+import com.linkwechat.common.config.WeComeConfig;
+import com.linkwechat.common.core.domain.entity.WeCorpAccount;
+import com.linkwechat.common.utils.SecurityUtils;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.StringValue;
import org.apache.ibatis.plugin.Interceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import java.util.Arrays;
+
/**
* Mybatis支持*匹配扫描包
@@ -12,11 +25,65 @@ import org.springframework.context.annotation.Configuration;
* @author ruoyi
*/
@Configuration
-public class MyBatisPlusConfig
-{
+public class MyBatisPlusConfig {
+ @Autowired
+ WeComeConfig weComeConfig;
+ @Autowired
+ RuoYiConfig ruoYiConfig;
+
@Bean
public Interceptor[] plugins() {
- return new Interceptor[]{new PageInterceptor()};
+
+ if(ruoYiConfig.isStartTenant()){ //多租户相关
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+ interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(
+ new TenantLineHandler() {
+ // 获取租户 ID 值表达式，只支持单个 ID 值
+ @Override
+ public Expression getTenantId() {
+
+ try {
+ WeCorpAccount weCorpAccount
+ = SecurityUtils.getLoginUser().getUser().getWeCorpAccount();
+ if(null != weCorpAccount){
+ return new StringValue(weCorpAccount.getCorpId());
+ }
+ }catch (Exception e){
+ return null;
+ }
+
+ return null;
+ }
+ // 这是 default 方法,默认返回 false 表示所有表都需要拼多租户条件,
+ // 这里设置 role表不需要该条件
+ @Override
+ public boolean ignoreTable(String tableName) {
+
+ if(this.getTenantId()==null){
+ return true;
+ }
+
+
+ if (Arrays.asList(weComeConfig.getNeedTenant())
+ .contains(tableName)){
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public String getTenantIdColumn() {
+
+ return "corp_id";
+ }
+ }));
+ return new Interceptor[]{interceptor,new PageInterceptor()
+ };
+
+ }else{
+ return new Interceptor[]{new PageInterceptor()};
+ }
+
}
}
\ No newline at end of file
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/RedisConfig.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/RedisConfig.java
index d055aca34ac78122d7a0d8a85bc4ddc1ca02b55a..ad2a5fc69edcc92100536503ec19a03ddbee9e1a 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/config/RedisConfig.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/RedisConfig.java
@@ -1,15 +1,21 @@
package com.linkwechat.framework.config;
+import com.linkwechat.common.constant.WeConstans;
+import com.linkwechat.framework.listener.ChatMsgCheckListener;
+import com.linkwechat.framework.listener.ChatMsgListener;
import com.linkwechat.framework.listener.EmpleCodeExpiredListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.MessageListener;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.ChannelTopic;
import org.springframework.data.redis.listener.PatternTopic;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.Topic;
import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -53,14 +59,30 @@ public class RedisConfig extends CachingConfigurerSupport
@Bean
- public RedisMessageListenerContainer redisMessageListenerContainer() {
+ public RedisMessageListenerContainer redisMessageListenerContainer(MessageListenerAdapter chatMsgAdapter,
+ MessageListenerAdapter chatMsgCheckAdapter) {
RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
+ //定义监听渠道
+ Topic msgChannel = new ChannelTopic(WeConstans.CONVERSATION_MSG_CHANNEL);
+ //定义监听器监听的Redis的消息
+ redisMessageListenerContainer.addMessageListener(chatMsgAdapter,msgChannel);
+ redisMessageListenerContainer.addMessageListener(chatMsgCheckAdapter,msgChannel);
return redisMessageListenerContainer;
}
@Bean
public EmpleCodeExpiredListener codeExpiredListener() {
- return new EmpleCodeExpiredListener(this.redisMessageListenerContainer());
+ return new EmpleCodeExpiredListener(this.redisMessageListenerContainer(null,null));
+ }
+
+ @Bean
+ MessageListenerAdapter chatMsgAdapter(ChatMsgListener receiver){
+ return new MessageListenerAdapter(receiver);
+ }
+
+ @Bean
+ MessageListenerAdapter chatMsgCheckAdapter(ChatMsgCheckListener receiver){
+ return new MessageListenerAdapter(receiver);
}
}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/ResourcesConfig.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/ResourcesConfig.java
index 1a34d891105ce1e8635651b60e267c9087e1a570..b7e1c47c24ab750537cb96d85b164a9f5e029cb4 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/config/ResourcesConfig.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/ResourcesConfig.java
@@ -24,6 +24,8 @@ public class ResourcesConfig implements WebMvcConfigurer
@Autowired
private RepeatSubmitInterceptor repeatSubmitInterceptor;
+
+
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry)
{
@@ -66,4 +68,5 @@ public class ResourcesConfig implements WebMvcConfigurer
+
}
\ No newline at end of file
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java
index 42448b76ffe24274fc99e253ec5f15d221f20ea9..6897670edc1944fa6827cfc4bf6a4a7278d8960b 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/SecurityConfig.java
@@ -1,8 +1,10 @@
package com.linkwechat.framework.config;
+import com.linkwechat.common.config.RuoYiConfig;
import com.linkwechat.framework.security.filter.JwtAuthenticationTokenFilter;
import com.linkwechat.framework.security.handle.AuthenticationEntryPointImpl;
import com.linkwechat.framework.security.handle.LogoutSuccessHandlerImpl;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpMethod;
@@ -55,6 +57,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
private CorsFilter corsFilter;
+
+ @Autowired
+ private RuoYiConfig ruoYiConfig;
+
+
/**
* 解决 无法直接注入 AuthenticationManager
*
@@ -84,6 +91,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
*/
@Override
protected void configure(HttpSecurity httpSecurity) throws Exception {
+
+ System.out.println(
+ StringUtils.join(ruoYiConfig.getAnonUrl(),",")
+ );
+
httpSecurity
// CSRF禁用，因为不使用session
.csrf().disable()
@@ -93,8 +105,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
// 过滤请求
.authorizeRequests()
- // 对于登录login 验证码captchaImage 允许匿名访问
- .antMatchers("/login", "/captchaImage", "/findWxQrLoginInfo", "/wxQrLogin").anonymous()
+
+ .antMatchers(ruoYiConfig.getAnonUrl()).anonymous()
+
.antMatchers(
HttpMethod.GET,
"/*.html",
@@ -102,34 +115,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/**/*.css",
"/**/*.js"
).permitAll()
- .antMatchers("/profile/**").anonymous()
- .antMatchers("/common/download**").anonymous()
- .antMatchers("/common/download/resource**").anonymous()
- .antMatchers("/common/download/url**").anonymous()
- .antMatchers("/swagger-ui.html").anonymous()
- .antMatchers("/swagger-resources/**").anonymous()
- .antMatchers("/webjars/**").anonymous()
- .antMatchers("/*/api-docs").anonymous()
- .antMatchers("/druid/**").anonymous()
- .antMatchers("/wecom/callback/**").anonymous()
-
- .antMatchers("/wecom/chat/item/list").anonymous()
- .antMatchers("/wecom/chat/collection/list").anonymous()
- .antMatchers("/wecom/chat/collection/cancleCollection").anonymous()
- .antMatchers("/wecom/chat/collection/addCollection").anonymous()
- .antMatchers("/wecom/chat/side/h5List").anonymous()
- .antMatchers("/wecom/ticket/**").anonymous()
-
- .antMatchers("/wecom/user/getUserInfo").anonymous()
- // .antMatchers("/common/uploadFile2Cos").anonymous()
-// .antMatchers("/wecom/material/temporaryMaterialMediaId").anonymous()
- .antMatchers("/wecom/portrait/**").anonymous()
- .antMatchers("/wecom/fission/poster", "/wecom/fission/*/progress/*", "/wecom/reward/getRewardByFissionId/**").anonymous()
- // 获取实际群活码和社群运营H5页面不需要登录
- .antMatchers("/wecom/groupCode/getActualCode/**").anonymous()
- .antMatchers("/wecom/community/h5/**").anonymous()
- //微信授权接口
- .antMatchers("/weixin/auth/**").anonymous()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated()
@@ -141,6 +126,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
// 添加CORS filter
httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
+
+ String join = StringUtils.join(ruoYiConfig.getAnonUrl(), ",");
}
@@ -159,4 +146,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());
}
+
+
}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/config/WebMvcConfig.java b/linkwe-framework/src/main/java/com/linkwechat/framework/config/WebMvcConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a4b3c9ad05bebda52ae3e6fa45b6684eefd0a7d
--- /dev/null
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/config/WebMvcConfig.java
@@ -0,0 +1,23 @@
+package com.linkwechat.framework.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * @description:
+ * @author: HaoN
+ * @create: 2021-06-01 17:07
+ **/
+@Configuration
+public class WebMvcConfig extends WebMvcConfigurerAdapter {
+
+ @Override
+ public void addCorsMappings(CorsRegistry registry) {
+ registry.addMapping("/**")
+ .allowedOrigins("*")
+ .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")
+ .maxAge(3600)
+ .allowCredentials(true);
+ }
+}
\ No newline at end of file
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/listener/ChatMsgCheckListener.java b/linkwe-framework/src/main/java/com/linkwechat/framework/listener/ChatMsgCheckListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..6595a89b13f3dc2ac425423d16851f1ca7135300
--- /dev/null
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/listener/ChatMsgCheckListener.java
@@ -0,0 +1,27 @@
+package com.linkwechat.framework.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author danmo
+ * @description 会话存档会话审核订阅者
+ * @date 2021/7/27 23:11
+ **/
+@Slf4j
+@Component
+public class ChatMsgCheckListener implements MessageListener {
+
+ @Override
+ public void onMessage(Message message, byte[] pattern) {
+
+ log.info(">> 订阅消息,会话审核订阅者：{}", message);
+ String body = new String(message.getBody());
+ //渠道名称
+ String topic = new String(pattern);
+ System.out.println(body);
+ System.out.println(topic);
+ }
+}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/listener/ChatMsgListener.java b/linkwe-framework/src/main/java/com/linkwechat/framework/listener/ChatMsgListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..de791a4a4943450335d716694f3531c5752689ab
--- /dev/null
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/listener/ChatMsgListener.java
@@ -0,0 +1,73 @@
+package com.linkwechat.framework.listener;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.linkwechat.common.utils.StringUtils;
+import com.linkwechat.common.utils.Threads;
+import com.linkwechat.wecom.domain.WeChatContactMsg;
+import com.linkwechat.wecom.service.IWeChatContactMsgService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.concurrent.Future;
+
+/**
+ * @author danmo
+ * @description 会话存档订阅者
+ * @date 2021/7/27 23:11
+ **/
+@Slf4j
+@Component
+public class ChatMsgListener implements MessageListener {
+
+ @Autowired
+ private IWeChatContactMsgService weChatContactMsgService;
+
+ @Override
+ public void onMessage(Message message, byte[] pattern) {
+ JSONObject jsonObject = JSONObject.parseObject(new String(message.getBody()));
+ log.info(">> 订阅消息,会话存档消息：{}", jsonObject.toJSONString());
+
+ Threads.SINGLE_THREAD_POOL.submit(() -> msgContextHandle(jsonObject));
+ }
+
+
+ private void msgContextHandle(JSONObject jsonObject){
+ WeChatContactMsg weChatContactMsg = new WeChatContactMsg();
+ weChatContactMsg.setMsgId(jsonObject.getString("msgid"));
+ weChatContactMsg.setFromId(jsonObject.getString("from"));
+ weChatContactMsg.setToList(CollectionUtil.join(jsonObject.getJSONArray("tolist"), ","));
+ weChatContactMsg.setAction(jsonObject.getString("action"));
+ weChatContactMsg.setRoomId(jsonObject.getString("roomid"));
+ weChatContactMsg.setMsgType(jsonObject.getString("msgtype"));
+ weChatContactMsg.setMsgTime(new Date(jsonObject.getLong("msgtime")));
+ weChatContactMsg.setSeq(jsonObject.getLong("seq"));
+ String objectString = jsonObject.getString(jsonObject.getString("msgtype"));
+ if(StringUtils.isNotEmpty(objectString)){
+ weChatContactMsg.setContact(objectString);
+ }else if("external_redpacket".equals(weChatContactMsg.getMsgType())){
+ weChatContactMsg.setContact(jsonObject.getString("redpacket"));
+ }else if("docmsg".equals(weChatContactMsg.getMsgType())){
+ weChatContactMsg.setContact(jsonObject.getString("doc"));
+ }else if("markdown".equals(weChatContactMsg.getMsgType())
+ || "news".equals(weChatContactMsg.getMsgType())){
+ weChatContactMsg.setContact(jsonObject.getString("info"));
+ }
+ if(!weChatContactMsg.getMsgId().contains("external")){
+ weChatContactMsg.setIsExternal(1);
+ }
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper()
+ .eq(WeChatContactMsg::getMsgId, weChatContactMsg.getMsgId())
+ .eq(WeChatContactMsg::getFromId, weChatContactMsg.getFromId());
+ if(!weChatContactMsgService.update(weChatContactMsg,wrapper)){
+ weChatContactMsgService.save(weChatContactMsg);
+ }
+ }
+}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/security/filter/JwtAuthenticationTokenFilter.java b/linkwe-framework/src/main/java/com/linkwechat/framework/security/filter/JwtAuthenticationTokenFilter.java
index cb0c13d7b19b9924c7a3b75e5b83c96b51d1e301..a927f84a9048d6b6a212f589653f41f4d5ca067b 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/security/filter/JwtAuthenticationTokenFilter.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/security/filter/JwtAuthenticationTokenFilter.java
@@ -1,6 +1,7 @@
package com.linkwechat.framework.security.filter;
import java.io.IOException;
+import java.util.Enumeration;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -33,6 +34,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
throws ServletException, IOException
{
LoginUser loginUser = tokenService.getLoginUser(request);
+
if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
{
tokenService.verifyToken(loginUser);
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/web/domain/server/SysFile.java b/linkwe-framework/src/main/java/com/linkwechat/framework/web/domain/server/SysFile.java
index 067c1cb717e9b7496df0a6419b2bba148ade3082..642eee405fdb1114a9f26997b0affc4d71ef3430 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/web/domain/server/SysFile.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/web/domain/server/SysFile.java
@@ -1,10 +1,19 @@
package com.linkwechat.framework.web.domain.server;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
/**
* 系统文件相关信息
*
* @author ruoyi
*/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class SysFile
{
/**
@@ -42,73 +51,17 @@ public class SysFile
*/
private double usage;
- public String getDirName()
- {
- return dirName;
- }
-
- public void setDirName(String dirName)
- {
- this.dirName = dirName;
- }
-
- public String getSysTypeName()
- {
- return sysTypeName;
- }
-
- public void setSysTypeName(String sysTypeName)
- {
- this.sysTypeName = sysTypeName;
- }
-
- public String getTypeName()
- {
- return typeName;
- }
-
- public void setTypeName(String typeName)
- {
- this.typeName = typeName;
- }
-
- public String getTotal()
- {
- return total;
- }
- public void setTotal(String total)
- {
- this.total = total;
- }
-
- public String getFree()
- {
- return free;
- }
-
- public void setFree(String free)
- {
- this.free = free;
- }
+ /**
+ * 文件名
+ */
+ private String fileName;
- public String getUsed()
- {
- return used;
- }
- public void setUsed(String used)
- {
- this.used = used;
- }
+ /**
+ * 文件前缀
+ */
+ private String imgUrlPrefix;
- public double getUsage()
- {
- return usage;
- }
- public void setUsage(double usage)
- {
- this.usage = usage;
- }
}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/FileService.java b/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/FileService.java
new file mode 100644
index 0000000000000000000000000000000000000000..1bbcb5be27286dd4bebe4b7f289e1b49c34f53d5
--- /dev/null
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/FileService.java
@@ -0,0 +1,101 @@
+package com.linkwechat.framework.web.service;
+
+
+import com.linkwechat.common.annotation.Log;
+import com.linkwechat.common.config.RuoYiConfig;
+import com.linkwechat.common.utils.OsUtils;
+import com.linkwechat.common.utils.file.FileUploadUtils;
+import com.linkwechat.common.utils.file.FileUtils;
+import com.linkwechat.common.utils.file.MimeTypeUtils;
+import com.linkwechat.framework.web.domain.server.SysFile;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+
+
+/**
+ * 文件服务
+ */
+@Component
+@Slf4j
+public class FileService {
+
+
+ @Autowired
+ private RuoYiConfig ruoYiConfig;
+
+
+ private static final String WINDOWSFILEPATH="D:/linkWeChat/uploadPath";
+
+
+ private static final String LINUXFILEPATH="/linkWeChat/uploadPath";
+
+
+
+ /**
+ * 文件上传
+ * @param file
+ * @return
+ * @throws IOException
+ */
+ public SysFile upload(MultipartFile file) throws Exception {
+
+ try {
+ FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ String fileName="";
+ String imgUrlPrefix="";
+ if(ruoYiConfig.getFile().isStartCosUpload()){//开启云上传
+ //开启云上传开关则云上传，不然上传本地
+ fileName = FileUploadUtils.upload2Cos(file, ruoYiConfig.getFile().getCos());
+ imgUrlPrefix = ruoYiConfig.getFile().getCos().getCosImgUrlPrefix();
+ }else {//本地上传
+ File osFile=OsUtils.isWindows()?new File(WINDOWSFILEPATH):new File(LINUXFILEPATH);
+ if(!osFile.exists()){
+ osFile.mkdirs();
+ }
+ fileName = FileUploadUtils.upload(osFile.getPath(), file);
+ imgUrlPrefix = ruoYiConfig.getFile().getImgUrlPrefix();
+ }
+ return SysFile.builder()
+ .fileName(fileName)
+ .imgUrlPrefix(imgUrlPrefix)
+ .build();
+
+ }catch (Exception e){
+
+ throw e;
+
+ }
+
+ }
+
+
+ /**
+ * 获取图片(本地,或者网络图片)
+ * @param fileName
+ * @param rp
+ */
+ public void findImage(String fileName, HttpServletResponse rp){
+ try {
+ String fileDownUrl="";
+ rp.setContentType("image/png");
+ if(ruoYiConfig.getFile().isStartCosUpload()) {//开启云上传
+ fileDownUrl= ruoYiConfig.getFile().getCos().getCosImgUrlPrefix();
+ FileUtils.downloadFile(fileDownUrl+fileName,rp.getOutputStream());
+ }else{
+ fileDownUrl=OsUtils.isWindows()?WINDOWSFILEPATH+"/"+fileName:LINUXFILEPATH+"/"+fileName;
+ FileUtils.writeBytes(fileDownUrl,rp.getOutputStream());
+ }
+ }catch (Exception e){
+ log.error("图片获取异常:"+e.getMessage());
+
+ }
+ }
+
+
+}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/TokenService.java b/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/TokenService.java
index 18833e7b7118ed963da0d25f5bf8c7b9f2213324..7972c0cf2918d05b96c99da03dbb35cf046f4b9f 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/TokenService.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/TokenService.java
@@ -1,10 +1,13 @@
package com.linkwechat.framework.web.service;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
+
+import com.linkwechat.common.config.RuoYiConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -41,6 +44,9 @@ public class TokenService
@Value("${token.expireTime}")
private int expireTime;
+ @Autowired
+ private RuoYiConfig ruoYiConfig;
+
protected static final long MILLIS_SECOND = 1000;
protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
@@ -208,11 +214,19 @@ public class TokenService
*/
private String getToken(HttpServletRequest request)
{
- String token = request.getHeader(header);
- if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
- {
- token = token.replace(Constants.TOKEN_PREFIX, "");
+ String token = "";
+ //移除匿名接口中请求头的token
+ if(!Arrays.asList(ruoYiConfig.getAnonUrl()).contains(request.getRequestURI())){
+// request.removeAttribute(header);
+// request.
+ token = request.getHeader(header);
+ if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
+ {
+ token = token.replace(Constants.TOKEN_PREFIX, "");
+ }
}
+
+
return token;
}
diff --git a/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/UserDetailsServiceImpl.java b/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/UserDetailsServiceImpl.java
index 95bc8d7ee83eb0f1acaa292e40f2224957d25167..213666103c26c6cd34675eebbc0a74bac3b801e3 100644
--- a/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/UserDetailsServiceImpl.java
+++ b/linkwe-framework/src/main/java/com/linkwechat/framework/web/service/UserDetailsServiceImpl.java
@@ -1,18 +1,22 @@
package com.linkwechat.framework.web.service;
import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.linkwechat.common.config.RuoYiConfig;
import com.linkwechat.common.constant.Constants;
+import com.linkwechat.common.constant.WeConstans;
import com.linkwechat.common.core.domain.entity.SysRole;
import com.linkwechat.common.core.domain.entity.SysUser;
+import com.linkwechat.common.core.domain.entity.WeCorpAccount;
import com.linkwechat.common.core.domain.model.LoginUser;
import com.linkwechat.common.enums.UserStatus;
import com.linkwechat.common.exception.BaseException;
import com.linkwechat.common.utils.SecurityUtils;
import com.linkwechat.common.utils.StringUtils;
-import com.linkwechat.system.mapper.SysRoleMapper;
+import com.linkwechat.system.service.ISysRoleService;
import com.linkwechat.system.service.ISysUserService;
-import com.linkwechat.common.core.domain.entity.WeCorpAccount;
+import com.linkwechat.wecom.domain.WeUser;
import com.linkwechat.wecom.service.IWeCorpAccountService;
import com.linkwechat.wecom.service.IWeUserService;
import org.slf4j.Logger;
@@ -23,6 +27,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -41,19 +46,24 @@ public class UserDetailsServiceImpl implements UserDetailsService
@Autowired
private SysPermissionService permissionService;
+
@Autowired
- private IWeUserService iWeUserService;
+ private IWeCorpAccountService iWeCorpAccountService;
@Autowired
- private RuoYiConfig ruoYiConfig;
+ private ISysRoleService iSysRoleService;
+
@Autowired
- private SysRoleMapper roleMapper;
+ private RuoYiConfig ruoYiConfig;
@Autowired
- private IWeCorpAccountService iWeCorpAccountService;
+ private IWeUserService iWeUserService;
+
+
+
@Override
@@ -62,50 +72,55 @@ public class UserDetailsServiceImpl implements UserDetailsService
SysUser user = userService.selectUserByUserName(username);
if (StringUtils.isNull(user))
{
-// //企业管理登录
-// //查询企业管理相关账号
-// WeCorpAccount weCorpByAccount = iWeCorpAccountService.findWeCorpByAccount(username);
-// if(null != weCorpByAccount){
-// //注册到we_user表中
-// user=SysUser.builder()
-// .userName(weCorpByAccount.getCropAccount())
-// .nickName(weCorpByAccount.getCompanyName())
-// .userType(Constants.USER_TYOE_CORP_ADMIN)
-// .roleIds(ArrayUtil.toArray(roleMapper.selectRoleList(SysRole.builder()
-// .roleKey(Constants.DEFAULT_WECOME_CORP_ADMIN)
-// .build()).stream().map(SysRole::getRoleId).collect(Collectors.toList()), Long.class))
-// .password(SecurityUtils.encryptPassword(ruoYiConfig.getWeUserDefaultPwd()))
-// .build();
-// }
-
-// else{
-//
-// //we_user表中去查询，如果该表为空则提示用户不存在，如果不为空，则将用户记录注册到系统用户表中
-// WeUser weUser
-// = iWeUserService.getById(username);
-// if(null == weUser){
-// log.info("登录用户：{} 不存在.", username);
-// throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
-// }
-//
-// //注册到we_user表中
-// user=SysUser.builder()
-// .userName(weUser.getUserId())
-// .nickName(weUser.getName())
-// .userType(Constants.USER_TYPE_WECOME)
-// .email(weUser.getEmail())
-// .phonenumber(weUser.getMobile())
-// .sex(weUser.getGender() ==0 ? "1": weUser.getGender() .toString())
-// .avatar(weUser.getAvatarMediaid())
-// .roleIds(ArrayUtil.toArray(roleMapper.selectRoleList(SysRole.builder()
-// .roleKey(Constants.DEFAULT_WECOME_ROLE_KEY)
-// .build()).stream().map(SysRole::getRoleId).collect(Collectors.toList()), Long.class))
-// .password(SecurityUtils.encryptPassword(ruoYiConfig.getWeUserDefaultPwd()))
-// .build();
-// }
- userService.insertUser(
- user
- );
+
+ //查询企业管理相关账号
+ WeCorpAccount weCorpByAccount = iWeCorpAccountService.getOne(new LambdaQueryWrapper().eq(WeCorpAccount::getCorpAccount, username)
+ .eq(WeCorpAccount::getDelFlag, Constants.NORMAL_CODE));
+ if(null != weCorpByAccount){
+ //注册到we_user表中
+ user=SysUser.builder()
+ .userName(weCorpByAccount.getCorpAccount())
+ .nickName(weCorpByAccount.getCompanyName())
+ .userType(Constants.USER_TYOE_CORP_ADMIN)
+ .roleIds(ArrayUtil.toArray(iSysRoleService.selectRoleList(SysRole.builder()
+ .roleKey(Constants.DEFAULT_WECOME_CORP_ADMIN)
+ .build()).stream().map(SysRole::getRoleId).collect(Collectors.toList()), Long.class))
+ .password(SecurityUtils.encryptPassword(ruoYiConfig.getWeUserDefaultPwd()))
+ .build();
+ } else{
+ //we_user表中去查询，如果该表为空则提示用户不存在，如果不为空，则将用户记录注册到系统用户表中
+ WeUser weUser=iWeUserService.getOne(new LambdaQueryWrapper()
+ .eq(WeUser::getMobile,username)
+ .ne(WeUser::getIsActivate,new Integer(6)));
+ if(null == weUser){
+ throw new BaseException("对不起，您的账号：" + username + " 不存在");
+ }
+ if(StrUtil.isBlank(weUser.getMobile())){
+ throw new BaseException("请填写当前企业员工的手机号：" + username + " 然后再登录");
+ }
+ //注册到we_user表中
+ user=SysUser.builder()
+ .userName(username)
+ .nickName(weUser.getName())
+ .userType(Constants.USER_TYPE_WECOME)
+ .email(weUser.getEmail())
+ .phonenumber(weUser.getMobile())
+ .sex(weUser.getGender() ==0 ? "1": weUser.getGender() .toString())
+ .avatar(weUser.getAvatarMediaid())
+ .weUserId(weUser.getUserId())
+ .roleIds(ArrayUtil.toArray(iSysRoleService.selectRoleList(SysRole.builder()
+ .roleKey(Constants.DEFAULT_WECOME_ROLE_KEY)
+ .build()).stream().map(SysRole::getRoleId).collect(Collectors.toList()), Long.class))
+ .password(SecurityUtils.encryptPassword(ruoYiConfig.getWeUserDefaultPwd()))
+ .build();
+
+ }
+
+ if(user != null){
+ userService.insertUser(
+ user
+ );
+ }
}
else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
@@ -118,12 +133,14 @@ public class UserDetailsServiceImpl implements UserDetailsService
throw new BaseException("对不起，您的账号：" + username + " 已停用");
}
+
//当前登录用户为企业管理，设置corpId和密钥相关
-// if(user.getUserType().equals(Constants.USER_TYOE_CORP_ADMIN)){
-// user.setWeCorpAccount(
-// iWeCorpAccountService.findWeCorpByAccount(username)
-// );
-// }
+ if(Constants.USER_TYOE_CORP_ADMIN.equals(user.getUserType())){
+ user.setWeCorpAccount(
+ iWeCorpAccountService.getOne(new LambdaQueryWrapper().eq(WeCorpAccount::getCorpAccount, username)
+ .eq(WeCorpAccount::getDelFlag, Constants.NORMAL_CODE))
+ );
+ }
return createLoginUser(user);
diff --git a/linkwe-generator/src/main/resources/generator.yml b/linkwe-generator/src/main/resources/generator.yml
index 5bd3dd67b84fc8de893ebad2946f90ba41d27154..e88aedba6a3a5f3e50e60506e0da41dcbae7d70a 100644
--- a/linkwe-generator/src/main/resources/generator.yml
+++ b/linkwe-generator/src/main/resources/generator.yml
@@ -3,7 +3,7 @@ gen:
# 作者
author: ruoyi
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
- packageName: com.ruoyi.system
+ packageName: com.linkwechat
# 自动去除表前缀，默认是false
autoRemovePre: false
# 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
diff --git a/linkwe-generator/src/main/resources/vm/java/controller.java.vm b/linkwe-generator/src/main/resources/vm/java/controller.java.vm
index 4e4309d346981ec9ccc103434d0dbf0b0945e5ed..aced3bd4adfb9186131654a1f358f9608850c062 100644
--- a/linkwe-generator/src/main/resources/vm/java/controller.java.vm
+++ b/linkwe-generator/src/main/resources/vm/java/controller.java.vm
@@ -1,4 +1,4 @@
-package ${packageName}.controller;
+package ${packageName}.web.controller.wecom;
import java.util.List;
import java.util.Arrays;
diff --git a/linkwe-generator/src/main/resources/vm/java/domain.java.vm b/linkwe-generator/src/main/resources/vm/java/domain.java.vm
index 028b1eafecd828bc3a9480a5b45a455f8f85d842..41df89801e94d754a119fed5059b6b1e6522929c 100644
--- a/linkwe-generator/src/main/resources/vm/java/domain.java.vm
+++ b/linkwe-generator/src/main/resources/vm/java/domain.java.vm
@@ -1,4 +1,4 @@
-package ${packageName}.domain;
+package ${packageName}.wecom.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
diff --git a/linkwe-generator/src/main/resources/vm/java/mapper.java.vm b/linkwe-generator/src/main/resources/vm/java/mapper.java.vm
index bba2b15f7563da424244bd3b7ee0fe78ad089e24..91c0661c234f3b3fbb5f9b9b0222eb0d648c6bc9 100644
--- a/linkwe-generator/src/main/resources/vm/java/mapper.java.vm
+++ b/linkwe-generator/src/main/resources/vm/java/mapper.java.vm
@@ -1,4 +1,4 @@
-package ${packageName}.mapper;
+package ${packageName}.wecom.mapper;
import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/linkwe-generator/src/main/resources/vm/java/service.java.vm b/linkwe-generator/src/main/resources/vm/java/service.java.vm
index 97fe2d5c3fd84eb760a40894a0f92fd14e3a8e45..a55b6cccb4224ff6bb7d4303242c6e36f6409880 100644
--- a/linkwe-generator/src/main/resources/vm/java/service.java.vm
+++ b/linkwe-generator/src/main/resources/vm/java/service.java.vm
@@ -1,4 +1,4 @@
-package ${packageName}.service;
+package ${packageName}.wecom.service;
import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/linkwe-generator/src/main/resources/vm/java/serviceImpl.java.vm b/linkwe-generator/src/main/resources/vm/java/serviceImpl.java.vm
index f149763435c70d3b5e052b31926dcff411f53053..a2dbf84526afcf441482ff34e76cba15ca23b78c 100644
--- a/linkwe-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/linkwe-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -1,4 +1,4 @@
-package ${packageName}.service.impl;
+package ${packageName}.wecom.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/linkwe-generator/src/main/resources/vm/java/sub-domain.java.vm b/linkwe-generator/src/main/resources/vm/java/sub-domain.java.vm
index a3f53ebab9896cd40de0fd40d80153c3d2ba812e..e35cae25c5f0e5a332eaa8598db26c5f05d809a8 100644
--- a/linkwe-generator/src/main/resources/vm/java/sub-domain.java.vm
+++ b/linkwe-generator/src/main/resources/vm/java/sub-domain.java.vm
@@ -1,4 +1,4 @@
-package ${packageName}.domain;
+package ${packageName}.wecom.domain;
#foreach ($import in $subImportList)
import ${import};
diff --git a/linkwe-generator/src/main/resources/vm/xml/mapper.xml.vm b/linkwe-generator/src/main/resources/vm/xml/mapper.xml.vm
index c1064fe12526fac0f7dace72e7f6dc4d3e755798..074ae0ab5b468847477118c8cb91d943227e037c 100644
--- a/linkwe-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/linkwe-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -2,7 +2,7 @@
-
+
#foreach ($column in $columns)
diff --git a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/ConversationArchiveTask.java b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/ConversationArchiveTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..1f2784627e6a32d58c30caa207d5c28b705054d0
--- /dev/null
+++ b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/ConversationArchiveTask.java
@@ -0,0 +1,52 @@
+package com.linkwechat.quartz.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.linkwechat.common.constant.WeConstans;
+import com.linkwechat.common.core.domain.entity.WeCorpAccount;
+import com.linkwechat.common.core.redis.RedisCache;
+import com.linkwechat.common.utils.StringUtils;
+import com.linkwechat.wecom.domain.WeChatContactMsg;
+import com.linkwechat.wecom.service.IWeChatContactMsgService;
+import com.linkwechat.wecom.service.IWeCorpAccountService;
+import com.tencent.wework.FinanceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author danmo
+ * @description 会话存档定时任务
+ * @date 2021/7/26 15:50
+ **/
+
+@Slf4j
+@Component("conversationArchiveTask")
+public class ConversationArchiveTask {
+
+ @Autowired
+ private RedisCache redisCache;
+
+ @Autowired
+ private IWeCorpAccountService weCorpAccountService;
+
+ @Autowired
+ private IWeChatContactMsgService weChatContactMsgService;
+
+ public void FinanceTask(){
+ log.info("会话存档定时任务执行----------------->");
+ Long seqLong = 0L;
+ WeCorpAccount corpAccount = weCorpAccountService.findValidWeCorpAccount();
+ if(corpAccount == null){
+ log.info("无有效企业----------------->");
+ return;
+ }
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper().orderByDesc(WeChatContactMsg::getSeq).last("limit 1");
+ WeChatContactMsg weChatContactMsg = weChatContactMsgService.getOne(wrapper);
+ if(weChatContactMsg != null){
+ seqLong = weChatContactMsg.getSeq();
+ }
+ FinanceService financeService = new FinanceService(corpAccount.getCorpId(),corpAccount.getChatSecret(),corpAccount.getFinancePrivateKey());
+ financeService.getChatData(seqLong,(data) -> redisCache.convertAndSend(WeConstans.CONVERSATION_MSG_CHANNEL,data));
+ log.info("会话存档定时任务执行完成----------------->");
+ }
+}
diff --git a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/CustomerPortraitTask.java b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/CustomerPortraitTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..ecbd3fe9e400a538e01d056a2171d79e14a91a92
--- /dev/null
+++ b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/CustomerPortraitTask.java
@@ -0,0 +1,16 @@
+package com.linkwechat.quartz.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description: 客户画像
+ * @author: HaoN
+ * @create: 2021-05-02 21:08
+ **/
+@Slf4j
+@Component("customerPortraitTask")
+public class CustomerPortraitTask {
+
+
+}
diff --git a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/GroupChatStatisticTask.java b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/GroupChatStatisticTask.java
index faa18529c4424c80834fabe8a82c78a2f39614b3..79fa170a7dd33b3caf8e5941ab78b82ec86cf97f 100644
--- a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/GroupChatStatisticTask.java
+++ b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/GroupChatStatisticTask.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
/**
- * @author sxw
+ * @author danmo
* @description 群聊数据统计
* @date 2021/2/24 0:42
**/
diff --git a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/GroupMessageTask.java b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/GroupMessageTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..70607d509c21cc63786ef3fc31577efcea19ed14
--- /dev/null
+++ b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/GroupMessageTask.java
@@ -0,0 +1,58 @@
+package com.linkwechat.quartz.task;
+
+import com.linkwechat.common.constant.WeConstans;
+import com.linkwechat.wecom.domain.WeCustomerMessageTimeTask;
+import com.linkwechat.wecom.mapper.WeCustomerMessageTimeTaskMapper;
+import com.linkwechat.wecom.service.IWeCustomerMessageService;
+import com.linkwechat.wecom.service.IWeCustomerService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author danmo
+ * @description 消息群发任务
+ * @date 2021/7/15 22:59
+ **/
+@Slf4j
+@Component("groupMessageTask")
+public class GroupMessageTask {
+ @Autowired
+ private WeCustomerMessageTimeTaskMapper customerMessageTimeTaskMapper;
+
+ @Autowired
+ private IWeCustomerMessageService weCustomerMessageService;
+
+ /**
+ * 扫描群发消息定时任务
+ */
+ public void messageTask() {
+ //获的当前时间的毫秒数
+ long currentTime = System.currentTimeMillis();
+ //customerMessageTimeTaskMapper
+ List weCustomerMessageTimeTasks = customerMessageTimeTaskMapper.selectWeCustomerMessageTimeTaskGteSettingTime(currentTime);
+
+ if (CollectionUtils.isNotEmpty(weCustomerMessageTimeTasks)) {
+ weCustomerMessageTimeTasks.forEach(
+ s -> {
+ try {
+ if (s.getMessageInfo() != null && s.getMessageId() != null || (s.getMessageInfo().getPushType().equals(WeConstans.SEND_MESSAGE_CUSTOMER)
+ && CollectionUtils.isNotEmpty(s.getCustomersInfo())) || (s.getMessageInfo().getPushType().equals(WeConstans.SEND_MESSAGE_GROUP)
+ && CollectionUtils.isNotEmpty(s.getGroupsInfo()))) {
+ weCustomerMessageService.sendMessgae(s.getMessageInfo(), s.getMessageId(), s.getCustomersInfo(), s.getGroupsInfo());
+ //更新消息处理状态
+ customerMessageTimeTaskMapper.updateTaskSolvedById(s.getTaskId());
+ }
+ } catch (Exception e) {
+ log.error("定时群发消息处理异常：ex:{}", e);
+ e.printStackTrace();
+ }
+ }
+ );
+ }
+
+ }
+}
diff --git a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/RyTask.java b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/RyTask.java
index 8577f516962cd2689f48abd353387aed139a3f07..7c58114659be7ce3aa226cafb99171e93c32442e 100644
--- a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/RyTask.java
+++ b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/RyTask.java
@@ -1,33 +1,9 @@
package com.linkwechat.quartz.task;
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.linkwechat.common.constant.WeConstans;
-import com.linkwechat.common.core.elasticsearch.ElasticSearch;
-import com.linkwechat.common.core.redis.RedisCache;
import com.linkwechat.common.utils.StringUtils;
-import com.linkwechat.wecom.domain.WeCustomer;
-import com.linkwechat.wecom.domain.WeCustomerMessageTimeTask;
-import com.linkwechat.wecom.mapper.WeCustomerMessageTimeTaskMapper;
-import com.linkwechat.wecom.service.*;
-import com.tencent.wework.FinanceUtils;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* 定时任务调度测试
*
@@ -36,27 +12,6 @@ import java.util.concurrent.atomic.AtomicLong;
@Slf4j
@Component("ryTask")
public class RyTask {
- @Autowired
- private ElasticSearch elasticSearch;
- @Autowired
- private RedisCache redisCache;
- @Autowired
- private IWeChatContactMappingService weChatContactMappingService;
- @Autowired
- private IWeSensitiveService weSensitiveService;
- @Autowired
- private IWeSensitiveActHitService weSensitiveActHitService;
- @Autowired
- private IWeCustomerService weCustomerService;
- @Autowired
- private WeCustomerMessageTimeTaskMapper customerMessageTimeTaskMapper;
-
- @Autowired
- private IWeCustomerMessageService weCustomerMessageService;
-
- @Value("${wecome.chatKey}")
- private String chartKey;
-
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -69,108 +24,5 @@ public class RyTask {
public void ryNoParams() {
System.out.println("执行无参方法");
}
-
-
- public void FinanceTask(String corpId, String secret) throws IOException {
- log.info("执行有参方法: params:{},{}", corpId, secret);
- //创建索引
- elasticSearch.createIndex2(chartKey, elasticSearch.getFinanceMapping());
- //从缓存中获取消息标识
-
- Object seqObject = Optional.ofNullable(redisCache.getCacheObject(WeConstans.CONTACT_SEQ_KEY)).orElse(0L);
- Long seqLong = Long.valueOf(String.valueOf(seqObject));
- AtomicLong index = new AtomicLong(seqLong);
- if (index.get() == 0) {
- setRedisCacheSeqValue(index);
- }
-
- log.info(">>>>>>>seq:{}", index.get());
- FinanceUtils.initSDK(corpId, secret);
- List chatDataList = FinanceUtils.getChatData(index.get(),
- "",
- "", redisCache);
- if (CollectionUtil.isNotEmpty(chatDataList)) {
- try {
- List elasticSearchEntities = weChatContactMappingService.saveWeChatContactMapping(chatDataList);
- //获取敏感行为命中信息
- weSensitiveActHitService.hitWeSensitiveAct(chatDataList);
- elasticSearch.insertBatchAsync(chartKey, elasticSearchEntities, weSensitiveService::hitSensitive);
- } catch (Exception e) {
- log.error("消息处理异常：ex:{}", e);
- e.printStackTrace();
- }
- }
- }
-
- public void WeCustomers() {
- //查询系统所有客户
- List cacheList = redisCache.getCacheList(WeConstans.WECUSTOMERS_KEY);
- if (CollectionUtils.isEmpty(cacheList)) {
- List customers = weCustomerService.selectWeCustomerList(null);
- redisCache.setCacheList(WeConstans.WECUSTOMERS_KEY, customers);
- } else {
- List customers = weCustomerService.selectWeCustomerList(null);
- List weCustomers = redisCache.getCacheList(WeConstans.WECUSTOMERS_KEY);
- if (CollectionUtils.isNotEmpty(weCustomers) && weCustomers.size() < customers.size()) {
- redisCache.setCacheList(WeConstans.WECUSTOMERS_KEY, customers);
- }
- }
- }
-
- private void setRedisCacheSeqValue(AtomicLong index) {
- SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
- SortBuilder sortBuilderPrice = SortBuilders.fieldSort(WeConstans.CONTACT_SEQ_KEY).order(SortOrder.DESC);
- searchSourceBuilder.sort(sortBuilderPrice);
- searchSourceBuilder.size(1);
- List searchResultList = elasticSearch.search(chartKey, searchSourceBuilder, JSONObject.class);
- searchResultList.stream().findFirst().ifPresent(result -> {
- index.set(result.getLong(WeConstans.CONTACT_SEQ_KEY) + 1);
- });
- redisCache.setCacheObject(WeConstans.CONTACT_SEQ_KEY, index);
- }
-
- /**
- * @param corpId 企业id
- * @param secret 会话密钥
- */
- public void getPermitUserList(String corpId, String secret) {
- log.info("执行有参方法: params:{},{}", corpId, secret);
-
- }
-
- /**
- * 扫描群发消息定时任务
- */
- public void messageTask() {
- //获的当前时间的毫秒数
- long currentTime = System.currentTimeMillis();
- //customerMessageTimeTaskMapper
- List weCustomerMessageTimeTasks = customerMessageTimeTaskMapper.selectWeCustomerMessageTimeTaskGteSettingTime(currentTime);
-
- final Semaphore semaphore = new Semaphore(5);
-
- if (CollectionUtils.isNotEmpty(weCustomerMessageTimeTasks)) {
-
- weCustomerMessageTimeTasks.forEach(
- s -> {
- try {
- semaphore.acquire();
- if (s.getMessageInfo() != null && s.getMessageId() != null || (s.getMessageInfo().getPushType().equals(WeConstans.SEND_MESSAGE_CUSTOMER)
- && CollectionUtils.isNotEmpty(s.getCustomersInfo())) || (s.getMessageInfo().getPushType().equals(WeConstans.SEND_MESSAGE_GROUP)
- && CollectionUtils.isNotEmpty(s.getGroupsInfo()))) {
- weCustomerMessageService.sendMessgae(s.getMessageInfo(), s.getMessageId(), s.getCustomersInfo(), s.getGroupsInfo());
- //更新消息处理状态
- customerMessageTimeTaskMapper.updateTaskSolvedById(s.getTaskId());
- }
- semaphore.release();
- } catch (JsonProcessingException | InterruptedException e) {
- log.error("定时群发消息处理异常：ex:{}", e);
- e.printStackTrace();
- }
- }
- );
- }
-
- }
-
}
+
diff --git a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/TaskFissionStatusTask.java b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/TaskFissionStatusTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..42f41623d2e766e84ef60468fb2cac8442a6ce1f
--- /dev/null
+++ b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/TaskFissionStatusTask.java
@@ -0,0 +1,25 @@
+package com.linkwechat.quartz.task;
+
+import com.linkwechat.wecom.service.IWeTaskFissionService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author danmo
+ * @description 任务状态处理
+ * @date 2021/4/12 14:39
+ **/
+@Slf4j
+@Component("TaskFissionStatusTask")
+public class TaskFissionStatusTask {
+ @Autowired
+ private IWeTaskFissionService weTaskFissionService;
+
+
+ public void taskFissionExpiredStatusHandle() {
+ log.info("任务宝过期时间处理--------------------------start");
+ weTaskFissionService.updateExpiredWeTaskFission();
+ log.info("任务宝过期时间处理--------------------------end");
+ }
+}
diff --git a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/UserBehaviorDataTak.java b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/UserBehaviorDataTak.java
index b2d718490206c17c6f6a0f17f1b456e68592e180..d5a3f28e1ec3d64ca507c2304d0e4106a78df296 100644
--- a/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/UserBehaviorDataTak.java
+++ b/linkwe-quartz/src/main/java/com/linkwechat/quartz/task/UserBehaviorDataTak.java
@@ -25,7 +25,7 @@ import java.util.Date;
import java.util.List;
/**
- * @author sxw
+ * @author danmo
* @description 联系客户统计
* @date 2021/2/24 0:41
**/
diff --git a/linkwe-system/src/main/java/com/linkwechat/system/service/impl/SysRoleServiceImpl.java b/linkwe-system/src/main/java/com/linkwechat/system/service/impl/SysRoleServiceImpl.java
index 272beaa9415d2325e079bee2eb9d8be42443129d..2ad7d7661ed8c290faa07fce97bf55dfe3894397 100644
--- a/linkwe-system/src/main/java/com/linkwechat/system/service/impl/SysRoleServiceImpl.java
+++ b/linkwe-system/src/main/java/com/linkwechat/system/service/impl/SysRoleServiceImpl.java
@@ -50,7 +50,7 @@ public class SysRoleServiceImpl implements ISysRoleService
* @return 角色数据集合信息
*/
@Override
- @DataScope(deptAlias = "d")
+// @DataScope(deptAlias = "d")
public List selectRoleList(SysRole role)
{
return roleMapper.selectRoleList(role);
diff --git a/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml b/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2ee08e38988ab22b8f964e79dbb96fdfd63e120b..bc140a50926e97c84a2572a77c0634baf6aaf591 100644
--- a/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/linkwe-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -46,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+ select u.user_id, u.we_user_id,u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,u.user_type,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -56,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
@@ -118,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_by,
remark,
user_type,
+ we_user_id,
create_time
)values(
#{userId},
@@ -133,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createBy},
#{remark},
#{userType},
+ #{weUserId},
sysdate()
)
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAccessTokenClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAccessTokenClient.java
index a563ffb143232c993a6f2a24a08e36cdbed306ea..1767241329314d59b7b5c237788f16834adf35a9 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAccessTokenClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAccessTokenClient.java
@@ -13,7 +13,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @author: HaoN
* @create: 2020-08-26 14:33
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeAccessTokenClient {
/**
* 获取token(常用token,联系人token)
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAppClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAppClient.java
index 6c5ff540ea212d832c4687ba352ffec461331616..515279ee9c0cf7712be8d36d6b6cfc15a7896cb9 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAppClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeAppClient.java
@@ -1,9 +1,6 @@
package com.linkwechat.wecom.client;
-import com.dtflys.forest.annotation.BaseRequest;
-import com.dtflys.forest.annotation.DataObject;
-import com.dtflys.forest.annotation.Query;
-import com.dtflys.forest.annotation.Request;
+import com.dtflys.forest.annotation.*;
import com.linkwechat.wecom.domain.dto.WeAppDetailDto;
import com.linkwechat.wecom.domain.dto.WeAppDto;
import com.linkwechat.wecom.domain.dto.WeResultDto;
@@ -12,7 +9,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
/**
* 应用管理相关接口
*/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeAppClient {
/**
@@ -35,6 +32,6 @@ public interface WeAppClient {
* @param weAppDetailDto
* @return
*/
- @Request(url = "/agent/set")
- WeResultDto updateAgentById(@DataObject WeAppDetailDto weAppDetailDto);
+ @Request(url = "/agent/set",type = "POST")
+ WeResultDto updateAgentById(@DataObject WeAppDetailDto weAppDetailDto,@Header("agentid")String agentid);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java
index 05700efb06a96f41f05768a0f830b3516ed7c68c..e323409d4a2ef1dc5e634de83eebb232541c4d0e 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java
@@ -13,7 +13,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @author: HaoN
* @create: 2020-10-17 11:00
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeCropTagClient {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerClient.java
index e4219c3295e706e5af4764322512de394139d9dc..3cdcc365aa6fcc0470d0fae7720bd216bea7f927 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerClient.java
@@ -15,7 +15,7 @@ import java.util.Map;
* @author: HaoN
* @create: 2020-09-15 14:15
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeCustomerClient {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java
index 963165aa74c62c30e24c9988f98fab2c37dd4aba..033b61996b506cf610bf2607b3bb589901dd3216 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java
@@ -13,7 +13,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @author: HaoN
* @create: 2020-10-20 21:50
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeCustomerGroupClient {
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java
index 9564f798f1ea7008d0beaad6a16ea0cab3d301a6..0c03781e8415d698f0dc26623d6ae428ef6bb0ba 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java
@@ -12,7 +12,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @author: KeWen
* @create: 2020-10-25 21:34
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeCustomerMessagePushClient {
@@ -27,7 +27,7 @@ public interface WeCustomerMessagePushClient {
/**
* 获取企业群发消息发送结果
- * API文档地址
+ * API文档地址
*
* @param queryCustomerMessageStatusResultDataObjectDto{msgid} 添加企业群发消息任务返回的msgid
*/
@@ -37,4 +37,7 @@ public interface WeCustomerMessagePushClient {
QueryCustomerMessageStatusResultDto queryCustomerMessageStatus(@Body QueryCustomerMessageStatusResultDataObjectDto queryCustomerMessageStatusResultDataObjectDto);
+
+
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeDepartMentClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeDepartMentClient.java
index c5da019196f9f0600c99b796780988a90ad263ea..a8d47ee97409d0e927a5fb4d56b5a25665a754d0 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeDepartMentClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeDepartMentClient.java
@@ -13,7 +13,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @author: HaoN
* @create: 2020-08-27 16:40
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeDepartMentClient {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeExternalContactClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeExternalContactClient.java
index 45b66b0102cbdbedaafcc3cdbba7828b2c0e5558..879634bb3d1366bc43e89387dfbc534a16069294 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeExternalContactClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeExternalContactClient.java
@@ -12,7 +12,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @author: HaoN
* @create: 2020-10-13 10:39
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeExternalContactClient {
@Request(url = "/externalcontact/add_contact_way",
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMediaClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMediaClient.java
index 8cafe75a22f05ce6908b0466b6149a8a1933e8c6..92fd474603c26eafc4ebc800b3a352081b868819 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMediaClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMediaClient.java
@@ -17,25 +17,15 @@ import java.io.InputStream;
* @Description:
* @Date: create in 2020/9/24 0024 0:14
*/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeMediaClient {
-
- /**
- * 上传临时素材
- * @param file
- * @param type
- * @return
- */
- @Post(url="/media/upload")
- WeMediaDto upload(@DataFile(value = "media") File file, @Query("type") String type);
-
/**
* 上传图片
* @param multipartFile
* @return
*/
@Post(url="/media/uploadimg")
- WeMediaDto uploadimg(@DataFile(value = "file") MultipartFile multipartFile);
+ WeMediaDto uploadimg(@DataFile(value = "fieldNameHere") MultipartFile multipartFile);
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMessagePushClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMessagePushClient.java
index 16ee17ed877c669b00f36e7983b23631d14af6c8..e2cd03574e5dd1c0d14787f8c0720fc9a7bdad5b 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMessagePushClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMessagePushClient.java
@@ -15,7 +15,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @create: 2020-10-17 22:41
**/
@SuppressWarnings("all")
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeMessagePushClient {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMsgAuditClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMsgAuditClient.java
index 6300c635592f81bd353b4c07abdace54b64b529f..4eb4649da4fd95f618d9acd672ce1c44d012205b 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMsgAuditClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeMsgAuditClient.java
@@ -13,7 +13,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @description 会话存档接口
* @date 2020/12/2 16:45
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeMsgAuditClient {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeTicketClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeTicketClient.java
index 2bd9346daf718e8de7ed05ea5d2e900b195cf0d7..7a4b68ec0967bacd54a0cabe8ea16f5c0b9add8c 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeTicketClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeTicketClient.java
@@ -11,7 +11,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @description h5获取签名
* @date 2021/1/6 11:51
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeTicketClient {
/**
* 获取去企业jsapi_ticket
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeUserClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeUserClient.java
index 1881de06f3e38cc8ff8ebcc7615d2f4faf03faed..45d16998354366f7108d89725d474b0d451cc12d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeUserClient.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeUserClient.java
@@ -9,7 +9,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor;
* @author: HaoN
* @create: 2020-08-27 16:42
**/
-@BaseRequest(interceptor = WeAccessTokenInterceptor.class)
+@BaseRequest(baseURL = "${weComServerUrl}${weComePrefix}", interceptor = WeAccessTokenInterceptor.class)
public interface WeUserClient {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCategory.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCategory.java
index 23439f2c4b136bb3a283e748a631222ae5b72d64..24ad50472b8a138e6400ecb87d5e050bd7534b23 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCategory.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCategory.java
@@ -1,27 +1,46 @@
package com.linkwechat.wecom.domain;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.linkwechat.common.core.domain.BaseEntity;
import com.linkwechat.common.utils.SnowFlakeUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
@Data
+@TableName("we_category")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("素材分类")
public class WeCategory extends BaseEntity {
- private Long id = SnowFlakeUtil.nextId();
- /**
- * 0 图片（image）、1 语音（voice）、2 视频（video），3 普通文件(file) 4 文本
- */
+ @TableId
+ @ApiModelProperty("素材主键")
+ private Long id;
+
+
+ @ApiModelProperty("素材分类：0 图片（image）、1 语音（voice）、2 视频（video），3 普通文件(file) 4 文本")
private String mediaType;
- /**
- * 分类名称
- */
+
+
+ @ApiModelProperty("分类名称")
private String name;
- /**
- * 父分类的id
- */
+
+
+ @ApiModelProperty("素材上级父节点id")
private Long parentId;
+
+
+ @ApiModelProperty("素材状态:0 未删除 2 已删除")
+ private String delFlag;
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatContactMsg.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatContactMsg.java
new file mode 100644
index 0000000000000000000000000000000000000000..dcca5912391b33458beb4162586b3d1bb8a33dd9
--- /dev/null
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatContactMsg.java
@@ -0,0 +1,96 @@
+package com.linkwechat.wecom.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.linkwechat.common.annotation.Excel;
+import com.linkwechat.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 会话消息对象 we_chat_contact_msg
+ *
+ * @author ruoyi
+ * @date 2021-07-28
+ */
+@ApiModel
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("we_chat_contact_msg")
+public class WeChatContactMsg extends BaseEntity implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+ /** 主键id */
+ @TableId(value = "id",type = IdType.AUTO)
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ /** 消息id */
+ @Excel(name = "消息id")
+ @ApiModelProperty("消息id")
+ private String msgId;
+
+ /** 消息记录seq值 */
+ @ApiModelProperty(value = "消息记录seq值",hidden = true)
+ private Long seq;
+
+ /** 发送人id */
+ @Excel(name = "发送人id")
+ @ApiModelProperty("发送人id")
+ private String fromId;
+
+ /** 接收人id（列表） */
+ @Excel(name = "接收人id" , readConverterExp = "列=表")
+ @ApiModelProperty("接收人id")
+ private String toList;
+
+ /** 群聊id */
+ @Excel(name = "群聊id")
+ @ApiModelProperty("群聊id")
+ private String roomId;
+
+ /** 消息类型 */
+ @Excel(name = "消息类型")
+ @ApiModelProperty("消息类型")
+ private String action;
+
+ /** 消息类型(如：文本，图片) */
+ @Excel(name = "消息类型(如：文本，图片)")
+ @ApiModelProperty("消息类型(如：文本，图片)")
+ private String msgType;
+
+ /** 发送时间 */
+ @Excel(name = "发送时间")
+ @ApiModelProperty("发送时间")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date msgTime;
+
+ /** 消息内容 */
+ @Excel(name = "消息内容")
+ @ApiModelProperty("消息内容")
+ private String contact;
+
+ /** 是否为外部聊天 0 外部 1 内部 */
+ @ApiModelProperty(value = "是否为外部聊天 0 外部 1 内部", hidden = true)
+ private Integer isExternal;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty("名称")
+ @TableField(exist = false)
+ private String name;
+
+}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCommunityNewGroup.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCommunityNewGroup.java
index 6288e13036d0e1e37b3bda147e9804f6a761b611..e3be4ffe13c87924dd7fb1cc63e24d969d595a95 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCommunityNewGroup.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCommunityNewGroup.java
@@ -1,6 +1,7 @@
package com.linkwechat.wecom.domain;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.linkwechat.common.core.domain.BaseEntity;
import com.linkwechat.common.utils.SnowFlakeUtil;
@@ -43,5 +44,6 @@ public class WeCommunityNewGroup extends BaseEntity {
/**
* 0 未删除 1 已删除
*/
- private int delFlag = 0;
+ @TableLogic
+ private int delFlag;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomer.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomer.java
index 760efe2266958faf3a62f629de9d31617d510193..8b1310f18bb3e481a06f00e638337ccfb4e405a7 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomer.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomer.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.linkwechat.common.annotation.Excel;
import com.linkwechat.common.core.domain.BaseEntity;
+import com.linkwechat.common.utils.SnowFlakeUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -34,6 +35,7 @@ public class WeCustomer extends BaseEntity {
private static final long serialVersionUID = 1L;
+
/**
* 外部联系人的userid
*/
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerPortrait.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerPortrait.java
index 6ef123107eb2a67556bb9f761f280206992fe756..6d8c7c4a379886ba97480d3e2800cbc8685f7ce3 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerPortrait.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerPortrait.java
@@ -1,5 +1,7 @@
package com.linkwechat.wecom.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import java.util.Date;
@@ -11,6 +13,7 @@ import java.util.List;
* @create: 2021-03-03 11:49
**/
@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class WeCustomerPortrait {
//外部联系人id
private String externalUserid;
@@ -20,11 +23,14 @@ public class WeCustomerPortrait {
private String flowerCustomerRelId;
//客户昵称
private String name;
+ //客户性别(0-未知 1-男性 2-女性)
+ private Integer gender;
//客户备注
private String remark;
//备注客户手机号
private String remarkMobiles;
//客户生日
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date birthday;
//邮箱
private String email;
@@ -40,6 +46,8 @@ public class WeCustomerPortrait {
private String description;
//年纪
private int age;
+ //客户头像
+ private String avatar;
//客户标签
private List weTagGroupList;
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerTrajectory.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerTrajectory.java
index db82ae47084a7f1c7277108a957bf787dc4f5022..dab7a9560c0d3d4f992810aabcd81861a77a9c3b 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerTrajectory.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomerTrajectory.java
@@ -36,6 +36,22 @@ public class WeCustomerTrajectory {
//处理结束时间
private Time endTime;
+
+
//0:正常;1:删除;2:完成
private String status;
+
+ //当前员工的id
+ private String userId;
+
+
+ //当前应用的id
+ private String agentId;
+
+
+ //创建时间
+ private Date createTime;
+
+
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerRel.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerRel.java
index a22f4807bd736859ba4d0176074f3bdcd05b5844..f680c79340f365acd12819dbdf6c4e5acb23f77d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerRel.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerRel.java
@@ -1,5 +1,6 @@
package com.linkwechat.wecom.domain;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -34,6 +35,7 @@ public class WeFlowerCustomerRel
/** 添加了此外部联系人的企业成员userid */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String userId;
/** 外部联系人名称 */
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerTagRel.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerTagRel.java
index 3fc58d8cd83df7b7eca9fcc68069572a4887756e..e3408824733235d38f6463abcd597adf59c33eca 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerTagRel.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeFlowerCustomerTagRel.java
@@ -36,6 +36,10 @@ public class WeFlowerCustomerTagRel
/** 添加客户的企业微信用户 */
private Long flowerCustomerRelId;
+
+ /**外部联系人id(客户id) */
+ private String externalUserid;
+
/** 标签id */
private String tagId;
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCode.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCode.java
index f0b35f53f6a8f3af63b3b47ffc10a48959dd16b5..eac25ad43653832c4928e4785e40c5e56d71f5c1 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCode.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCode.java
@@ -2,13 +2,17 @@ package com.linkwechat.wecom.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.linkwechat.common.core.domain.BaseEntity;
import com.linkwechat.common.utils.SnowFlakeUtil;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
import java.util.List;
@@ -33,59 +37,70 @@ public class WeGroupCode extends BaseEntity {
/**
* 活码URL
*/
+ @ApiModelProperty(value = "活码URL")
private String codeUrl;
- /**
- * 二维码的uuid
- */
- private String uuid;
-
/**
* 活码头像
*/
- private String activityHeadUrl;
+ @ApiModelProperty(value = "活码头像URL")
+ private String avatarUrl;
/**
* 活码名称
*/
- @NotNull(message = "活码名称不能为空")
+ @ApiModelProperty(value = "活码名称")
+ @Size(max = 60, message = "活码名称最大长度为60个字符")
+ @NotBlank(message = "活码名称不能为空")
private String activityName;
/**
* 活码描述
*/
- @NotNull(message = "活码描述不能为空")
+ @ApiModelProperty(value = "活码描述")
+ @Size(max = 60, message = "活码描述最大长度为60个字符")
private String activityDesc;
/**
* 场景
*/
+ @ApiModelProperty(value = "场景")
+ @Size(max = 60, message = "场景最大长度为60个字符")
+// @NotBlank(message = "场景不能为空")
private String activityScene;
/**
* 加群引导语
*/
+ @ApiModelProperty(value = "加群引导语")
+ @Size(max = 100, message = "加群引导语最大长度为60个字符")
private String guide;
/**
* 进群是否提示:1:是;0:否;
*/
- private Long joinGroupIsTip;
+ private Long showTip;
/**
* 进群提示语
*/
+ @ApiModelProperty(value = "进群提示语")
+ @Size(max = 100, message = "进群提示语最大长度为60个字符")
private String tipMsg;
/**
* 客服二维码
*/
+ @ApiModelProperty(value = "客服二维码")
+ @Size(max = 100, message = "客服二维码提示语最大长度为60个字符")
private String customerServerQrCode;
/**
- * 0:正常;2:删除;
+ * 0:正常; 1:删除;
*/
- private Long delFlag;
+ @JsonIgnore
+ @TableLogic(value = "0", delval = "1")
+ private Long delFlag = 0L;
/**
* 可用实际码数量
@@ -111,4 +126,11 @@ public class WeGroupCode extends BaseEntity {
@TableField(exist = false)
private List actualList;
+ /**
+ * 实际码id列表,用于前端绑定实际群活码
+ */
+ @JsonIgnore
+ @TableField(exist = false)
+ private List actualIdList;
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCodeActual.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCodeActual.java
index fc4aaa2ce64194e5454a2ca2b1711aa777585597..cc8482f99dcc81b5442e2ad47fdb2474f84dc77e 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCodeActual.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupCodeActual.java
@@ -5,10 +5,12 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.linkwechat.common.core.domain.BaseEntity;
import com.linkwechat.common.utils.SnowFlakeUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
@@ -19,10 +21,11 @@ import javax.validation.constraints.NotNull;
* @author ruoyi
* @date 2020-10-07
*/
+@EqualsAndHashCode(callSuper = true)
@ApiModel
@Data
@TableName("we_group_code_actual")
-public class WeGroupCodeActual
+public class WeGroupCodeActual extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupSop.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupSop.java
index 4c02b9498d0e2a97233c0432a69223fc35be6c2c..c7542eea1ce18349dc989e4ab2ca59fff7a86774 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupSop.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeGroupSop.java
@@ -2,6 +2,7 @@ package com.linkwechat.wecom.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.linkwechat.common.core.domain.BaseEntity;
import lombok.Data;
@@ -48,4 +49,10 @@ public class WeGroupSop extends BaseEntity {
@TableField(value = "end_time")
private String stopExeTime;
+ /**
+ * 逻辑删除字段
+ */
+ @TableLogic(value = "0", delval = "1")
+ private Integer delFlag;
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeKeywordGroupTask.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeKeywordGroupTask.java
index 4107b8de4217aed7366ffc5937df0c2a692b3847..14fde3a3713bf76bd506d519f73a0cd4fed85e00 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeKeywordGroupTask.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeKeywordGroupTask.java
@@ -1,10 +1,18 @@
package com.linkwechat.wecom.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.linkwechat.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import com.linkwechat.wecom.domain.vo.WeGroupCodeVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
/**
* 社区运营 - 关键词拉群任务实体
@@ -12,27 +20,66 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("we_keyword_group")
+@ApiModel("关键词拉群模型")
public class WeKeywordGroupTask extends BaseEntity {
/**
* 主键id
*/
+ @ApiModelProperty("id")
@TableId
private Long taskId;
/**
* 任务名称
*/
+ @ApiModelProperty(value = "任务名称", required = true)
+ @Size(max = 100, message = "任务名最大长度100")
+ @NotNull(message = "任务名不能为空")
private String taskName;
/**
* 群活码id
*/
+ @ApiModelProperty(value = "群活码id", required = true)
+ @NotNull(message = "群活码不能为空")
private Long groupCodeId;
-
/**
* 加群引导语
*/
+ @ApiModelProperty(value = "加群引导语", required = true)
+ @Size(max = 255, message = "引导语过长,最大长度255")
+ @NotNull(message = "引导语不可为空")
private String welcomeMsg;
+
+ /**
+ * 关键词
+ */
+ @ApiModelProperty(value = "关键词", required = true)
+ @Size(max = 255, message = "关键词长度过长。最大长度255")
+ @NotNull(message = "关键词不可为空")
+ private String keywords;
+
+ /**
+ * 逻辑删除
+ */
+ @ApiModelProperty(hidden = true)
+ @JsonIgnore
+ @TableLogic
+ private Integer delFlag;
+
+ /**
+ * 群活码信息
+ */
+ @ApiModelProperty(value = "群活码信息")
+ @TableField(exist = false)
+ private WeGroupCodeVo groupCodeInfo;
+
+ /**
+ * 实际群聊名称
+ */
+ @ApiModelProperty(value = "实际群聊名称字符串")
+ @TableField(exist = false)
+ private String groupNameList;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeKeywordGroupTaskKeyword.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeKeywordGroupTaskKeyword.java
deleted file mode 100644
index 5fd6c0c71ca324b826333aebd11e10af3e68da25..0000000000000000000000000000000000000000
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeKeywordGroupTaskKeyword.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.linkwechat.wecom.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.linkwechat.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 社区运营 - 关键词拉群任务关键词实体
- */
-@Data
-@NoArgsConstructor
-@TableName("we_keyword_group_kw")
-public class WeKeywordGroupTaskKeyword {
-
- /**
- * 关键词拉群任务id
- */
- private Long taskId;
-
- /**
- * 关键词
- */
- private String keyword;
-
- public WeKeywordGroupTaskKeyword(Long taskId, String keyword) {
- this.taskId =taskId;
- this.keyword = keyword;
- }
-}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WePresTagGroupTask.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WePresTagGroupTask.java
index 0e2c5d328c81ad933bc6d56dd9001b9e0699e254..9f12ad897b486fc08705bfcfc46aaf7af83de46a 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WePresTagGroupTask.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WePresTagGroupTask.java
@@ -2,6 +2,7 @@ package com.linkwechat.wecom.domain;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.linkwechat.common.core.domain.BaseEntity;
import com.linkwechat.common.utils.SnowFlakeUtil;
@@ -66,4 +67,9 @@ public class WePresTagGroupTask extends BaseEntity {
*/
private String msgid;
+ /**
+ * 逻辑删除字段
+ */
+ @TableLogic(value = "0", delval = "1")
+ private Integer delFlag;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTag.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTag.java
index ded0983674218463d130d7bf443d323a3a502a77..e1ecd7b0b8915844b5ec191dfb9e667e97962bfd 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTag.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTag.java
@@ -10,6 +10,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -23,7 +24,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@TableName("we_tag")
-public class WeTag
+public class WeTag implements Serializable
{
/** 标签组id */
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java
index 2a16d87a4f52c1e50ba5da1109d2c86ac59bf3a5..46b38e35e1c662e32972bd1882b3a7043e6c3946 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFission.java
@@ -59,16 +59,16 @@ public class WeTaskFission extends BaseEntity {
/**
* 活动开始时间
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "活动开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "活动开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "活动开始时间")
private Date startTime;
/**
* 活动结束时间
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "活动结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "活动结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "活动结束时间")
private Date overTime;
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFissionCompleteRecord.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFissionCompleteRecord.java
index 95c6da3b4230627c2e48f48cfae8dd3bddc5a5ce..b464d8aa84d3d0b5fd568bd88aa6122ea3952304 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFissionCompleteRecord.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeTaskFissionCompleteRecord.java
@@ -60,6 +60,12 @@ public class WeTaskFissionCompleteRecord {
@ApiModelProperty("创建时间")
private Date createTime = new Date();
+ @ApiModelProperty("状态 0 有效 1 无效")
+ private Integer status;
+
+ @ApiModelProperty("客户头像")
+ private String customerAvatar;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeUser.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeUser.java
index 879c0da73fee9b142be1ad2402a18c096e1f9a57..3482ec40fde2a0d58bdb7bc5ca32fcc455bc9496 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeUser.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeUser.java
@@ -34,7 +34,7 @@ import java.util.Date;
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class WeUser
+public class WeUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -123,7 +123,7 @@ public class WeUser
/** 是否激活（1:是；2:否）该字段主要表示当前信息是否同步微信 */
/** 激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业,6=删除 */
@ApiModelProperty("激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业,6=删除")
- private Integer isActivate;
+ private Integer isActivate=new Integer(4);
/** 离职是否分配(1:已分配;0:未分配;) */
@ApiModelProperty("离职是否分配(1:已分配;0:未分配;)")
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeChatUserDTO.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeChatUserDTO.java
index 6a6c42d5eb720348f213813c96a61564f6b75082..0a73308f665fd7ec9f2720891b10b961b082ca3a 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeChatUserDTO.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeChatUserDTO.java
@@ -12,4 +12,5 @@ public class WeChatUserDTO {
private String userid;
private String unionid;
private String name;
+ private String avatar;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeCommunityNewGroupDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeCommunityNewGroupDto.java
index b789f9e02d59f08e6c9b6b13a0c9fb442413be82..83b0a9d6ca20b8e588f66a1c616c487753ef6820 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeCommunityNewGroupDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeCommunityNewGroupDto.java
@@ -2,6 +2,7 @@ package com.linkwechat.wecom.domain.dto;
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -40,7 +41,6 @@ public class WeCommunityNewGroupDto {
/**
* 标签id列表
*/
- @NotNull(message = "标签不能为空")
private List tagList;
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeGroupSopDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeGroupSopDto.java
index ac31a2026aed61af840bbcacb49db4c597c0a946..a84a445fb37bf3e4e312db77f1386034aa5669ac 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeGroupSopDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeGroupSopDto.java
@@ -2,7 +2,9 @@ package com.linkwechat.wecom.domain.dto;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
import java.util.List;
/**
@@ -13,7 +15,8 @@ public class WeGroupSopDto {
/**
* 规则名
*/
- @NotNull(message = "规则名不可为空")
+ @Size(max = 64, message = "规则名称不可超过64字符")
+ @NotBlank(message = "规则名不可为空")
private String ruleName;
/**
@@ -25,13 +28,15 @@ public class WeGroupSopDto {
/**
* 内容标题
*/
- @NotNull(message = "标题不可为空")
+ @Size(max = 64, message = "标题不可超过64字符")
+ @NotBlank(message = "标题不可为空")
private String title;
/**
* 消息内容
*/
- @NotNull(message = "内容不可为空")
+ @Size(max = 255, message = "标题不可超过255字符")
+ @NotBlank(message = "内容不可为空")
private String content;
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeKeywordGroupTaskDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeKeywordGroupTaskDto.java
deleted file mode 100644
index 88ba38e1b9857b925bc6f20b442f428d74ea7b72..0000000000000000000000000000000000000000
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeKeywordGroupTaskDto.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.linkwechat.wecom.domain.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 社区运营 - 关键词拉群Dto
- */
-@Data
-public class WeKeywordGroupTaskDto {
-
- /**
- * 任务名
- */
- @NotNull(message = "任务名不能为空")
- private String taskName;
-
- /**
- * 群活码id
- */
- @NotNull(message = "群活码不能为空")
- private Long groupCodeId;
-
- /**
- * 加群引导语
- */
- @NotNull(message = "引导语不可为空")
- private String welcomeMsg;
-
- /**
- * 关键词
- */
- @NotNull(message = "关键词不可为空")
- private String keywords;
-}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java
index fa685402604dab0a6f796f6f1f0090ed21110735..cba57be2a31f49e65c8a50ee188a3355ab4729d5 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMediaDto.java
@@ -1,5 +1,7 @@
package com.linkwechat.wecom.domain.dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -7,6 +9,7 @@ import lombok.Data;
* @Description:
* @Date: create in 2020/9/24 0024 0:16
*/
+@ApiModel
@Data
public class WeMediaDto extends WeResultDto{
/**媒体文件类型，分别有图片（image）、语音（voice）、视频（video），普通文件(file)*/
@@ -16,5 +19,9 @@ public class WeMediaDto extends WeResultDto{
/**媒体文件上传时间戳*/
private Long created_at;
/**上传后得到的图片URL。永久有效*/
+ @ApiModelProperty("图片路径")
private String url;
+
+ @ApiModelProperty("图片名称")
+ private String fileName;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMessagePushDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMessagePushDto.java
index 38b0954bb9599770eafccd18158d41d751809fe3..c759e085c5db7cfb93d79f765cb932061b093c19 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMessagePushDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WeMessagePushDto.java
@@ -4,12 +4,18 @@ import com.linkwechat.wecom.domain.dto.message.ImageMessageDto;
import com.linkwechat.wecom.domain.dto.message.LinkMessageDto;
import com.linkwechat.wecom.domain.dto.message.MiniprogramMessageDto;
import com.linkwechat.wecom.domain.dto.message.TextMessageDto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.util.List;
@SuppressWarnings("all")
@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class WeMessagePushDto {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WePresTagGroupTaskDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WePresTagGroupTaskDto.java
index 5cac503247a9c9f8f5c8a59406eb8359cdc70a8e..409735fecf574cf2d2640e500e78684e8f9b494a 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WePresTagGroupTaskDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/WePresTagGroupTaskDto.java
@@ -3,7 +3,9 @@ package com.linkwechat.wecom.domain.dto;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
import java.util.List;
/**
@@ -28,7 +30,8 @@ public class WePresTagGroupTaskDto {
/**
* 加群引导语
*/
- @NotNull(message = "引导语不能为空")
+ @Size(max = 64, message = "引导与不能超过64字符")
+ @NotBlank(message = "引导语不能为空")
private String welcomeMsg;
/**
@@ -50,7 +53,6 @@ public class WePresTagGroupTaskDto {
/**
* 发送范围 0: 全部客户 1：部分客户
*/
- @NotNull(message = "发送范围不能为空")
private Integer sendScope;
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/CustomerMessagePushDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/CustomerMessagePushDto.java
index 66a4d927f362cd6c0d88d8974f0478b02fdd4ce1..1e6c68c1b351e7c9627d031c0f1c01aff29f3b55 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/CustomerMessagePushDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/CustomerMessagePushDto.java
@@ -2,6 +2,7 @@ package com.linkwechat.wecom.domain.dto.message;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -9,7 +10,7 @@ import java.util.List;
*/
@SuppressWarnings("all")
@Data
-public class CustomerMessagePushDto {
+public class CustomerMessagePushDto implements Cloneable{
/**
* 群发类型 0 发给客户 1 发给客户群
@@ -68,6 +69,11 @@ public class CustomerMessagePushDto {
*/
private MiniprogramMessageDto miniprogramMessage;
+ /**
+ * 视频
+ */
+ private VideoDto videoDto;
+
/**
* 消息内容
@@ -78,7 +84,7 @@ public class CustomerMessagePushDto {
public String content() {
if (this.getMessageType()!=null) {
- // 消息类型 0 文本消息 1 图片消息 2 链接消息 3 小程序消息
+ // 消息类型 0 文本消息 1 图片消息 2 链接消息 3 小程序消息 4 图文
if ( this.getMessageType().equals("0")) {
return this.getTextMessage().getContent();
}
@@ -97,10 +103,24 @@ public class CustomerMessagePushDto {
return this.getMiniprogramMessage().getTitle() + ":" + this.getMiniprogramMessage().getPage();
}
+
+ if(this.getMessageType().equals("4")){
+
+ return this.getTextMessage().getContent()+","+this.getImageMessage().getPic_url();
+
+ }
}
return null;
}
+ @Override
+ public CustomerMessagePushDto clone() throws CloneNotSupportedException {
+ return (CustomerMessagePushDto) super.clone();
+ }
+
+
+
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDataObjectDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDataObjectDto.java
index d849a1d2cefcfac02cbe094665ea35903b3fc6f1..2dc607476857bd99237ece32872efe7d5e080cb7 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDataObjectDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDataObjectDto.java
@@ -8,4 +8,8 @@ public class QueryCustomerMessageStatusResultDataObjectDto {
* 群发消息的id，通过创建企业群发接口返回
*/
private String msgid;
+
+
+
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDto.java
index 1883936a078caae3c974c94016a01096fcad10b3..e6e33122a21cc08cc6b129e793238b746efe8b22 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/QueryCustomerMessageStatusResultDto.java
@@ -17,6 +17,7 @@ public class QueryCustomerMessageStatusResultDto extends WeResultDto {
private String check_status;
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/TextMessageDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/TextMessageDto.java
index c58e3adc7d639f98d81982493fb0ac6b8ca2890e..3104bbdd7fca0fe4204e17704918a2309746531d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/TextMessageDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/TextMessageDto.java
@@ -1,8 +1,14 @@
package com.linkwechat.wecom.domain.dto.message;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class TextMessageDto {
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/VideoDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/VideoDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc12ab02c9fc1bd4539642697739a9f0776ca33d
--- /dev/null
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/VideoDto.java
@@ -0,0 +1,16 @@
+package com.linkwechat.wecom.domain.dto.message;
+
+import lombok.Data;
+
+/**
+ * @author danmo
+ * @description 视频
+ * @date 2021/4/24 16:01
+ **/
+@Data
+public class VideoDto {
+ /**
+ * 视频素材id
+ */
+ private String media_id;
+}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/WeCustomerMessagePushDto.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/WeCustomerMessagePushDto.java
index 6715b43642a1dd3b463a4d0e772fd15efa8fc1f7..7a33796ca9d3198219c11dc341bee2a5df620a39 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/WeCustomerMessagePushDto.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/dto/message/WeCustomerMessagePushDto.java
@@ -1,10 +1,16 @@
package com.linkwechat.wecom.domain.dto.message;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.util.List;
@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
public class WeCustomerMessagePushDto {
/**
@@ -27,19 +33,23 @@ public class WeCustomerMessagePushDto {
*/
private TextMessageDto text;
+ /**
+ * 附件
+ */
+ private List attachments;
+
/**
* 图片消息
*/
- private ImageMessageDto image;
+ //private ImageMessageDto image;
/**
* 链接消息
*/
- private LinkMessageDto link;
+ //private LinkMessageDto link;
/**
* 小程序消息
*/
- private MiniprogramMessageDto miniprogram;
-
+ //private MiniprogramMessageDto miniprogram;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/ConversationArchiveVo.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/ConversationArchiveVo.java
index 0ae2cdb2255c7153c3806cd6aebb77f3c8932d26..573ccab71593f24ac83c46e20aecee57e6a1bf34 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/ConversationArchiveVo.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/ConversationArchiveVo.java
@@ -52,61 +52,61 @@ public class ConversationArchiveVo {
private String msgType;
@ApiModelProperty("文本消息内容")
- private Content text;
+ private Content text=new Content();
@ApiModelProperty("图片消息内容")
- private Content image;
+ private Content image=new Content();
@ApiModelProperty("撤回消息")
- private Content revoke;
+ private Content revoke=new Content();
@ApiModelProperty("同意会话聊天内容")
- private Content disagree;
+ private Content disagree=new Content();
@ApiModelProperty("语音内容")
- private Content voice;
+ private Content voice=new Content();
@ApiModelProperty("视频内容")
- private Content video;
+ private Content video=new Content();
@ApiModelProperty("名片")
- private Content card;
+ private Content card=new Content();
@ApiModelProperty("位置")
- private Content location;
+ private Content location=new Content();
@ApiModelProperty("表情")
- private Content emotion;
+ private Content emotion=new Content();
@ApiModelProperty("文件")
- private Content file;
+ private Content file=new Content();
@ApiModelProperty("链接")
- private Content link;
+ private Content link=new Content();
@ApiModelProperty("小程序消息")
- private Content weApp;
+ private Content weApp=new Content();
@ApiModelProperty("会话记录消息")
- private Content chatReCord;
+ private Content chatReCord=new Content();
@ApiModelProperty("待办消息")
- private Content todo;
+ private Content todo=new Content();
@ApiModelProperty("投票消息")
- private Content vote;
+ private Content vote=new Content();
@ApiModelProperty("填表消息")
- private Collect collect;
+ private Collect collect=new Collect();
@ApiModelProperty("红包消息")
- private RedPacket redPacket;
+ private RedPacket redPacket=new RedPacket();
@ApiModelProperty("会议邀请消息")
- private Meeting meeting;
+ private Meeting meeting=new Meeting();
@ApiModelProperty("在线文档消息")
- private Content doc;
+ private Content doc=new Content();
@ApiModelProperty("MarkDown格式消息/图文消息")
private JSONObject info;
@@ -118,11 +118,14 @@ public class ConversationArchiveVo {
private JSONObject meetingVoiceCall;
@ApiModelProperty("日程消息")
- private Calendar calendar;
+ private Calendar calendar=new Calendar();
@ApiModel
@Data
private class Content{
+ @ApiModelProperty("文件路径")
+ private String attachment;
+
@ApiModelProperty("文本消息内容")
private String content;
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatContactMsgVo.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatContactMsgVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..02e42031d95b2fe3bc15ed73f66aa935d153ffc2
--- /dev/null
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatContactMsgVo.java
@@ -0,0 +1,43 @@
+package com.linkwechat.wecom.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author danmo
+ * @description 会话信息
+ * @date 2021/7/29 0:21
+ **/
+@ApiModel
+@Data
+public class WeChatContactMsgVo {
+
+ @ApiModelProperty("接收人id")
+ private String receiver;
+
+ @ApiModelProperty("发送人人id")
+ private String fromId;
+
+ @ApiModelProperty("名称")
+ private String name;
+
+ @ApiModelProperty("头像")
+ private String avatar;
+
+ @ApiModelProperty("消息发送时间")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date msgTime;
+
+ @ApiModelProperty("消息类型(如：文本，图片)")
+ private String msgType;
+
+ @ApiModelProperty("消息类型(send(发送消息)/recall(撤回消息)/switch(切换企业日志))")
+ private String action;
+
+ @ApiModelProperty("消息内容")
+ private String contact;
+}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeGroupCodeVo.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeGroupCodeVo.java
index 91740e0b8646c55643045432229563d26aea06e6..5497ec410a7712a69bb3c34ef10bf8395930ada4 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeGroupCodeVo.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeGroupCodeVo.java
@@ -2,6 +2,7 @@ package com.linkwechat.wecom.domain.vo;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -11,13 +12,12 @@ import lombok.NoArgsConstructor;
* @Date 2021/3/26 14:21
*/
@Data
+@Builder
@NoArgsConstructor
@AllArgsConstructor
public class WeGroupCodeVo {
private Long id;
- private String uuid;
-
private String codeUrl;
}
\ No newline at end of file
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeKeywordGroupTaskVo.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeKeywordGroupTaskVo.java
deleted file mode 100644
index e75ac4ba1123709a56dafb1191a5cfc33c37e4aa..0000000000000000000000000000000000000000
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeKeywordGroupTaskVo.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.linkwechat.wecom.domain.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.linkwechat.wecom.domain.WeKeywordGroupTaskKeyword;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * 社区运营 - 关键词拉群任务VO
- */
-@Data
-public class WeKeywordGroupTaskVo {
-
- /**
- * id
- */
- private Long taskId;
-
- /**
- * 任务名
- */
- private String taskName;
-
- /**
- * 群活码id
- */
- @JsonIgnore
- private Long groupCodeId;
-
- /**
- * 群活码信息
- */
- @TableField(exist = false)
- private WeGroupCodeVo groupCodeInfo;
-
- /**
- * 关键词
- */
- @TableField(exist = false)
- private List keywordList;
-
- /**
- * 实际群聊(仅群聊名称)
- */
- @TableField(exist = false)
- private List groupNameList;
-
- /**
- * 加群引导语
- */
- private String welcomeMsg;
-
- /**
- * 创建者
- */
- private String createBy;
-
- /**
- * 创建时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 更新人
- */
- private String updateBy;
-
- /**
- * 更新时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String updateTime;
-
-}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMakeCustomerTag.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMakeCustomerTag.java
index ec0d010171b31fa9af629040d8a959c944e49ad3..96336b4c06b810c4f803f532292e8f4e3e34160e 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMakeCustomerTag.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeMakeCustomerTag.java
@@ -19,6 +19,7 @@ import java.util.List;
@NoArgsConstructor
public class WeMakeCustomerTag {
private String externalUserid;
+ private String userId;
private List addTag;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WePresTagGroupTaskVo.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WePresTagGroupTaskVo.java
index bf3b2dd52aa3064b0934e7787ab8d41c95a40dbf..c4f3e983dfce4134137b9d549f16ce2b2529c2fa 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WePresTagGroupTaskVo.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WePresTagGroupTaskVo.java
@@ -50,12 +50,6 @@ public class WePresTagGroupTaskVo {
@JsonIgnore
private String codeUrl;
- /**
- * 群活码uuid
- */
- @JsonIgnore
- private String CodeUuid;
-
@TableField(exist = false)
private WeGroupCodeVo groupCodeInfo;
@@ -132,7 +126,7 @@ public class WePresTagGroupTaskVo {
* 设置群活码信息
*/
public void fillGroupCodeVo() {
- WeGroupCodeVo groupCodeVo = new WeGroupCodeVo(this.getCodeId(), this.getCodeUuid(), this.getCodeUrl());
+ WeGroupCodeVo groupCodeVo = new WeGroupCodeVo(this.getCodeId(),this.getCodeUrl());
this.setGroupCodeInfo(groupCodeVo);
}
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeTaskFissionProgressVO.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeTaskFissionProgressVO.java
index 9e5743459034ee8cf198a2172bf6afaefcf48216..f7b74979cf333d67aa1ba1792948cf4c55bc7b70 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeTaskFissionProgressVO.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeTaskFissionProgressVO.java
@@ -1,6 +1,9 @@
package com.linkwechat.wecom.domain.vo;
import com.linkwechat.wecom.domain.WeCustomer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
@@ -15,10 +18,16 @@ import java.util.List;
* 客户任务进度和邀请列表
*
*/
+@ApiModel
@Data
@Builder
public class WeTaskFissionProgressVO {
+ @ApiModelProperty("总数")
private Long total;
+
+ @ApiModelProperty("完成数")
private Long completed;
+
+ @ApiModelProperty("客户列表")
private List customers;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackAddExternalContactImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackAddExternalContactImpl.java
index d3637698e745b40053e577c09b81fff292a47f52..f1a0970f2ed59ef7aa07d64ff3cb38040e718390 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackAddExternalContactImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackAddExternalContactImpl.java
@@ -2,6 +2,7 @@ package com.linkwechat.wecom.factory.impl.customer;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.linkwechat.common.config.CosConfig;
import com.linkwechat.common.constant.WeConstans;
import com.linkwechat.common.enums.MediaType;
import com.linkwechat.common.utils.StringUtils;
@@ -47,16 +48,27 @@ public class WeCallBackAddExternalContactImpl extends WeEventStrategy {
private IWeTaskFissionRewardService weTaskFissionRewardService;
@Autowired
private IWeTaskFissionService weTaskFissionService;
+ private ThreadLocal weFlowerCustomerRelThreadLocal = new ThreadLocal<>();
+
+ @Autowired
+ private IWeGroupCodeService weGroupCodeService;
+
+ @Autowired
+ private CosConfig cosConfig;
@Override
public void eventHandle(WxCpXmlMessageVO message) {
if (message.getExternalUserId() != null) {
+ WeFlowerCustomerRel weFlowerCustomerRel = weFlowerCustomerRelService.getOne(new LambdaQueryWrapper()
+ .eq(WeFlowerCustomerRel::getExternalUserid, message.getExternalUserId())
+ .eq(WeFlowerCustomerRel::getUserId,message.getUserId()));
+ weFlowerCustomerRelThreadLocal.set(weFlowerCustomerRel);
weCustomerService.getCustomersInfoAndSynchWeCustomer(message.getExternalUserId());
}
if (message.getState() != null && message.getWelcomeCode() != null) {
if (isFission(message.getState())) {
taskFissionRecordHandle(message.getState(), message.getWelcomeCode(), message.getUserId(), message.getExternalUserId());
- }else {
+ } else {
empleCodeHandle(message.getState(), message.getWelcomeCode(), message.getUserId(), message.getExternalUserId());
}
}
@@ -64,6 +76,7 @@ public class WeCallBackAddExternalContactImpl extends WeEventStrategy {
//裂变任务处理
private void taskFissionRecordHandle(String state, String wecomCode, String userId, String externalUserId) {
+ log.info("裂变任务处理 >>>>>>>>>>start");
//查询裂变客户任务记录
String fissionRecordId = state.substring(WeConstans.FISSION_PREFIX.length());
WeTaskFissionRecord weTaskFissionRecord = weTaskFissionRecordService.selectWeTaskFissionRecordById(Long.valueOf(fissionRecordId));
@@ -71,20 +84,23 @@ public class WeCallBackAddExternalContactImpl extends WeEventStrategy {
//查询裂变任务详情
WeTaskFission weTaskFission = weTaskFissionService
.selectWeTaskFissionById(weTaskFissionRecord.getTaskFissionId());
-
- Long fissNum = weTaskFissionRecord.getFissNum() + 1;
- weTaskFissionRecord.setFissNum(fissNum);
-
+ Long fissNum = weTaskFissionRecord.getFissNum();
+ if (weFlowerCustomerRelThreadLocal.get() == null){
+ fissNum++;
+ weTaskFissionRecord.setFissNum(fissNum);
+ }
+ log.info("查询裂变任务详情 >>>>>>>>>>{}",JSONObject.toJSONString(weTaskFissionRecord));
if (weTaskFission != null){
//发送欢迎语
- String welcomeMsg = weTaskFission.getWelcomeMsg();
- WeWelcomeMsg.WeWelcomeMsgBuilder weWelcomeMsgBuilder = JSONObject.parseObject(welcomeMsg, WeWelcomeMsg.WeWelcomeMsgBuilder.class);
- weWelcomeMsgBuilder.welcome_code(wecomCode);
+ WeWelcomeMsg.WeWelcomeMsgBuilder weWelcomeMsgBuilder = WeWelcomeMsg.builder().welcome_code(wecomCode);
+ weWelcomeMsgBuilder.text(WeWelcomeMsg.Text.builder()
+ .content(weTaskFission.getWelcomeMsg()).build());
weCustomerService.sendWelcomeMsg(weWelcomeMsgBuilder.build());
}
//裂变数量完成任务处理,消费兑换码
if (fissNum >= weTaskFission.getFissNum()){
+ log.info("裂变数量完成任务处理,消费兑换码 >>>>>>>>>>{}",fissNum);
weTaskFissionRecord.setCompleteTime(new Date());
WeTaskFissionReward reward = new WeTaskFissionReward();
reward.setTaskFissionId(weTaskFissionRecord.getTaskFissionId());
@@ -95,8 +111,9 @@ public class WeCallBackAddExternalContactImpl extends WeEventStrategy {
fissionReward.setRewardUserId(weTaskFissionRecord.getCustomerId());
weTaskFissionRewardService.updateWeTaskFissionReward(fissionReward);
}
-
+ log.info("裂变任务处理变更 >>>>>>>>>>{}",JSONObject.toJSONString(weTaskFissionRecord));
weTaskFissionRecordService.updateWeTaskFissionRecord(weTaskFissionRecord);
+ log.info("裂变任务处理 >>>>>>>>>>end");
}
}
@@ -113,15 +130,17 @@ public class WeCallBackAddExternalContactImpl extends WeEventStrategy {
log.info("执行发送欢迎语>>>>>>>>>>>>>>>");
WeWelcomeMsg.WeWelcomeMsgBuilder weWelcomeMsgBuilder = WeWelcomeMsg.builder().welcome_code(wecomCode);
WeEmpleCodeDto messageMap = weEmpleCodeService.selectWelcomeMsgByState(state);
- if (messageMap != null) {
+
+ if (StringUtils.isNotNull(messageMap)) {
String empleCodeId = messageMap.getEmpleCodeId();
//查询活码对应标签
List tagList = weEmpleCodeTagService.list(new LambdaQueryWrapper()
.eq(WeEmpleCodeTag::getEmpleCodeId, empleCodeId));
//查询外部联系人与通讯录关系数据
- WeFlowerCustomerRel weFlowerCustomerRel = weFlowerCustomerRelService.getOne(new LambdaQueryWrapper()
- .eq(WeFlowerCustomerRel::getUserId, userId)
- .eq(WeFlowerCustomerRel::getExternalUserid, externalUserId));
+ WeFlowerCustomerRel weFlowerCustomerRel = weFlowerCustomerRelService
+ .getOne(new LambdaQueryWrapper()
+ .eq(WeFlowerCustomerRel::getUserId, userId)
+ .eq(WeFlowerCustomerRel::getExternalUserid, externalUserId));
//为外部联系人添加员工活码标签
List weFlowerCustomerTagRels = new ArrayList<>();
Optional.ofNullable(weFlowerCustomerRel).ifPresent(weFlowerCustomerRel1 -> {
@@ -136,22 +155,24 @@ public class WeCallBackAddExternalContactImpl extends WeEventStrategy {
});
weFlowerCustomerTagRelService.saveOrUpdateBatch(weFlowerCustomerTagRels);
});
+
+ // 发送欢迎语
log.debug(">>>>>>>>>欢迎语查询结果：{}", JSONObject.toJSONString(messageMap));
- if (messageMap != null) {
- if (StringUtils.isNotEmpty(messageMap.getWelcomeMsg())) {
- weWelcomeMsgBuilder.text(WeWelcomeMsg.Text.builder()
- .content(messageMap.getWelcomeMsg()).build());
- }
- if (StringUtils.isNotEmpty(messageMap.getCategoryId())) {
- WeMediaDto weMediaDto = weMaterialService
- .uploadTemporaryMaterial(messageMap.getMaterialUrl(), MediaType.IMAGE.getMediaType(),messageMap.getMaterialName());
- Optional.ofNullable(weMediaDto).ifPresent(media -> {
- weWelcomeMsgBuilder.image(WeWelcomeMsg.Image.builder().media_id(media.getMedia_id())
- .pic_url(media.getUrl()).build());
- });
- }
- weCustomerService.sendWelcomeMsg(weWelcomeMsgBuilder.build());
+ // 设定欢迎语文字
+ if (StringUtils.isNotEmpty(messageMap.getWelcomeMsg())) {
+ weWelcomeMsgBuilder.text(WeWelcomeMsg.Text.builder().content(messageMap.getWelcomeMsg()).build());
}
+ // 设置欢迎语图片
+ // 新客拉群创建的员工活码欢迎语图片(群活码图片)
+ String codeUrl = weGroupCodeService.selectGroupCodeUrlByEmplCodeState(state);
+ if (StringUtils.isNotNull(codeUrl)) {
+ buildWelcomeMsgImg(weWelcomeMsgBuilder, codeUrl, codeUrl.replaceAll(cosConfig.getCosImgUrlPrefix(), ""));
+ }
+ // 普通员工活码欢迎语图片
+ else if (StringUtils.isNotEmpty(messageMap.getCategoryId())) {
+ buildWelcomeMsgImg(weWelcomeMsgBuilder, messageMap.getMaterialUrl(), messageMap.getMaterialName());
+ }
+ weCustomerService.sendWelcomeMsg(weWelcomeMsgBuilder.build());
}
} catch (Exception e) {
e.printStackTrace();
@@ -160,11 +181,20 @@ public class WeCallBackAddExternalContactImpl extends WeEventStrategy {
}
private boolean isFission(String str) {
- if (str.indexOf(WeConstans.FISSION_PREFIX) != -1){
- return true;
- }
- return false;
+ return str.contains(WeConstans.FISSION_PREFIX);
}
-
+ /**
+ * 构建欢迎语的图片部分
+ *
+ * @param builder 欢迎语builder
+ * @param picUrl 图片链接
+ * @param fileName 图片名称
+ */
+ private void buildWelcomeMsgImg(WeWelcomeMsg.WeWelcomeMsgBuilder builder, String picUrl, String fileName) {
+ WeMediaDto weMediaDto = weMaterialService.uploadTemporaryMaterial(picUrl, MediaType.IMAGE.getMediaType(), fileName);
+ Optional.ofNullable(weMediaDto).ifPresent(media -> {
+ builder.image(WeWelcomeMsg.Image.builder().media_id(media.getMedia_id()).pic_url(media.getUrl()).build());
+ });
+ }
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackDelExternalContactImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackDelExternalContactImpl.java
index 2c2a353d17b08477f77743bfb87ac08b93a17f01..546e10a4113acf5bffd1ce604fdf1ffcc1fe813d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackDelExternalContactImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackDelExternalContactImpl.java
@@ -36,7 +36,7 @@ public class WeCallBackDelExternalContactImpl extends WeEventStrategy {
@Override
public void eventHandle(WxCpXmlMessageVO message) {
if (message.getExternalUserId() != null) {
- weCustomerService.deleteCustomersByEid(message.getExternalUserId());
+ //weCustomerService.deleteCustomersByEid(message.getExternalUserId());
weFlowerCustomerRelService.deleteFollowUser(message.getUserId(), message.getExternalUserId());
//增加敏感行为记录，员工删除客户
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customergroup/WeCallBackUpdateGroupImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customergroup/WeCallBackUpdateGroupImpl.java
index 8ff8d2195a1747b2c4d748254c9d528423faa0a7..462ae4c615b16ad3d5d798f63a005d8dad5587dd 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customergroup/WeCallBackUpdateGroupImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customergroup/WeCallBackUpdateGroupImpl.java
@@ -1,14 +1,19 @@
package com.linkwechat.wecom.factory.impl.customergroup;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.thread.ThreadUtil;
import com.linkwechat.common.enums.CallbackEventUpdateDetail;
+import com.linkwechat.wecom.domain.*;
import com.linkwechat.wecom.domain.vo.WxCpXmlMessageVO;
import com.linkwechat.wecom.factory.WeEventStrategy;
-import com.linkwechat.wecom.service.IWeGroupCodeActualService;
-import com.linkwechat.wecom.service.IWeGroupService;
+import com.linkwechat.wecom.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.*;
+import java.util.stream.Collectors;
+
/**
* @author danmo
* @description 客户群变更事件
@@ -23,6 +28,18 @@ public class WeCallBackUpdateGroupImpl extends WeEventStrategy {
@Autowired
private IWeGroupCodeActualService groupCodeActualService;
+ @Autowired
+ private IWeTaskFissionService taskFissionService;
+
+ @Autowired
+ private IWeTaskFissionRecordService taskFissionRecordService;
+
+ @Autowired
+ private IWeTaskFissionCompleteRecordService taskFissionCompleteRecordService;
+
+ @Autowired
+ private IWeGroupMemberService groupMemberService;
+
@Override
public void eventHandle(WxCpXmlMessageVO message) {
try {
@@ -31,10 +48,52 @@ public class WeCallBackUpdateGroupImpl extends WeEventStrategy {
if (updateDetail.equals(CallbackEventUpdateDetail.ADD_MEMBER.getType())) {
// 添加成员，该群的实际群活码扫码次数需要加1
groupCodeActualService.updateScanTimesByChatId(message.getChatId());
+ ThreadUtil.execAsync(() ->{
+ groupFissionEnterCheck(message.getChatId());
+ });
}
} catch (Exception e) {
e.printStackTrace();
log.error("update>>>>>>>>>param:{},ex:{}",message.getChatId(),e);
}
}
+
+ /**
+ * 群裂变客户入群校验
+ * @param chatId
+ */
+ private void groupFissionEnterCheck(String chatId){
+ log.info("群裂变客户入群校验>>>>>>>>>>>>>>>>>>>>>start");
+ WeGroupCodeActual weGroupCodeActual = groupCodeActualService.selectActualCodeByChatId(chatId);
+ //查询群活码id
+ Long groupCodeId = Optional.ofNullable(weGroupCodeActual).map(WeGroupCodeActual::getGroupCodeId).orElse(0L);
+ //根据群活码id 查询任务列表
+ List taskFissionList = taskFissionService.getTaskFissionListByGroupCodeId(groupCodeId);
+ if(CollectionUtil.isNotEmpty(taskFissionList)){
+ Set taskFissionIdSet = taskFissionList.stream().map(WeTaskFission::getId).collect(Collectors.toSet());
+ Map taskFissionIdNumMap = taskFissionList.stream().collect(Collectors.toMap(WeTaskFission::getId, WeTaskFission::getFissNum));
+ //根据任务id查询裂变任务完成无效哦记录列表
+ List completeRecordList = taskFissionCompleteRecordService.getListByTaskIds(taskFissionIdSet);
+ if(CollectionUtil.isNotEmpty(completeRecordList)){
+ completeRecordList.forEach(completeRecord ->{
+ //查询该成员是否入群
+ WeGroupMember weGroupMember = groupMemberService.selectWeGroupMemberByUnionId(chatId,completeRecord.getCustomerId());
+ if (weGroupMember != null){
+ completeRecord.setStatus(0);
+ if(taskFissionCompleteRecordService.updateWeTaskFissionCompleteRecord(completeRecord) > 0){
+ WeTaskFissionRecord record = taskFissionRecordService.selectWeTaskFissionRecordById(completeRecord.getFissionRecordId());
+ if(record != null){
+ Long fissNum = record.getFissNum() + 1;
+ if (fissNum >= taskFissionIdNumMap.get(record.getTaskFissionId())){
+ record.setCompleteTime(new Date());
+ }
+ record.setFissNum(fissNum);
+ taskFissionRecordService.updateWeTaskFissionRecord(record);
+ }
+ }
+ }
+ });
+ }
+ }
+ }
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeAccessTokenInterceptor.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeAccessTokenInterceptor.java
index 8afe85a2493d3539c1339bd381e1a7b8c954dedc..c2cfb59a5cd6e2aa7e66dd386e4af1d9e954cb9d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeAccessTokenInterceptor.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeAccessTokenInterceptor.java
@@ -1,6 +1,8 @@
package com.linkwechat.wecom.interceptor;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import com.dtflys.forest.config.ForestConfiguration;
import com.dtflys.forest.exceptions.ForestRuntimeException;
import com.dtflys.forest.http.ForestRequest;
import com.dtflys.forest.http.ForestResponse;
@@ -14,7 +16,10 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
/**
* @description: 微信token拦截器
@@ -33,6 +38,9 @@ public class WeAccessTokenInterceptor implements Interceptor{
@Autowired
private WeComeConfig weComeConfig;
+ @Resource
+ private ForestConfiguration forestConfiguration;
+
/**
@@ -40,9 +48,11 @@ public class WeAccessTokenInterceptor implements Interceptor{
*/
@Override
public boolean beforeExecute(ForestRequest request) {
- String uri=request.getUrl().replace("http://","");
+ String weComServerUrl = String.valueOf(forestConfiguration.getVariableValue("weComServerUrl"));
+ String weComePrefix = String.valueOf(forestConfiguration.getVariableValue("weComePrefix"));
+ String uri=request.getUrl().replace(weComServerUrl+weComePrefix,"");
log.info(">>>>>>>>>>>>>>>>>>>>>>>>uri：{}",uri);
- //request.setContentType("application/json");
+
if(!Arrays.asList(weComeConfig.getFileUplodUrl()).contains(uri)){
request.setDataType(ForestDataType.JSON);
request.setContentType("application/json");
@@ -58,19 +68,19 @@ public class WeAccessTokenInterceptor implements Interceptor{
}else if(Arrays.asList(weComeConfig.getNeedChatTokenUrl()).contains(uri)){ //需要会话存档token
token=iWeAccessTokenService.findChatAccessToken();
}else if(Arrays.asList(weComeConfig.getThirdAppUrl()).contains(uri)){ //第三方自建应用token
- token=iWeAccessTokenService.findThirdAppAccessToken(request.getHeaderValue(WeConstans.THIRD_APP_PARAM_TIP));
+ token=iWeAccessTokenService.findThirdAppAccessToken(
+ StrUtil.isEmpty(request.getHeaderValue(WeConstans.THIRD_APP_PARAM_TIP))?(String) request.getQuery(WeConstans.THIRD_APP_PARAM_TIP):request.getHeaderValue(WeConstans.THIRD_APP_PARAM_TIP)
+ );
} else{
token=iWeAccessTokenService.findCommonAccessToken();
}
if (uri.contains("ticket/get")){
request.addQuery("type","agent_config");
}
-
request.addQuery("access_token",token);
}
//添加服务器统一请求地址
- request.setUrl(weComeConfig.getServerUrl()+weComeConfig.getWeComePrefix()+uri);
-
+ // request.setUrl(weComeConfig.getServerUrl()+weComeConfig.getWeComePrefix()+uri);
return true;
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeiXinAuthInterceptor.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeiXinAuthInterceptor.java
index d373f71d1544c3dcd71f471ae87c736ef7d92015..b1e79bfebd019cd54463c2211eb54f2e33a60726 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeiXinAuthInterceptor.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/WeiXinAuthInterceptor.java
@@ -56,21 +56,20 @@ public class WeiXinAuthInterceptor implements Interceptor {
private String findAccessToken(String openId){
//获取用户token
- String accessToken =redisCache.getCacheObject(WeConstans.WX_AUTH_ACCESS_TOKEN+":"+ openId);
- if (StringUtils.isEmpty(accessToken)){
+ WxTokenDto wxTokenDto = redisCache.getCacheObject(WeConstans.WX_AUTH_ACCESS_TOKEN + ":" + openId);
+ if (wxTokenDto == null){
//当用户token失效，则获取refreshToken
String refreshToken = redisCache.getCacheObject(WeConstans.WX_AUTH_REFRESH_ACCESS_TOKEN + ":" + openId);
if(StringUtils.isEmpty(refreshToken)){
throw new WeComException(1001,"token失效，请重新授权");
}else {
- WxTokenDto wxTokenDto = wxAuthClient.refreshToken(appId, secret, grantType, refreshToken);
+ wxTokenDto = wxAuthClient.refreshToken(appId, grantType, refreshToken);
if(wxTokenDto != null && StringUtils.isNotEmpty(wxTokenDto.getAccessToken())){
- redisCache.setCacheObject(WeConstans.WX_AUTH_ACCESS_TOKEN+":"+ openId, wxTokenDto.getAccessToken(), wxTokenDto.getExpiresIn(), TimeUnit.SECONDS);
- accessToken = wxTokenDto.getAccessToken();
+ redisCache.setCacheObject(WeConstans.WX_AUTH_ACCESS_TOKEN+":"+ openId, wxTokenDto, wxTokenDto.getExpiresIn(), TimeUnit.SECONDS);
}
}
}
- return accessToken;
+ return wxTokenDto.getAccessToken();
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCategoryMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCategoryMapper.java
index b337f7c9c961b9f3bddc8644a428bd094be04667..61a3a51005254fe9aa25736a590955d407ce0287 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCategoryMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCategoryMapper.java
@@ -1,66 +1,11 @@
package com.linkwechat.wecom.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WeCategory;
import org.apache.ibatis.annotations.Param;
import java.util.List;
-public interface WeCategoryMapper {
-
- /**
- * 保存素材分类
- *
- * @param category 素材分类 信息
- * @return {@link int}
- */
- int insertWeCategory(WeCategory category);
-
- /**
- * 保存素材分类
- *
- * @param category 素材分类 信息
- * @return {@link int}
- */
- int updateWeCategory(WeCategory category);
-
- /**
- * 删除分类信息
- *
- * @param id 主键id
- * @return {@link int}
- */
- int deleteWeCategoryById(@Param("id") Long id);
-
- /**
- * 批量删除
- *
- * @param ids id列表
- * @return {@link int}
- */
- int deleteWeCategoryByIds(Long[] ids);
-
- /**
- * 通过类型查询对应类目的分类信息列表
- *
- * @param mediaType 类型
- * @return {@link WeCategory}s
- */
- List findWeCategoryByMediaType(@Param("mediaType") String mediaType);
-
- /**
- * 通过id查询分类信息
- *
- * @param id 主键id
- * @return {@link WeCategory}
- */
- WeCategory findWeCategoryById(@Param("id") Long id);
-
- /**
- * 通过类型和名称查询类目信息
- *
- * @param mediaType 0 图片（image）、1 语音（voice）、2 视频（video），3 普通文件(file) 4 文本
- * @param name 分类名称
- * @return {@link WeCategory}
- */
- WeCategory findWeCategoryByMediaTypeAndName(@Param("mediaType") String mediaType, @Param("name") String name);
+public interface WeCategoryMapper extends BaseMapper {
+ void deleteWeCategoryById(Long[] ids);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatContactMappingMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatContactMappingMapper.java
index 40072044d993b06d74760e77f08cb7bb36dd33a2..37eaef62735a31259a3c67783fed15a5708abb48 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatContactMappingMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatContactMappingMapper.java
@@ -3,6 +3,7 @@ package com.linkwechat.wecom.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WeChatContactMapping;
+import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
* @author ruoyi
* @date 2020-12-27
*/
+@Mapper
public interface WeChatContactMappingMapper extends BaseMapper {
/**
* 查询聊天关系映射
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatContactMsgMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatContactMsgMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..4468aebe136f3e0ce9e00ba6d061548f776c1ea3
--- /dev/null
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatContactMsgMapper.java
@@ -0,0 +1,52 @@
+package com.linkwechat.wecom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.linkwechat.wecom.domain.WeChatContactMsg;
+import com.linkwechat.wecom.domain.vo.WeChatContactMsgVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 会话消息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-07-28
+ */
+public interface WeChatContactMsgMapper extends BaseMapper {
+
+ /**
+ * 外部联系人 会话列表
+ * @param fromId 消息发送人id
+ * @return 会话列表
+ */
+ List selectExternalChatList(@Param("fromId") String fromId);
+
+ /**
+ * 单聊 会话列表
+ * @param weChatContactMsg 入参
+ * @return 会话列表
+ */
+ List selectAloneChatList(WeChatContactMsg weChatContactMsg);
+
+ /**
+ * 内部联系人 会话列表
+ * @param fromId 消息发送人id
+ * @return 会话列表
+ */
+ List selectInternalChatList(@Param("fromId") String fromId);
+
+ /**
+ * 群聊 会话列表
+ * @param fromId 消息发送人id
+ * @return 会话列表
+ */
+ List selectGroupChatList(@Param("fromId") String fromId);
+
+ /**
+ * 全文检索 会话列表
+ * @param weChatContactMsg 检索条件
+ * @return 会话列表
+ */
+ List selectFullSearchChatList(WeChatContactMsg weChatContactMsg);
+}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCommunityNewGroupMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCommunityNewGroupMapper.java
index eae90f05eb6fe922de106d2859d8a945740e80c8..b0c2f95c2719a463629d14a563a09edd41e2d5a9 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCommunityNewGroupMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCommunityNewGroupMapper.java
@@ -3,6 +3,7 @@ package com.linkwechat.wecom.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WeCommunityNewGroup;
import com.linkwechat.wecom.domain.vo.WeCommunityNewGroupVo;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -15,7 +16,7 @@ import java.util.Optional;
* @author kewen
* @date 2021-02-19
*/
-@Repository
+@Mapper
public interface WeCommunityNewGroupMapper extends BaseMapper {
/**
@@ -27,9 +28,9 @@ public interface WeCommunityNewGroupMapper extends BaseMapper selectWeCommunityNewGroupList(@Param("emplCodeName") String emplCodeName, @Param("createBy") String createBy
- , @Param("beginTime") String beginTime, @Param("endTime") String endTime);
-
+// List selectWeCommunityNewGroupList(@Param("emplCodeName") String emplCodeName, @Param("createBy") String createBy
+// , @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+ List selectWeCommunityNewGroupList(WeCommunityNewGroup weCommunityNewGroup);
/**
* 获取新客自动拉群详细信息
*
@@ -60,12 +61,4 @@ public interface WeCommunityNewGroupMapper extends BaseMapper
{
- /**
- * 查询企业id相关配置
- *
- * @param id 企业id相关配置ID
- * @return 企业id相关配置
- */
- public WeCorpAccount selectWeCorpAccountById(Long id);
-
- /**
- * 查询企业id相关配置列表
- *
- * @param wxCorpAccount 企业id相关配置
- * @return 企业id相关配置集合
- */
- public List selectWeCorpAccountList(WeCorpAccount wxCorpAccount);
-
- /**
- * 新增企业id相关配置
- *
- * @param wxCorpAccount 企业id相关配置
- * @return 结果
- */
- public int insertWeCorpAccount(WeCorpAccount wxCorpAccount);
-
- /**
- * 修改企业id相关配置
- *
- * @param wxCorpAccount 企业id相关配置
- * @return 结果
- */
- public int updateWeCorpAccount(WeCorpAccount wxCorpAccount);
-
-
-
- /**
- * 获取有效cropid
- * @return
- */
- public WeCorpAccount findValidWeCorpAccount();
/**
@@ -58,13 +19,7 @@ public interface WeCorpAccountMapper
* @param corpId
* @return
*/
- public int startVailWeCorpAccount(@Param("corpId") String corpId);
+ int startVailWeCorpAccount(@Param("corpId") String corpId);
- /**
- * 根据企业账号获取企业相关配置
- * @param corpAccount
- * @return
- */
- WeCorpAccount findWeCorpByAccount(@Param("corpAccount") String corpAccount);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMapper.java
index 6bce0289c2ad80200e97f2adbfbc4925ca8d4f4a..dbed59d8bc88652aa2921301230b9c49e7ca4bb4 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMapper.java
@@ -71,7 +71,7 @@ public interface WeCustomerMapper extends BaseMapper
* @param externalUserid
* @return
*/
- public List getCustomersByUserId(@Param("externalUserid") String externalUserid);
+ public List getCustomersByUserId(@Param("externalUserid") String externalUserid,@Param("userId") String userId);
/**
* 通过标签查询客户列表
@@ -99,4 +99,14 @@ public interface WeCustomerMapper extends BaseMapper
WeCustomerSocialConn countSocialConn(@Param("externalUserid")String externalUserid,@Param("userid")String userid);
+
+ /**
+ * 查询企业微信客户列表,不查询一对多关系相关数据
+ *
+ * @param weCustomer 企业微信客户
+ * @return 企业微信客户集合
+ */
+ public List selectWeCustomerListNoRel(WeCustomer weCustomer);
+
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMessageMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMessageMapper.java
index 271d84b23dbeab964f280837503d2779b9560e87..c2760719c7debe31e4f739fc4266aa9873ca2626 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMessageMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeCustomerMessageMapper.java
@@ -2,8 +2,11 @@ package com.linkwechat.wecom.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WeCustomerMessage;
+import com.linkwechat.wecom.domain.dto.message.DetailMessageStatusResultDto;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* 群发消息 微信消息表Mapper接口
*
@@ -30,4 +33,6 @@ public interface WeCustomerMessageMapper extends BaseMapper {
*/
int updateWeCustomerMessageCheckStatusById(@Param("messageId") Long messageId,@Param("status") String status);
+
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeEmpleCodeMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeEmpleCodeMapper.java
index f9c517db99394073640d8b7b7e2a76d3bf1c6548..22dea0523b59ad9f1f97e137dfa15c3e157e2e18 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeEmpleCodeMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeEmpleCodeMapper.java
@@ -3,6 +3,7 @@ package com.linkwechat.wecom.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WeEmpleCode;
import com.linkwechat.wecom.domain.dto.WeEmpleCodeDto;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -14,7 +15,7 @@ import java.util.List;
* @author ruoyi
* @date 2020-10-04
*/
-@Repository
+@Mapper
public interface WeEmpleCodeMapper extends BaseMapper
{
/**
@@ -23,14 +24,14 @@ public interface WeEmpleCodeMapper extends BaseMapper
* @param id 员工活码ID
* @return 员工活码
*/
- public WeEmpleCode selectWeEmpleCodeById(Long id);
+ WeEmpleCode selectWeEmpleCodeById(Long id);
/**
* 批量查询员工活码根据id
* @param ids
* @return
*/
- public List selectWeEmpleCodeByIds(@Param("ids") List ids);
+ List selectWeEmpleCodeByIds(@Param("ids") List ids);
/**
* 查询员工活码列表
@@ -38,7 +39,7 @@ public interface WeEmpleCodeMapper extends BaseMapper
* @param weEmpleCode 员工活码
* @return 员工活码集合
*/
- public List selectWeEmpleCodeList(WeEmpleCode weEmpleCode);
+ List selectWeEmpleCodeList(WeEmpleCode weEmpleCode);
/**
* 新增员工活码
@@ -46,7 +47,7 @@ public interface WeEmpleCodeMapper extends BaseMapper
* @param weEmpleCode 员工活码
* @return 结果
*/
- public int insertWeEmpleCode(WeEmpleCode weEmpleCode);
+ int insertWeEmpleCode(WeEmpleCode weEmpleCode);
/**
* 修改员工活码
@@ -54,7 +55,7 @@ public interface WeEmpleCodeMapper extends BaseMapper
* @param weEmpleCode 员工活码
* @return 结果
*/
- public int updateWeEmpleCode(WeEmpleCode weEmpleCode);
+ int updateWeEmpleCode(WeEmpleCode weEmpleCode);
/**
* 删除员工活码
@@ -62,7 +63,7 @@ public interface WeEmpleCodeMapper extends BaseMapper
* @param id 员工活码ID
* @return 结果
*/
- public int deleteWeEmpleCodeById(Long id);
+ int deleteWeEmpleCodeById(Long id);
/**
* 批量删除员工活码
@@ -70,7 +71,7 @@ public interface WeEmpleCodeMapper extends BaseMapper
* @param ids 需要删除的数据ID
* @return 结果
*/
- public int deleteWeEmpleCodeByIds(Long[] ids);
+ int deleteWeEmpleCodeByIds(Long[] ids);
/**
@@ -79,14 +80,14 @@ public interface WeEmpleCodeMapper extends BaseMapper
* @param ids 需要删除的数据ID
* @return 结果
*/
- public int batchRemoveWeEmpleCodeIds(@Param("ids") List ids);
+ int batchRemoveWeEmpleCodeIds(@Param("ids") List ids);
/**
* 通过活动场景获取客户欢迎语
* @param scenario 活动场景
* @return
*/
- public WeEmpleCodeDto selectWelcomeMsgByScenario(@Param("scenario") String scenario, @Param("userId") String userId);
+ WeEmpleCodeDto selectWelcomeMsgByScenario(@Param("scenario") String scenario, @Param("userId") String userId);
/**
* 通过state定位员工活码
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeActualMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeActualMapper.java
index 7deb951659cc0b4468e58a4ea22938371790319d..41ad7776dcc37a1808ed182ce4d62369ec750e4b 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeActualMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeActualMapper.java
@@ -76,7 +76,7 @@ public interface WeGroupCodeActualMapper extends BaseMapper {
* @param groupCodeId 群活码id
* @return 结果
*/
- List selectActualListByGroupCodeId(Long groupCodeId);
+ List selectActualList(Long groupCodeId);
/**
* 通过群活码id删除实际码
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeMapper.java
index 864d34ed3d1c5ca41beb736378ea2584d0f7235c..62400d8b0b59692e1cc1764d4cbb6d9dd066cb99 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupCodeMapper.java
@@ -15,17 +15,7 @@ import org.springframework.stereotype.Repository;
* @date 2020-10-07
*/
@Mapper
-@Repository
-public interface WeGroupCodeMapper extends BaseMapper
-{
- /**
- * 查询客户群活码
- *
- * @param id 客户群活码ID
- * @return 客户群活码
- */
- WeGroupCode selectWeGroupCodeById(Long id);
-
+public interface WeGroupCodeMapper extends BaseMapper {
/**
* 查询客户群活码列表
*
@@ -34,13 +24,6 @@ public interface WeGroupCodeMapper extends BaseMapper
*/
List selectWeGroupCodeList(WeGroupCode weGroupCode);
- /**
- * 根据群活码id查询群活码列表
- * @param ids id列表
- * @return 结果
- */
- List selectWeGroupCodeListByIds(List ids);
-
/**
* 新增客户群活码
*
@@ -57,37 +40,6 @@ public interface WeGroupCodeMapper extends BaseMapper
*/
int updateWeGroupCode(WeGroupCode weGroupCode);
- /**
- * 删除客户群活码
- *
- * @param id 客户群活码ID
- * @return 结果
- */
- int deleteWeGroupCodeById(Long id);
-
- /**
- * 批量删除客户群活码
- *
- * @param ids 需要删除的数据ID
- * @return 结果
- */
- int deleteWeGroupCodeByIds(Long[] ids);
-
- /**
- * 检测活码名称是否唯一
- * @param activityName 活码名称
- * @return 结果
- */
- int checkActivityNameUnique(String activityName);
-
- /**
- * 根据 uuid获取群活码
- *
- * @param uuid uuid
- * @return 结果
- */
- WeGroupCode getWeGroupByUuid(String uuid);
-
/**
* 根据群活码id获取对应所有群聊信息
* @param groupCodeId 群活码id
@@ -101,4 +53,11 @@ public interface WeGroupCodeMapper extends BaseMapper
* @return 总扫码次数
*/
int selectScanTimesByGroupCodeId(Long groupCodeId);
+
+ /**
+ * 通过员工活码获取群活码，用于新客自动拉群。
+ * @param state 员工活码state
+ * @return 群活码URL
+ */
+ String selectGroupCodeUrlByEmplCodeState(String state);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupSopMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupSopMapper.java
index 510c643c200294827cce3ca851aab3f1c5f54ab3..2534354e6af1547122b472d09c87c0166323f4a3 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupSopMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeGroupSopMapper.java
@@ -48,14 +48,6 @@ public interface WeGroupSopMapper extends BaseMapper {
*/
int batchRemoveWeGroupSopByIds(Long[] ruleIds);
- /**
- * 校验规则名是否已存在
- *
- * @param ruleName 规则名
- * @return 结果
- */
- int isRuleNameUnique(String ruleName);
-
/**
* 通过规则id获取其所有素材id
*
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeKeywordGroupTaskKwMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeKeywordGroupTaskKwMapper.java
deleted file mode 100644
index ebf7a8486cb0fc28ddd187e017f032fab1d6dacf..0000000000000000000000000000000000000000
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeKeywordGroupTaskKwMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.linkwechat.wecom.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.linkwechat.wecom.domain.WeKeywordGroupTaskKeyword;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 关键词拉群 关键词mapper
- */
-@Mapper
-@Repository
-public interface WeKeywordGroupTaskKwMapper extends BaseMapper {
-
- /**
- * 批量绑定关键词拉群任务与关键词关联
- * @param taskKeywordList 待绑定对象
- * @return 结果
- */
- int batchBindsTaskKeyword(List taskKeywordList);
-}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeKeywordGroupTaskMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeKeywordGroupTaskMapper.java
index d862bfc8e8009fa1cb9abf6b2d905b655f234c08..66357eafa8bf5a76a29c25c6e30304713439204e 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeKeywordGroupTaskMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeKeywordGroupTaskMapper.java
@@ -2,10 +2,7 @@ package com.linkwechat.wecom.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WeKeywordGroupTask;
-import com.linkwechat.wecom.domain.vo.WeKeywordGroupTaskVo;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
import java.util.List;
@@ -13,49 +10,21 @@ import java.util.List;
* 关键词拉群mapper
*/
@Mapper
-@Repository
public interface WeKeywordGroupTaskMapper extends BaseMapper {
/**
* 根据过滤条件获取关键词拉群任务列表
- *
- * @param taskName 任务名称
- * @param createBy 创建人
- * @param keyword 关键词
- * @param beginTime 开始时间
- * @param endTime 结束时间
- * @return 列表数据
- */
- List getTaskList(
- @Param("taskName") String taskName,
- @Param("createBy") String createBy,
- @Param("keyword") String keyword,
- @Param("beginTime") String beginTime,
- @Param("endTime") String endTime
- );
-
- /**
- * 根据id获取任务性情
- *
- * @param taskId 任务id
+ * @param task 查询信息
* @return 结果
*/
- WeKeywordGroupTaskVo getTaskById(Long taskId);
+ List getTaskList(WeKeywordGroupTask task);
/**
- * 根据任务id获取对应所有的群聊名称
+ * 根据id获取任务性情
*
* @param taskId 任务id
* @return 结果
*/
- List getGroupNameListByTaskId(Long taskId);
-
- /**
- * 校验名称是否唯一
- *
- * @param taskName 任务名
- * @return 结果
- */
- int checkNameUnique(String taskName);
+ WeKeywordGroupTask getTaskById(Long taskId);
/**
* 通过名称或者关键词进行过滤
@@ -63,5 +32,5 @@ public interface WeKeywordGroupTaskMapper extends BaseMapper
* @param word 过滤字段
* @return 结果
*/
- List filterByNameOrKeyword(String word);
+ List filterByNameOrKeyword(String word);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WePresTagGroupTaskMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WePresTagGroupTaskMapper.java
index 6ffd57b599b531e9491ae9c79eae1f6fa78e00da..52fd973805b57e947d0432206608a143f141bc29 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WePresTagGroupTaskMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WePresTagGroupTaskMapper.java
@@ -1,17 +1,18 @@
package com.linkwechat.wecom.mapper;
import com.linkwechat.wecom.domain.vo.WePresTagGroupTaskVo;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WePresTagGroupTask;
-import org.springframework.stereotype.Repository;
+import org.springframework.security.core.parameters.P;
import java.util.List;
/**
* 老客户标签建群相关Mapper接口
*/
-@Repository
+@Mapper
public interface WePresTagGroupTaskMapper extends BaseMapper {
/**
@@ -53,14 +54,6 @@ public interface WePresTagGroupTaskMapper extends BaseMapper
@Param("endTime") String endTime
);
- /**
- * 检测任务名是否已被占用
- *
- * @param taskName 任务名
- * @return 是否被占用
- */
- int checkTaskNameUnique(String taskName);
-
/**
* 获取某员工的任务
*
@@ -70,4 +63,19 @@ public interface WePresTagGroupTaskMapper extends BaseMapper
*/
List getTaskListByEmplId(@Param("emplId") String emplId, @Param("isDone") boolean isDone);
+ /**
+ * 根据task获取员工信息
+ * @param task
+ * @return
+ */
+ List selectStaffList(WePresTagGroupTask task);
+
+ List selectExternalUserIds(
+ @Param("taskId") Long taskId,
+ @Param("hasScope") boolean hasScope,
+ @Param("hasTag") boolean hasTag,
+ @Param("gender") Integer gender,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime
+ );
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTaskFissionMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTaskFissionMapper.java
index 5727810cd1af129cc007b161b60da843cf2a0b0d..b3c710389fd5939dae95b0d3cd134dbbcf8329eb 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTaskFissionMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeTaskFissionMapper.java
@@ -1,5 +1,6 @@
package com.linkwechat.wecom.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linkwechat.wecom.domain.WeTaskFission;
import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
* @author leejoker
* @date 2021-01-20
*/
-public interface WeTaskFissionMapper {
+public interface WeTaskFissionMapper extends BaseMapper {
/**
* 查询任务宝
*
@@ -58,4 +59,10 @@ public interface WeTaskFissionMapper {
* @return 结果
*/
public int deleteWeTaskFissionByIds(Long[] ids);
+
+ /**
+ * 更新过期任务
+ * @return
+ */
+ public void updateExpiredWeTaskFission();
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeUserMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeUserMapper.java
index 5ff24a15341ccfcf7ab864fe7a2eaf6b344020f3..d4fa04d8f6e062f67c728d4883d61ca7bb75351a 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeUserMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeUserMapper.java
@@ -7,7 +7,6 @@ import com.linkwechat.wecom.domain.vo.WeAllocateCustomersVo;
import com.linkwechat.wecom.domain.vo.WeAllocateGroupsVo;
import com.linkwechat.wecom.domain.vo.WeLeaveUserVo;
import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
import java.util.List;
@@ -17,7 +16,6 @@ import java.util.List;
* @author ruoyi
* @date 2020-08-31
*/
-@Repository
public interface WeUserMapper extends BaseMapper
{
/**
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeAccessTokenService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeAccessTokenService.java
index 5aa4fa6d77c7331c314b27636e70f712b6a6e7c6..69c151e3219bf241215e0babbc156a1442975407 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeAccessTokenService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeAccessTokenService.java
@@ -1,5 +1,8 @@
package com.linkwechat.wecom.service;
+import com.linkwechat.common.core.domain.entity.WeCorpAccount;
+import com.linkwechat.wecom.domain.WeApp;
+
/**
* @description: 微信token相关接口
* @author: My
@@ -21,5 +24,7 @@ public interface IWeAccessTokenService {
public String findThirdAppAccessToken(String agentId);
- public void removeToken();
+
+
+ public void removeToken(WeCorpAccount wxCorpAccount);
}
\ No newline at end of file
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCategoryService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCategoryService.java
index bbcaf3d808b74522753d23eeb332f9e6857965c9..b555f4bcd674a0d73b342b01b570817ade6b21a2 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCategoryService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCategoryService.java
@@ -1,5 +1,6 @@
package com.linkwechat.wecom.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.linkwechat.common.core.domain.Tree;
import com.linkwechat.wecom.domain.WeCategory;
import com.linkwechat.wecom.domain.vo.WeCategoryVo;
@@ -7,39 +8,23 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
-public interface IWeCategoryService {
+public interface IWeCategoryService extends IService {
/**
* 保存素材分类
*
* @param category 素材分类 信息
- * @return {@link int}
*/
- int insertWeCategory(WeCategory category);
+ void insertWeCategory(WeCategory category);
/**
* 保存素材分类
*
* @param category 素材分类 信息
- * @return {@link int}
*/
- int updateWeCategory(WeCategory category);
+ void updateWeCategory(WeCategory category);
- /**
- * 删除分类信息
- *
- * @param id 主键id
- * @return {@link int}
- */
- int deleteWeCategoryById(Long id);
- /**
- * 批量删除
- *
- * @param ids id列表
- * @return {@link int}
- */
- int deleteWeCategoryByIds(Long[] ids);
/**
* 通过类型查询对应类目的分类信息列表
@@ -49,12 +34,8 @@ public interface IWeCategoryService {
*/
List> findWeCategoryByMediaType(@Param("mediaType") String mediaType);
- /**
- * 通过id查询分类信息
- *
- * @param id 主键id
- * @return {@link WeCategory}
- */
- WeCategory findWeCategoryById(@Param("id") Long id);
+ void deleteWeCategoryById(Long[] ids);
+
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java
index e7b6a6487bcc6f42aabab81ca8a7cd489f7520b3..1a2296df730e57645e2608cfb491de3f54332483 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java
@@ -20,7 +20,7 @@ public interface IWeChatCollectionService extends IService {
* @param userId 用户id
* @return 结果
*/
- public int addCollection( Long materialId, String userId);
+ public boolean addCollection( Long materialId, String userId);
/**
* 取消收藏
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatContactMsgService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatContactMsgService.java
new file mode 100644
index 0000000000000000000000000000000000000000..a218888bb6e03be8b156d784000a5e34b85371b0
--- /dev/null
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatContactMsgService.java
@@ -0,0 +1,57 @@
+package com.linkwechat.wecom.service;
+
+import com.linkwechat.wecom.domain.WeChatContactMsg;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.linkwechat.wecom.domain.vo.WeChatContactMsgVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 会话消息Service接口
+ *
+ * @author ruoyi
+ * @date 2021-07-28
+ */
+public interface IWeChatContactMsgService extends IService {
+
+ /**
+ * 查询列表
+ */
+ List queryList(WeChatContactMsg weChatContactMsg);
+
+ /**
+ * 外部联系人 会话列表
+ * @param fromId 消息发送人id
+ * @return 会话列表
+ */
+ List selectExternalChatList(String fromId);
+
+ /**
+ * 单聊 会话列表
+ * @param weChatContactMsg 入参
+ * @return 会话列表
+ */
+ List selectAloneChatList(WeChatContactMsg weChatContactMsg);
+
+ /**
+ * 内部联系人 会话列表
+ * @param fromId 消息发送人id
+ * @return 会话列表
+ */
+ List selectInternalChatList(String fromId);
+
+ /**
+ * 群聊 会话列表
+ * @param fromId 消息发送人id
+ * @return 会话列表
+ */
+ List selectGroupChatList(String fromId);
+
+ /**
+ * 全文检索 会话列表
+ * @param weChatContactMsg 检索条件
+ * @return 会话列表
+ */
+ List selectFullSearchChatList(WeChatContactMsg weChatContactMsg);
+}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityKeywordToGroupService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityKeywordToGroupService.java
index b2a19620adb732c5bb5b9a3cac072c99b23639da..24596820f9a29278a1e97abc066e27f019626378 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityKeywordToGroupService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityKeywordToGroupService.java
@@ -1,26 +1,21 @@
package com.linkwechat.wecom.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.linkwechat.wecom.domain.WeKeywordGroupTask;
-import com.linkwechat.wecom.domain.vo.WeKeywordGroupTaskVo;
import java.util.List;
/**
* 社区运营 - 关键词拉群任务Service
*/
-public interface IWeCommunityKeywordToGroupService {
+public interface IWeCommunityKeywordToGroupService extends IService {
/**
* 根据过滤条件获取关键词拉群任务列表
- *
- * @param taskName 任务名称
- * @param createBy 创建人
- * @param keyword 关键词
- * @param beginTime 开始时间
- * @param endTime 结束时间
- * @return 列表数据
+ * @param task 查询信息
+ * @return 结果
*/
- List getTaskList(String taskName, String createBy, String keyword, String beginTime, String endTime);
+ List getTaskList(WeKeywordGroupTask task);
/**
* 根据id获取任务性情
@@ -28,25 +23,22 @@ public interface IWeCommunityKeywordToGroupService {
* @param taskId 任务id
* @return 结果
*/
- WeKeywordGroupTaskVo getTaskById(Long taskId);
+ WeKeywordGroupTask getTaskById(Long taskId);
/**
* 创建新任务
*
- * @param task 待存储的对象
- * @param keywords 关键词
+ * @param task 任务信息
* @return 结果
*/
- int addTask(WeKeywordGroupTask task, String[] keywords);
+ int addTask(WeKeywordGroupTask task);
/**
* 对指定任务进行更新
- *
- * @param task 待更新对象
- * @param keywords 关键词
+ * @param task 任务信息
* @return 结果
*/
- int updateTask(WeKeywordGroupTask task, String[] keywords);
+ int updateTask(WeKeywordGroupTask task);
/**
* 根据id列表批量删除任务
@@ -59,11 +51,10 @@ public interface IWeCommunityKeywordToGroupService {
/**
* 检测任务名是否唯一
*
- * @param taskName 任务名
+ * @param task 任务信息
* @return 结果
*/
- boolean taskNameIsUnique(String taskName);
-
+ boolean isNameOccupied(WeKeywordGroupTask task);
/**
* 通过名称或者关键词进行过滤
@@ -71,5 +62,5 @@ public interface IWeCommunityKeywordToGroupService {
* @param word 过滤字段
* @return 结果
*/
- List filterByNameOrKeyword(String word);
+ List filterByNameOrKeyword(String word);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityNewGroupService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityNewGroupService.java
index a44ce8b157e3e9d1e2a2ab5cdd40f9307e60fb90..2c7e9b84eb1c6cd14f414edb32fdbfc0a43c1447 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityNewGroupService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCommunityNewGroupService.java
@@ -27,9 +27,10 @@ public interface IWeCommunityNewGroupService extends IService selectWeCommunityNewGroupList(String emplCodeName, String createBy, String beginTime, String endTime);
+ List selectWeCommunityNewGroupList(WeCommunityNewGroup weCommunityNewGroup);
/**
* 获取新客自动拉群详细信息
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCorpAccountService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCorpAccountService.java
index 75374cfc744346178183e025793e741a33e9323f..282613f65ebbc65449a866552594d0a12ad947fb 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCorpAccountService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCorpAccountService.java
@@ -1,40 +1,17 @@
package com.linkwechat.wecom.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.linkwechat.common.core.domain.entity.WeCorpAccount;
-import java.util.List;
-
/**
* 企业id相关配置Service接口
*
* @author ruoyi
* @date 2020-08-24
*/
-public interface IWeCorpAccountService
+public interface IWeCorpAccountService extends IService
{
- /**
- * 查询企业id相关配置
- *
- * @param id 企业id相关配置ID
- * @return 企业id相关配置
- */
- public WeCorpAccount selectWeCorpAccountById(Long id);
- /**
- * 查询企业id相关配置列表
- *
- * @param wxCorpAccount 企业id相关配置
- * @return 企业id相关配置集合
- */
- public List selectWeCorpAccountList(WeCorpAccount wxCorpAccount);
-
- /**
- * 新增企业id相关配置
- *
- * @param wxCorpAccount 企业id相关配置
- * @return 结果
- */
- public int insertWeCorpAccount(WeCorpAccount wxCorpAccount);
/**
* 修改企业id相关配置
@@ -42,7 +19,7 @@ public interface IWeCorpAccountService
* @param wxCorpAccount 企业id相关配置
* @return 结果
*/
- public int updateWeCorpAccount(WeCorpAccount wxCorpAccount);
+ void updateWeCorpAccount(WeCorpAccount wxCorpAccount);
@@ -51,27 +28,27 @@ public interface IWeCorpAccountService
*
* @return 结果
*/
- public WeCorpAccount findValidWeCorpAccount();
+ WeCorpAccount findValidWeCorpAccount();
/**
* 启用有效的企业微信账号
* @param corpId
*/
- public int startVailWeCorpAccount(String corpId);
+ int startVailWeCorpAccount(String corpId);
/**
* 客户流失通知开关
* @param status 开关状态
* @return
*/
- public int startCustomerChurnNoticeSwitch(String status);
+ void startCustomerChurnNoticeSwitch(String status);
/**
* 客户流失通知开关查询
*/
- public String getCustomerChurnNoticeSwitch();
+ String getCustomerChurnNoticeSwitch();
+
- WeCorpAccount findWeCorpByAccount(String corpAccount);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerMessagePushService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerMessagePushService.java
index 502489195f8bb5295d37d22fff9cd5e45070677f..35c6b9ebb9fdcb8ffb477b165f89bde3735dbcf9 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerMessagePushService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerMessagePushService.java
@@ -18,9 +18,9 @@ public interface IWeCustomerMessagePushService {
/**
* 新增群发消息发送
*
- *@param customerMessagePushDto 原始数据信息
+ *@param customerMessagePush 原始数据信息
*/
- public void addWeCustomerMessagePush(CustomerMessagePushDto customerMessagePushDto) throws JsonProcessingException, ParseException;
+ public void addWeCustomerMessagePush(CustomerMessagePushDto customerMessagePush) throws JsonProcessingException, ParseException, CloneNotSupportedException;
/**
* 群发消息列表
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerService.java
index a7164be33862d4ae8319d4f4b701c17cf14fae50..5baa36a956f6c2d3568dad0d69af86f5bbce1d35 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerService.java
@@ -128,6 +128,22 @@ public interface IWeCustomerService extends IService
void updateWeCustomerPortrait(WeCustomerPortrait weCustomerPortrait);
+ /**
+ * 查询全部客户列表
+ * @param weCustomer
+ * @return
+ */
+ public List selectWeCustomerAllList(WeCustomer weCustomer);
+
+ /**
+ * 查询企业微信客户列表,不查询一对多关系相关数据
+ *
+ * @param weCustomer 企业微信客户
+ * @return 企业微信客户集合
+ */
+ List selectWeCustomerListNoRel(WeCustomer weCustomer);
+
+
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerTrajectoryService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerTrajectoryService.java
index 700bc077641cfb2315fc2735cf60e4226a7f6d5d..00ce9bef189ed4262ad12da63cff5e2c0346445d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerTrajectoryService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeCustomerTrajectoryService.java
@@ -5,4 +5,9 @@ import com.linkwechat.wecom.domain.WeCustomerTrajectory;
public interface IWeCustomerTrajectoryService extends IService {
+ void waitHandleMsg(String url);
+
+
+ void inforMationNews(String userId,String externalUserid,Integer trajectoryType);
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeEmpleCodeService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeEmpleCodeService.java
index 3ade394fa8943aadaccec72751b0d89d3200c09d..3329dac7619ac3a4caecfd35a026db18851b155f 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeEmpleCodeService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeEmpleCodeService.java
@@ -22,14 +22,14 @@ public interface IWeEmpleCodeService extends IService
* @param id 员工活码ID
* @return 员工活码
*/
- public WeEmpleCode selectWeEmpleCodeById(Long id);
+ WeEmpleCode selectWeEmpleCodeById(Long id);
/**
* 批量查询员工活码
* @param ids 员工活码ID
* @return
*/
- public List selectWeEmpleCodeByIds(List ids);
+ List selectWeEmpleCodeByIds(List ids);
/**
* 查询员工活码列表
@@ -37,7 +37,7 @@ public interface IWeEmpleCodeService extends IService
* @param weEmpleCode 员工活码
* @return 员工活码集合
*/
- public List selectWeEmpleCodeList(WeEmpleCode weEmpleCode);
+ List selectWeEmpleCodeList(WeEmpleCode weEmpleCode);
/**
* 新增员工活码
@@ -45,7 +45,7 @@ public interface IWeEmpleCodeService extends IService
* @param weEmpleCode 员工活码
* @return 结果
*/
- public void insertWeEmpleCode(WeEmpleCode weEmpleCode);
+ void insertWeEmpleCode(WeEmpleCode weEmpleCode);
/**
* 修改员工活码
@@ -53,7 +53,7 @@ public interface IWeEmpleCodeService extends IService
* @param weEmpleCode 员工活码
* @return 结果
*/
- public void updateWeEmpleCode(WeEmpleCode weEmpleCode);
+ void updateWeEmpleCode(WeEmpleCode weEmpleCode);
// /**
// * 批量删除员工活码
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupCodeService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupCodeService.java
index 439bbbda9c9ac9f7181c2b4475fe65db8c405c04..fc98b96b568b5a8a8aa6d1c4451b49099470837c 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupCodeService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupCodeService.java
@@ -14,13 +14,6 @@ import org.springframework.web.multipart.MultipartFile;
* @date 2020-10-07
*/
public interface IWeGroupCodeService extends IService {
- /**
- * 查询客户群活码
- *
- * @param id 客户群活码ID
- * @return 客户群活码
- */
- WeGroupCode selectWeGroupCodeById(Long id);
/**
* 根据群活码id查询实际码列表
@@ -28,7 +21,7 @@ public interface IWeGroupCodeService extends IService {
* @param groupCodeId 群活码id
* @return 结果
*/
- List selectActualListByGroupCodeId(Long groupCodeId);
+ List selectActualList(Long groupCodeId);
/**
* 查询客户群活码列表
@@ -38,19 +31,10 @@ public interface IWeGroupCodeService extends IService {
*/
List selectWeGroupCodeList(WeGroupCode weGroupCode);
- /**
- * 根据群活码id查询群活码列表
- *
- * @param ids id列表
- * @return 结果
- */
- List selectWeGroupCodeListByIds(List ids);
-
/**
* 新增客户群活码
*
* @param weGroupCode 客户群活码
- * @return 结果
*/
void insertWeGroupCode(WeGroupCode weGroupCode);
@@ -79,19 +63,19 @@ public interface IWeGroupCodeService extends IService {
int deleteWeGroupCodeById(Long id);
/**
- * 检测活码名称是否唯一
+ * 检测活码名称是否被占用
*
* @param weGroupCode 活码对象
* @return 结果
*/
- boolean checkActivityNameUnique(WeGroupCode weGroupCode);
+ boolean isNameOccupied(WeGroupCode weGroupCode);
/**
- * 根据 uuid获取群活码
+ * 通过员工活码获取群活码，用于新客自动拉群。
*
- * @param uuid uuid
- * @return 结果
+ * @param state 员工活码state
+ * @return 群活码URL
*/
- WeGroupCode getWeGroupByUuid(String uuid);
+ String selectGroupCodeUrlByEmplCodeState(String state);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupMemberService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupMemberService.java
index 8c3a08d7c656eb323f40aeff125cb7aae8bc9cf0..62302e08446bb3e50e4d4ad8fec4771d9af5ba22 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupMemberService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupMemberService.java
@@ -17,4 +17,5 @@ public interface IWeGroupMemberService extends IService {
List selectWeGroupMemberListByChatId(String chatId);
+ WeGroupMember selectWeGroupMemberByUnionId(String chatId, String unionId);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupSopService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupSopService.java
index 8fedc64e244fc64c7f87b014dde8499351b4ce43..193c73edcf2c0b462126bfedcb407fc657a46fe8 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupSopService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeGroupSopService.java
@@ -1,17 +1,16 @@
package com.linkwechat.wecom.service;
-import com.linkwechat.wecom.domain.WeGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.linkwechat.wecom.domain.WeGroupSop;
import com.linkwechat.wecom.domain.vo.WeCommunityTaskEmplVo;
import com.linkwechat.wecom.domain.vo.WeGroupSopVo;
-import com.linkwechat.wecom.domain.vo.WeKeywordGroupTaskVo;
import java.util.List;
/**
* 社区运营 群sop service接口
*/
-public interface IWeGroupSopService {
+public interface IWeGroupSopService extends IService {
/**
* 通过规则id获取sop规则
@@ -65,15 +64,8 @@ public interface IWeGroupSopService {
int batchRemoveGroupSopByIds(Long[] ids);
/**
- * 校验规则名是否唯一
+ * 根据员工id获取对应的sop任务列表
*
- * @param ruleName 规则名
- * @return 是否唯一
- */
- boolean isRuleNameUnique(String ruleName);
-
- /**
- * 根据员工id获取对应的sop任务列表
* @param emplId 员工id
* @param isDone 已完成还是待处理
* @return 结果
@@ -99,7 +91,16 @@ public interface IWeGroupSopService {
/**
* 向指定的群聊进行sop企微消息推送
+ *
* @param groupIdList 群聊id列表
*/
void sendMessage(List groupIdList);
+
+ /**
+ * 规则名是否已被占用
+ *
+ * @param groupSop 规则信息
+ * @return 是否被占用
+ */
+ boolean isNameOccupied(WeGroupSop groupSop);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeMaterialService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeMaterialService.java
index c86e57fd4d7d0bcfb92892b3fca639eedb6aec73..a6eaddb82e4c97fbf95790f87abc5ec9dba5acae 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeMaterialService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeMaterialService.java
@@ -48,7 +48,7 @@ public interface IWeMaterialService {
* @param ids id列表
* @return {@link int}
*/
- int deleteWeMaterialByIds(Long[] ids);
+ void deleteWeMaterialByIds(Long[] ids);
/**
* 更新素材信息
@@ -84,14 +84,6 @@ public interface IWeMaterialService {
*/
void resetCategory(String categoryId, String materials);
- /**
- * 上传企微临时素材
- * @param url 素材路径
- * @param type 素材类型
- * @return
- */
- public WeMediaDto uploadTemporaryMaterial(String url, String type);
-
/**
* 上传企微临时素材
@@ -102,4 +94,10 @@ public interface IWeMaterialService {
*/
public WeMediaDto uploadTemporaryMaterial(String url, String type,String name);
+ /**
+ * 上传素材图片
+ * @param file
+ * @return
+ */
+ WeMediaDto uploadImg(MultipartFile file);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWePresTagGroupTaskService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWePresTagGroupTaskService.java
index 44b814a5dfd0d208f2bd98986b0740094c419348..7c5fdab06433e1d176d3c47dd98a27194402799b 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWePresTagGroupTaskService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWePresTagGroupTaskService.java
@@ -6,6 +6,7 @@ import com.linkwechat.wecom.domain.dto.WePresTagGroupTaskDto;
import com.linkwechat.wecom.domain.vo.WeCommunityTaskEmplVo;
import com.linkwechat.wecom.domain.vo.WePresTagGroupTaskVo;
import com.linkwechat.wecom.domain.vo.WePresTagGroupTaskStatVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -16,8 +17,9 @@ public interface IWePresTagGroupTaskService {
/**
* 添加新标签建群任务
- * @param task 建群任务本体信息
- * @param tagIdList 标签列表
+ *
+ * @param task 建群任务本体信息
+ * @param tagIdList 标签列表
* @param emplIdList 员工列表
* @return 结果
*/
@@ -54,20 +56,12 @@ public interface IWePresTagGroupTaskService {
/**
* 更新老客户标签建群任务
*
+ * @param taskId 待更新任务id
* @param wePresTagGroupTaskDto 更新数据
- * @return 结果
- * @taskId 待更新任务id
+ * @return 更新条数
*/
int updateTask(Long taskId, WePresTagGroupTaskDto wePresTagGroupTaskDto);
- /**
- * 检测任务名是否已存在
- *
- * @param taskName 任务名
- * @return 结果
- */
- boolean checkTaskNameUnique(String taskName);
-
/**
* 通过老客标签建群id获取其统计信息
*
@@ -113,7 +107,25 @@ public interface IWePresTagGroupTaskService {
/**
* 根据标签建群任务信息发送消息
+ *
* @param task 标签建群任务
*/
- void sendMessage(WePresTagGroupTask task);
+ void sendMessage(WePresTagGroupTask task, List externalIds);
+
+ /**
+ * 任务名是否已占用
+ *
+ * @param task 任务信息
+ * @return 名称是否占用
+ */
+ boolean isNameOccupied(WePresTagGroupTask task);
+
+ List selectExternalUserIds(
+ Long taskId,
+ boolean hasScope,
+ boolean hasTag,
+ Integer gender,
+ String beginTime,
+ String endTime
+ );
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionCompleteRecordService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionCompleteRecordService.java
index 066beea0f397c9d37468efe7a2107a8d34e6db4f..f02e1c3783b10c6b3f228d02318bc99c9f96150e 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionCompleteRecordService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionCompleteRecordService.java
@@ -6,6 +6,7 @@ import com.linkwechat.wecom.domain.WeTaskFissionCompleteRecord;
import java.util.Date;
import java.util.List;
+import java.util.Set;
/**
* 裂变任务完成记录Service接口
@@ -63,4 +64,18 @@ public interface IWeTaskFissionCompleteRecordService extends IService statisticCompleteRecords(Long taskFissionId, Date startTime, Date endTime);
+
+ /**
+ * 根据任务id查询裂变任务完成记录列表
+ * @param taskFissionIds 任务id
+ * @return
+ */
+ List getListByTaskIds(Set taskFissionIds);
+
+ /**
+ * 根据任务id查询裂变任务完成记录列表
+ * @param taskFissionId
+ * @return
+ */
+ List getCompleteListByTaskId(Long taskFissionId);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionService.java
index b284693178335208de3de95d08c6e4220c110207..533f186fd6efde91c0c94d690b3fc5e2b296a9cd 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeTaskFissionService.java
@@ -1,5 +1,6 @@
package com.linkwechat.wecom.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.linkwechat.wecom.domain.WeCustomer;
import com.linkwechat.wecom.domain.WeTaskFission;
import com.linkwechat.wecom.domain.dto.WeChatUserDTO;
@@ -17,7 +18,7 @@ import java.util.List;
* @author leejoker
* @date 2021-01-20
*/
-public interface IWeTaskFissionService {
+public interface IWeTaskFissionService extends IService {
/**
* 查询任务宝
*
@@ -94,4 +95,17 @@ public interface IWeTaskFissionService {
WeTaskFissionStatisticVO taskFissionStatistic(Long taskFissionId, Date startTime, Date endTime);
WeTaskFissionProgressVO getCustomerTaskProgress(WeTaskFission taskFission, String eid);
+
+ /**
+ * 更新过期任务
+ * @return
+ */
+ public void updateExpiredWeTaskFission();
+
+ /**
+ * 根据群活码id 查询任务列表
+ * @param groupCodeId 群活码id
+ * @return
+ */
+ List getTaskFissionListByGroupCodeId(Long groupCodeId);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java
index 5ea459b1cbc3c4cc637980c35670ec4940624319..3169e0d72a545c0adc9b1cc7adc2ae627d45a018 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAccessTokenServiceImpl.java
@@ -1,10 +1,12 @@
package com.linkwechat.wecom.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.linkwechat.common.config.RuoYiConfig;
import com.linkwechat.common.constant.Constants;
import com.linkwechat.common.constant.WeConstans;
import com.linkwechat.common.core.redis.RedisCache;
import com.linkwechat.common.exception.wecom.WeComException;
+import com.linkwechat.common.utils.SecurityUtils;
import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.wecom.client.WeAccessTokenClient;
import com.linkwechat.wecom.domain.WeApp;
@@ -42,6 +44,10 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
private IWeAppService iWeAppService;
+ @Autowired
+ private RuoYiConfig ruoYiConfig;
+
+
/**
* 获取通用accessToken
@@ -106,6 +112,15 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
.eq(WeApp::getAgentId, agentId)
.eq(WeApp::getDelFlag, Constants.NORMAL_CODE)
.eq(WeApp::getStatus, Constants.NORMAL_CODE));
+
+ return findThirdAppAccessToken(weApp);
+
+ }
+
+
+ private String findThirdAppAccessToken(WeApp weApp){
+
+
if(weApp == null){
throw new WeComException("当前agentId不可用或不存在");
}
@@ -118,14 +133,15 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
WeAccessTokenDtoDto weAccessTokenDtoDto
= accessTokenClient.getToken(wxCorpAccount.getCorpId(),weApp.getAgentSecret());
- token=weAccessTokenDtoDto.getAccess_token();
- if(StringUtils.isNotEmpty(token)){
- redisCache.setCacheObject(WeConstans.WE_THIRD_APP_TOKEN+"::"+agentId,token,weAccessTokenDtoDto.getExpires_in().intValue(), TimeUnit.SECONDS);
+ if(StringUtils.isNotEmpty(weAccessTokenDtoDto.getAccess_token())){
+
+ redisCache.setCacheObject(WeConstans.WE_THIRD_APP_TOKEN+"::"+weApp.getAgentId(),weAccessTokenDtoDto.getAccess_token(),weAccessTokenDtoDto.getExpires_in().intValue(), TimeUnit.SECONDS);
}
- return token;
+ return weAccessTokenDtoDto.getAccess_token();
+
}
@@ -133,16 +149,32 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
private String findAccessToken(String accessTokenKey){
- String weAccessToken =redisCache.getCacheObject(accessTokenKey);
+ return ruoYiConfig.isStartTenant()?findAccessTokenForTenant(accessTokenKey):findAccessTokenForNoTenant(accessTokenKey);
+
+ }
+
+
+
+ //多租户环境下获取token
+ private String findAccessTokenForTenant(String accessTokenKey){
+
+
+ WeCorpAccount wxCorpAccount
+ = SecurityUtils.getLoginUser().getUser().getWeCorpAccount();
+
+ if(null == wxCorpAccount){
+ //返回错误异常，让用户绑定企业id相关信息
+ throw new WeComException("无可用的corpid和secret");
+ }
+
+
+ String weAccessToken =redisCache.getCacheObject(accessTokenKey+"::"+wxCorpAccount.getCorpId());
+
+
//为空,请求微信服务器同时缓存到redis中
if(StringUtils.isEmpty(weAccessToken)){
- WeCorpAccount wxCorpAccount
- = iWxCorpAccountService.findValidWeCorpAccount();
- if(null == wxCorpAccount){
- //返回错误异常，让用户绑定企业id相关信息
- throw new WeComException("无可用的corpid和secret");
- }
+
String token="";
Long expires_in=null;
if(WeConstans.WE_COMMON_ACCESS_TOKEN.equals(accessTokenKey) || WeConstans.WE_CONTACT_ACCESS_TOKEN.equals(accessTokenKey)){
@@ -166,13 +198,59 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
}
if(StringUtils.isNotEmpty(token)){
- redisCache.setCacheObject(accessTokenKey,token,expires_in.intValue(), TimeUnit.SECONDS);
+ redisCache.setCacheObject(accessTokenKey+"::"+wxCorpAccount.getCorpId(),token,expires_in.intValue(), TimeUnit.SECONDS);
weAccessToken = token;
}
}
-
return weAccessToken;
+
+
+ }
+
+
+ //非多租户环境下获取token
+ private String findAccessTokenForNoTenant(String accessTokenKey){
+ String weAccessToken =redisCache.getCacheObject(accessTokenKey);
+
+ //为空,请求微信服务器同时缓存到redis中
+ if(StringUtils.isEmpty(weAccessToken)){
+ WeCorpAccount wxCorpAccount
+ = iWxCorpAccountService.findValidWeCorpAccount();
+ if(null == wxCorpAccount){
+ //返回错误异常，让用户绑定企业id相关信息
+ throw new WeComException("无可用的corpid和secret");
+ }
+ String token="";
+ Long expires_in=null;
+ if(WeConstans.WE_COMMON_ACCESS_TOKEN.equals(accessTokenKey) || WeConstans.WE_CONTACT_ACCESS_TOKEN.equals(accessTokenKey)){
+ WeAccessTokenDtoDto weAccessTokenDtoDto = accessTokenClient.getToken(wxCorpAccount.getCorpId(),
+ WeConstans.WE_COMMON_ACCESS_TOKEN.equals(accessTokenKey) ? wxCorpAccount.getCorpSecret() : wxCorpAccount.getContactSecret());
+ token=weAccessTokenDtoDto.getAccess_token();
+ expires_in=weAccessTokenDtoDto.getExpires_in();
+
+ }else if(WeConstans.WE_PROVIDER_ACCESS_TOKEN.equals(accessTokenKey)){
+ WeAccessTokenDtoDto providerToken = accessTokenClient.getProviderToken(wxCorpAccount.getCorpId(), wxCorpAccount.getProviderSecret());
+ token=providerToken.getProvider_access_token();
+ expires_in=providerToken.getExpires_in();
+ }else if (WeConstans.WE_CHAT_ACCESS_TOKEN.equals(accessTokenKey)){
+ WeAccessTokenDtoDto weAccessTokenDtoDto = accessTokenClient.getToken(wxCorpAccount.getCorpId(),wxCorpAccount.getChatSecret());
+ token=weAccessTokenDtoDto.getAccess_token();
+ expires_in=weAccessTokenDtoDto.getExpires_in();
+ }else if (WeConstans.WE_AGENT_ACCESS_TOKEN.equals(accessTokenKey)){
+ WeAccessTokenDtoDto weAccessTokenDtoDto = accessTokenClient.getToken(wxCorpAccount.getCorpId(),wxCorpAccount.getAgentSecret());
+ token=weAccessTokenDtoDto.getAccess_token();
+ expires_in=weAccessTokenDtoDto.getExpires_in();
+ }
+
+ if(StringUtils.isNotEmpty(token)){
+ redisCache.setCacheObject(accessTokenKey,token,expires_in.intValue(), TimeUnit.SECONDS);
+ weAccessToken = token;
+ }
+
+ }
+
+ return weAccessToken;
}
@@ -180,10 +258,17 @@ public class WeAccessTokenServiceImpl implements IWeAccessTokenService {
* 清空redis中的相关token
*/
@Override
- public void removeToken() {
- redisCache.deleteObject(WeConstans.WE_COMMON_ACCESS_TOKEN);
- redisCache.deleteObject(WeConstans.WE_CONTACT_ACCESS_TOKEN);
- redisCache.deleteObject(WeConstans.WE_PROVIDER_ACCESS_TOKEN);
+ public void removeToken(WeCorpAccount wxCorpAccount) {
+ if(ruoYiConfig.isStartTenant()){
+ redisCache.deleteObject(WeConstans.WE_COMMON_ACCESS_TOKEN+"::"+wxCorpAccount.getAgentId());
+ redisCache.deleteObject(WeConstans.WE_CONTACT_ACCESS_TOKEN+"::"+wxCorpAccount.getAgentId());
+ redisCache.deleteObject(WeConstans.WE_PROVIDER_ACCESS_TOKEN+"::"+wxCorpAccount.getAgentId());
+ }else{
+ redisCache.deleteObject(WeConstans.WE_COMMON_ACCESS_TOKEN);
+ redisCache.deleteObject(WeConstans.WE_CONTACT_ACCESS_TOKEN);
+ redisCache.deleteObject(WeConstans.WE_PROVIDER_ACCESS_TOKEN);
+ }
+
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAppServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAppServiceImpl.java
index 80fd45115bc19b987e140cf91e58f4ab0f2f74c5..23e537fb7d3d560317f4dc861dae803e6bd51ff4 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAppServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeAppServiceImpl.java
@@ -11,6 +11,7 @@ import com.linkwechat.wecom.domain.WeDepartment;
import com.linkwechat.wecom.domain.dto.WeAppDetailDto;
import com.linkwechat.wecom.domain.dto.WeAppDto;
import com.linkwechat.wecom.mapper.WeAppMapper;
+import com.linkwechat.wecom.service.IWeAccessTokenService;
import com.linkwechat.wecom.service.IWeAppService;
import com.linkwechat.wecom.service.IWeDepartmentService;
import com.linkwechat.wecom.service.IWeUserService;
@@ -43,6 +44,10 @@ public class WeAppServiceImpl extends ServiceImpl implements
IWeUserService iWeUserService;
+ @Autowired
+ IWeAccessTokenService iWeAccessTokenService;
+
+
/**
* 保存应用
* @param weApp
@@ -51,6 +56,7 @@ public class WeAppServiceImpl extends ServiceImpl implements
@Transactional
public void addWeApp(WeApp weApp) {
+
if(null !=this.getOne(new LambdaQueryWrapper()
.eq(WeApp::getAgentId, weApp.getAgentId())
.eq(WeApp::getDelFlag, Constants.SUCCESS))){
@@ -58,18 +64,24 @@ public class WeAppServiceImpl extends ServiceImpl implements
}
+ weApp.setCreateTime(new Date());
+ if(this.save(weApp)){
+ WeAppDetailDto weAppDetailDto
+ = weAppClient.findAgentById(weApp.getAgentId());
+ if(null != weAppDetailDto){
+
+ weApp.setAgentName(weAppDetailDto.getName());
+ weApp.setCreateTime(new Date());
+ weApp.setSquareLogoUrl(weAppDetailDto.getSquare_logo_url());
+ weApp.setDescription(weAppDetailDto.getDescription());
+ weApp.setAllowPartys(StringUtils.join(weAppDetailDto.getAllow_partys().getPartyid(),","));
+ weApp.setAllowUserinfos(StringUtils.join(weAppDetailDto.getAllow_userinfos().getUser(),","));
+ System.out.println("============================================");
+ this.updateById(weApp);
+ }
+ }
+
- WeAppDetailDto weAppDetailDto
- = weAppClient.findAgentById(weApp.getAgentId());
- if(null != weAppDetailDto){
- weApp.setAgentName(weAppDetailDto.getName());
- weApp.setCreateTime(new Date());
- weApp.setSquareLogoUrl(weAppDetailDto.getSquare_logo_url());
- weApp.setDescription(weAppDetailDto.getDescription());
- weApp.setAllowPartys(StringUtils.join(weAppDetailDto.getAllow_partys().getPartyid(),","));
- weApp.setAllowUserinfos(StringUtils.join(weAppDetailDto.getAllow_userinfos().getUser(),","));
- this.save(weApp);
- }
}
@@ -85,7 +97,7 @@ public class WeAppServiceImpl extends ServiceImpl implements
.logo_mediaid(weApp.getLogoMediaid())
.description(weApp.getDescription())
.name(weApp.getAgentName())
- .build()
+ .build(),weApp.getAgentId()
);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCategoryServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCategoryServiceImpl.java
index df8426a4aba6f4df1dd5f5c15bbd39748cdbc804..282d815324c3178d4488d79afd0f02013de3811d 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCategoryServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCategoryServiceImpl.java
@@ -1,6 +1,9 @@
package com.linkwechat.wecom.service.impl;
import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.linkwechat.common.constant.Constants;
import com.linkwechat.common.core.domain.Tree;
import com.linkwechat.common.exception.wecom.WeComException;
import com.linkwechat.common.utils.SnowFlakeUtil;
@@ -10,7 +13,6 @@ import com.linkwechat.wecom.domain.vo.WeCategoryVo;
import com.linkwechat.wecom.mapper.WeCategoryMapper;
import com.linkwechat.wecom.service.IWeCategoryService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -18,47 +20,49 @@ import java.util.List;
@Slf4j
@Service
-public class WeCategoryServiceImpl implements IWeCategoryService {
+public class WeCategoryServiceImpl extends ServiceImpl implements IWeCategoryService {
+
- @Autowired
- private WeCategoryMapper weCategoryMapper;
@Override
- public int insertWeCategory(WeCategory category) {
+ public void insertWeCategory(WeCategory category) {
//判断是否存在相同的名称
- WeCategory weCategory = weCategoryMapper.findWeCategoryByMediaTypeAndName(category.getMediaType(), category.getName());
+ WeCategory weCategory =this.getOne(new LambdaQueryWrapper()
+ .eq(WeCategory::getMediaType,category.getMediaType())
+ .eq(WeCategory::getName,category.getName())
+ .eq(WeCategory::getDelFlag, Constants.NORMAL_CODE));
if (null != weCategory) {
throw new WeComException("名称已存在！");
}
- category.setCreateTime(DateUtil.date());
+// category.setCreateTime(DateUtil.date());
category.setId(SnowFlakeUtil.nextId());
- return weCategoryMapper.insertWeCategory(category);
+ this.save(category);
}
@Override
- public int updateWeCategory(WeCategory category) {
+ public void updateWeCategory(WeCategory category) {
//判断是否存在相同的名称
- WeCategory weCategory = weCategoryMapper.findWeCategoryByMediaTypeAndName(category.getMediaType(), category.getName());
+ WeCategory weCategory =this.getOne(new LambdaQueryWrapper()
+ .eq(WeCategory::getMediaType,category.getMediaType())
+ .eq(WeCategory::getName,category.getName())
+ .eq(WeCategory::getDelFlag, Constants.NORMAL_CODE));
+
if (null != weCategory) {
throw new WeComException("名称已存在！");
}
- category.setUpdateTime(DateUtil.date());
- return weCategoryMapper.updateWeCategory(category);
+// category.setUpdateTime(DateUtil.date());
+ this.updateById(category);
}
- @Override
- public int deleteWeCategoryById(Long id) {
- return weCategoryMapper.deleteWeCategoryById(id);
- }
- @Override
- public int deleteWeCategoryByIds(Long[] ids) {
- return weCategoryMapper.deleteWeCategoryByIds(ids);
- }
+
+
@Override
public List> findWeCategoryByMediaType(String mediaType) {
- List weCategories = weCategoryMapper.findWeCategoryByMediaType(mediaType);
+ List weCategories = this.list(new LambdaQueryWrapper()
+ .eq(WeCategory::getMediaType,mediaType)
+ .eq(WeCategory::getDelFlag,Constants.NORMAL_CODE));
List weCategoryVos = new ArrayList<>();
weCategories.forEach(c -> {
WeCategoryVo weCategoryVo = new WeCategoryVo();
@@ -71,8 +75,8 @@ public class WeCategoryServiceImpl implements IWeCategoryService {
}
@Override
- public WeCategory findWeCategoryById(Long id) {
- return weCategoryMapper.findWeCategoryById(id);
+ public void deleteWeCategoryById(Long[] ids) {
+ this.baseMapper.deleteWeCategoryById(ids);
}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java
index d45d35bdd829219f28bfd4d4152876ff391f5994..06a9be4a4faa021cbdd63645f0eb8824bb5a2338 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java
@@ -27,18 +27,19 @@ public class WeChatCollectionServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>();
wrapper.eq("material_id",materialId).eq("user_id",userId);
WeChatCollection queryCollection = weChatCollectionMapper.selectOne(wrapper);
if(null!=queryCollection){
- throw new CustomException("你已收藏");
+ return false;
}
WeChatCollection chatCollection=new WeChatCollection();
chatCollection.setCollectionId(SnowFlakeUtil.nextId());
chatCollection.setMaterialId(materialId);
chatCollection.setUserId(userId);
- return weChatCollectionMapper.addCollection(chatCollection);
+ weChatCollectionMapper.addCollection(chatCollection);
+ return true;
}
@Override
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatContactMappingServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatContactMappingServiceImpl.java
index edcf0ba6ed2b786d617ed98db6d9da1a681486c6..15aad982e53eb1046fba69c57db45463d612f108 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatContactMappingServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatContactMappingServiceImpl.java
@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -94,7 +95,13 @@ public class WeChatContactMappingServiceImpl extends ServiceImpl().eq(WeUser::getUserId, item.getReceiveId())));
} else if (WeConstans.ID_TYPE_EX.equals(item.getIsCustom())) {
//获取外部联系人信息
- item.setReceiveWeCustomer(weCustomerMapper.selectWeCustomerById(item.getReceiveId()));
+ WeCustomer weCustomer = weCustomerMapper.selectWeCustomerById(item.getReceiveId());
+ if(null == weCustomer){
+ weCustomer=new WeCustomer();
+ }
+ item.setReceiveWeCustomer(
+ weCustomer
+ );
} else if (WeConstans.ID_TYPE_MACHINE.equals(item.getIsCustom())) {
//拉去机器人信息暂不处理
}
@@ -233,7 +240,15 @@ public class WeChatContactMappingServiceImpl extends ServiceImpl weChatContactMappingList = this.baseMapper.selectList(lambdaQueryWrapper);
List resultList = Optional.ofNullable(weChatContactMappingList).orElseGet(ArrayList::new)
- .stream().map(item -> weCustomerMapper.selectWeCustomerById(item.getReceiveId())).collect(Collectors.toList());
+ .stream().map(item ->
+ weCustomerMapper.selectWeCustomerById(item.getReceiveId())
+ ).collect(Collectors.toList());
+
+ if(CollectionUtil.isNotEmpty(resultList)){
+ resultList.removeAll(Collections.singleton(null));
+ }
+
+
PageInfo weCustomerPageInfo = new PageInfo<>(resultList);
weCustomerPageInfo.setTotal(new PageInfo<>(weChatContactMappingList).getTotal());
return weCustomerPageInfo;
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatContactMsgServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatContactMsgServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..99845567e85741a478587e20b89edf1e90879bd1
--- /dev/null
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatContactMsgServiceImpl.java
@@ -0,0 +1,106 @@
+package com.linkwechat.wecom.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.linkwechat.wecom.domain.dto.WeGroupMemberDto;
+import com.linkwechat.wecom.domain.vo.WeChatContactMsgVo;
+import com.linkwechat.wecom.service.IWeGroupMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.commons.lang3.StringUtils;
+import com.linkwechat.wecom.mapper.WeChatContactMsgMapper;
+import com.linkwechat.wecom.domain.WeChatContactMsg;
+import com.linkwechat.wecom.service.IWeChatContactMsgService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 会话消息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-07-28
+ */
+@Service
+public class WeChatContactMsgServiceImpl extends ServiceImpl implements IWeChatContactMsgService {
+ @Autowired
+ private IWeGroupMemberService weGroupMemberService;
+
+ @Override
+ public List queryList(WeChatContactMsg weChatContactMsg) {
+ LambdaQueryWrapper lqw = Wrappers.lambdaQuery();
+ if (StringUtils.isNotBlank(weChatContactMsg.getMsgId())){
+ lqw.eq(WeChatContactMsg::getMsgId ,weChatContactMsg.getMsgId());
+ }
+ if (StringUtils.isNotBlank(weChatContactMsg.getFromId())){
+ lqw.and(wrapper -> wrapper.eq(WeChatContactMsg::getFromId ,weChatContactMsg.getFromId())
+ .or().eq(WeChatContactMsg::getToList,weChatContactMsg.getFromId()));
+ }
+ if (StringUtils.isNotBlank(weChatContactMsg.getToList())){
+ lqw.and(wrapper -> wrapper.eq(WeChatContactMsg::getFromId ,weChatContactMsg.getToList())
+ .or().eq(WeChatContactMsg::getToList,weChatContactMsg.getToList()));
+ }
+ if (StringUtils.isNotBlank(weChatContactMsg.getRoomId())){
+ lqw.eq(WeChatContactMsg::getRoomId ,weChatContactMsg.getRoomId());
+ }
+ if (StringUtils.isNotBlank(weChatContactMsg.getAction())){
+ lqw.eq(WeChatContactMsg::getAction ,weChatContactMsg.getAction());
+ }
+ if (StringUtils.isNotBlank(weChatContactMsg.getMsgType())){
+ lqw.eq(WeChatContactMsg::getMsgType ,weChatContactMsg.getMsgType());
+ }
+ if (weChatContactMsg.getMsgTime() != null){
+ lqw.and(wrapper -> wrapper.ge(WeChatContactMsg::getMsgTime,weChatContactMsg.getMsgTime())
+ .le(WeChatContactMsg::getMsgTime,weChatContactMsg.getMsgTime()));
+ }
+ if (StringUtils.isNotBlank(weChatContactMsg.getContact())){
+ lqw.like(WeChatContactMsg::getContact ,weChatContactMsg.getContact());
+ }
+ lqw.orderByDesc(WeChatContactMsg::getMsgTime);
+ return this.list(lqw);
+ }
+
+ @Override
+ public List selectExternalChatList(String fromId) {
+ return this.baseMapper.selectExternalChatList(fromId);
+ }
+
+ @Override
+ public List selectAloneChatList(WeChatContactMsg weChatContactMsg) {
+ return this.baseMapper.selectAloneChatList(weChatContactMsg);
+ }
+
+ @Override
+ public List selectInternalChatList(String fromId) {
+ return this.baseMapper.selectInternalChatList(fromId);
+ }
+
+ @Override
+ public List selectGroupChatList(String fromId) {
+ List weChatContactMsgVos = this.baseMapper.selectGroupChatList(fromId);
+ if(CollectionUtil.isNotEmpty(weChatContactMsgVos)){
+ weChatContactMsgVos.forEach(msg ->{
+ List weGroupMemberDtos = weGroupMemberService.selectWeGroupMemberListByChatId(msg.getReceiver());
+ if(CollectionUtil.isNotEmpty(weGroupMemberDtos)){
+ if(StringUtils.isEmpty(msg.getName())){
+ String names = weGroupMemberDtos.stream().map(WeGroupMemberDto::getMemberName)
+ .filter(StringUtils::isNotEmpty).collect(Collectors.joining(","));
+ msg.setName(names);
+ }
+ String avatars = weGroupMemberDtos.stream().map(WeGroupMemberDto::getMemberAvatar)
+ .filter(StringUtils::isNotEmpty).collect(Collectors.joining(","));
+ msg.setAvatar(avatars);
+ }
+ });
+ }
+ return this.baseMapper.selectGroupChatList(fromId);
+ }
+
+ @Override
+ public List selectFullSearchChatList(WeChatContactMsg weChatContactMsg) {
+ return this.baseMapper.selectFullSearchChatList(weChatContactMsg);
+ }
+}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCommunityKeywordToGroupServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCommunityKeywordToGroupServiceImpl.java
index 3f51bf1bfab36b838d9ce5f0581cb7f3b19c5bf1..eacb7ee3bc384afa3a0d23ca6573125182262f2a 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCommunityKeywordToGroupServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeCommunityKeywordToGroupServiceImpl.java
@@ -1,26 +1,17 @@
package com.linkwechat.wecom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.linkwechat.common.utils.StringUtils;
-import com.linkwechat.wecom.domain.WeGroupCode;
-import com.linkwechat.wecom.domain.WeKeywordGroupTaskKeyword;
+import com.linkwechat.common.constant.HttpStatus;
+import com.linkwechat.common.exception.CustomException;
import com.linkwechat.wecom.domain.WeKeywordGroupTask;
-import com.linkwechat.wecom.domain.vo.WeGroupCodeVo;
-import com.linkwechat.wecom.domain.vo.WeKeywordGroupTaskVo;
-import com.linkwechat.wecom.mapper.WeGroupCodeMapper;
-import com.linkwechat.wecom.mapper.WeKeywordGroupTaskKwMapper;
import com.linkwechat.wecom.mapper.WeKeywordGroupTaskMapper;
import com.linkwechat.wecom.service.IWeCommunityKeywordToGroupService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import java.util.*;
/**
* 社区运营 - 关键词拉群任务ServiceImpl
@@ -29,43 +20,14 @@ import java.util.stream.Collectors;
@Service
public class WeCommunityKeywordToGroupServiceImpl extends ServiceImpl implements IWeCommunityKeywordToGroupService {
- @Autowired
- private WeKeywordGroupTaskMapper taskMapper;
-
- @Autowired
- private WeKeywordGroupTaskKwMapper taskKwMapper;
-
- @Autowired
- private WeGroupCodeMapper groupCodeMapper;
-
/**
* 根据过滤条件获取关键词拉群任务列表
- *
- * @param taskName 任务名称
- * @param createBy 创建人
- * @param keyword 关键词
- * @param beginTime 开始时间
- * @param endTime 结束时间
- * @return 列表数据
+ * @param task 查询信息
+ * @return 结果
*/
@Override
- public List getTaskList(String taskName, String createBy, String keyword, String beginTime, String endTime) {
- List taskVoList = taskMapper.getTaskList(taskName, createBy, keyword, beginTime, endTime);
- for (WeKeywordGroupTaskVo taskVo : taskVoList) {
- // 查询关键词列表
- List taskKeywordList = this.getTaskKeywordList(taskVo.getTaskId());
- if (StringUtils.isNotEmpty(taskKeywordList)) {
- taskVo.setKeywordList(taskKeywordList);
- }
- // 群活码信息
- taskVo.setGroupCodeInfo(this.getGroupVoByTaskId(taskVo.getGroupCodeId()));
- // 通过群活码id查询对应的群
- List groupNameList = taskMapper.getGroupNameListByTaskId(taskVo.getTaskId());
- groupNameList.removeIf(Objects::isNull);
- taskVo.setGroupNameList(groupNameList);
- }
-
- return taskVoList;
+ public List getTaskList(WeKeywordGroupTask task) {
+ return baseMapper.getTaskList(task);
}
/**
@@ -75,72 +37,31 @@ public class WeCommunityKeywordToGroupServiceImpl extends ServiceImpl keywordList = this.getTaskKeywordList(taskId);
- if (StringUtils.isNotEmpty(keywordList)) {
- taskVo.setKeywordList(keywordList);
- }
- // 群活码
- taskVo.setGroupCodeInfo(this.getGroupVoByTaskId(taskVo.getGroupCodeId()));
- // 群聊名称列表
- List groupNameList = taskMapper.getGroupNameListByTaskId(taskVo.getTaskId());
- groupNameList.removeIf(Objects::isNull);
- taskVo.setGroupNameList(groupNameList);
- return taskVo;
+ public WeKeywordGroupTask getTaskById(Long taskId) {
+ return baseMapper.getTaskById(taskId);
}
/**
* 创建新任务
*
- * @param task 待存储的对象
- * @param keywords 关键词
+ * @param task 任务信息
* @return 结果
*/
@Override
- @Transactional
- public int addTask(WeKeywordGroupTask task, String[] keywords) {
- if (this.save(task)) {
- // 构建关键词对象并存储
- List taskKeywordList = Arrays
- .stream(keywords)
- .map(word -> new WeKeywordGroupTaskKeyword(task.getTaskId(), word))
- .collect(Collectors.toList());
- if (StringUtils.isNotEmpty(taskKeywordList)) {
- taskKwMapper.batchBindsTaskKeyword(taskKeywordList);
- }
- return 1;
- }
- return 0;
+ @Transactional(rollbackFor = Exception.class)
+ public int addTask(WeKeywordGroupTask task) {
+ return baseMapper.insert(task);
}
/**
* 对指定任务进行更新
- *
- * @param task 待更新对象
- * @param keywords 关键词
+ * @param task 任务信息
* @return 结果
*/
@Override
- @Transactional
- public int updateTask(WeKeywordGroupTask task, String[] keywords) {
- if (taskMapper.updateById(task) == 1) {
- // 删除原有的关键词
- QueryWrapper taskKwQueryWrapper = new QueryWrapper<>();
- taskKwQueryWrapper.eq("task_id", task.getTaskId());
- taskKwMapper.delete(taskKwQueryWrapper);
- // 再重新插入新的关键词
- List taskKeywordList = Arrays
- .stream(keywords)
- .map(word -> new WeKeywordGroupTaskKeyword(task.getTaskId(), word))
- .collect(Collectors.toList());
- if (StringUtils.isNotEmpty(taskKeywordList)) {
- taskKwMapper.batchBindsTaskKeyword(taskKeywordList);
- }
- return 1;
- }
- return 0;
+ @Transactional(rollbackFor = Exception.class)
+ public int updateTask(WeKeywordGroupTask task) {
+ return baseMapper.updateById(task);
}
/**
@@ -150,26 +71,9 @@ public class WeCommunityKeywordToGroupServiceImpl extends ServiceImpl taskKwQueryWrapper = new QueryWrapper<>();
- taskKwQueryWrapper.in("task_id", Arrays.asList(ids));
- taskKwMapper.delete(taskKwQueryWrapper);
- QueryWrapper taskQueryWrapper = new QueryWrapper<>();
- taskKwQueryWrapper.in("task_id", Arrays.asList(ids));
- return taskMapper.delete(taskQueryWrapper);
- }
-
- /**
- * 检测任务名是否唯一
- *
- * @param taskName 任务名
- * @return 结果
- */
- @Override
- public boolean taskNameIsUnique(String taskName) {
- return taskMapper.checkNameUnique(taskName) == 0;
+ return baseMapper.deleteBatchIds(Arrays.asList(ids));
}
/**
@@ -179,44 +83,22 @@ public class WeCommunityKeywordToGroupServiceImpl extends ServiceImpl filterByNameOrKeyword(String word) {
- List taskVoList = taskMapper.filterByNameOrKeyword(word);
- taskVoList.forEach(taskVo -> {
- // 关键词列表
- taskVo.setKeywordList(this.getTaskKeywordList(taskVo.getTaskId()));
- List groupNameList = taskMapper.getGroupNameListByTaskId(taskVo.getTaskId());
- // 群活码
- taskVo.setGroupCodeInfo(this.getGroupVoByTaskId(taskVo.getGroupCodeId()));
- // 群名称列表
- groupNameList.removeIf(StringUtils::isNull);
- taskVo.setGroupNameList(groupNameList);
- });
- return taskVoList;
+ public List filterByNameOrKeyword(String word) {
+ return baseMapper.filterByNameOrKeyword(word);
}
/**
- * 根据任务id获取关键词列表
+ * 任务名是否已被占用
*
- * @param taskId 任务id
- */
- private List getTaskKeywordList(Long taskId) {
- QueryWrapper