diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java
index 825cb6866..8ad2c2c07 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java
@@ -53,6 +53,9 @@ public class BussDocumentLibraryEO implements Serializable {
/**适用地区*/
@ApiModelProperty(value = "适用地区")
private java.lang.String region;
+ /**适用地区*/
+ @ApiModelProperty(value = "类别")
+ private java.lang.String lei4Bie2;
/**状态*/
@ApiModelProperty(value = "状态")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
index aa1e7acd8..806a6daaa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
@@ -12,6 +12,7 @@
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java
index e74043811..b1dba1d41 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/controller/LawsWarnController.java
@@ -60,4 +60,12 @@ public class LawsWarnController {
lawsWarnService.exportExcel(map,response,request);
}
+
+ @ApiOperation(value = "推送")
+ @GetMapping(value = "/warnPullMessage")
+// @RequiresPermissions("document:pullMessage")
+ public Result> pullMessage(String departIds,String userIds,String documentIds) {
+ lawsWarnService.warnPullMessage(departIds,userIds,documentIds);
+ return Result.OK("推送成功");
+ }
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
index 21215861f..ae530cdbb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
@@ -3,15 +3,23 @@ package com.jero.modules.warn.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.MessageTypeEnum;
import com.jero.common.constant.enums.ModuleEnum;
import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.LoginUser;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
+import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.system.entity.SysAnnouncement;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysAnnouncementService;
+import com.jero.modules.system.service.ISysDepartService;
+import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import com.jero.modules.system.util.StringUtils;
@@ -22,9 +30,13 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.yaml.snakeyaml.util.UriEncoder;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -32,9 +44,11 @@ import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -54,6 +68,16 @@ public class LawsWarnService {
private SysDictItemServiceImpl sysDictItemServiceImpl;
@Autowired
private OnlCgformFieldServiceImpl onlCgformFieldService;
+ @Autowired
+ private ISysDepartService sysDepartService;
+ @Autowired
+ private ISysUserService sysUserService;
+ @Value(value = "${jero.backUrl}")
+ private String backUrl;
+ @Autowired
+ private ISysAnnouncementService sysAnnouncementService;
+ @Resource
+ private IFeishuService iFeishuService;
public IPage getInfoPage(Map parameter) {
String cut = (String) parameter.get("cut");//中英文切换标识
@@ -248,6 +272,88 @@ public class LawsWarnService {
sheetNum++;
}
}
+ }
+
+ public String warnPullMessage(String departIds, String userIds, String documentIds) {
+ Set allDepartIds = new HashSet<>();
+ //查询当前部门下所有部门
+ if (StringUtils.isNotEmpty(departIds)) {
+ String[] departIdArr = departIds.split(",");
+ for (String departId : departIdArr) {
+ List subDepIdsByDepId = sysDepartService.getSubDepIdsByDepId(departId);
+ allDepartIds.addAll(subDepIdsByDepId);
+ }
+ }
+
+ List userIdList = new ArrayList<>();
+ List thirdIdList = new ArrayList<>();
+ if (StringUtils.isNotBlank(departIds)) {
+ //查询部门下的人员
+ List userList = new ArrayList<>();
+ if(allDepartIds.size() != 0){
+ userList = sysUserService.getUserListByDepIds(new ArrayList<>(allDepartIds));
+ }
+
+ if (userList.size() != 0) {
+ userIdList = userList.stream().map(SysUser::getId).distinct().collect(Collectors.toList());
+ thirdIdList = userList.stream().map(SysUser::getThirdId).distinct().collect(Collectors.toList());
+ }
+ }
+ if(userIdList.size() == 0 && StringUtils.isNotBlank(userIds)){
+ List sysUsers = sysUserService.listByIds(Arrays.asList(userIds.split(",")));
+ if(sysUsers.size() != 0){
+ List userId = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
+ List thirdId = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
+ userIdList.addAll(userId);
+ thirdIdList.addAll(thirdId);
+ }
+ }
+
+ //查询文档
+ List