Browse Source

Merge remote-tracking branch 'origin/dev_memo' into dev_memo

dev
sunyuchao 3 years ago
parent
commit
6ffb1e693f
  1. 4
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  2. 4
      epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  3. 58
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java
  4. 4
      epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  5. 4
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java
  6. 4
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java
  7. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  8. 4
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  9. 4
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  10. 4
      epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  11. 10
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  12. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  13. 28
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
  14. BIN
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx
  15. 4
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  16. 4
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  17. 4
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  18. 4
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  19. 4
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  20. 4
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  21. 4
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  22. 4
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  23. 4
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  24. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  25. 4
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  26. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java
  27. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java
  28. 4
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  29. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java
  30. 5
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
  31. 4
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  32. 4
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  33. 4
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  34. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  35. 4
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  36. 4
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  37. 4
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  38. 4
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  39. 10
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  40. 4
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  41. 37
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
  42. BIN
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/templates/party_import_template.xlsx
  43. 4
      epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  44. 4
      epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java
  45. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

4
epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

58
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java

@ -1,14 +1,18 @@
package com.epmet.commons.tools.utils;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
/**
* @author kamui
*/
@Slf4j
public class FileUtils {
/**
@ -62,4 +66,50 @@ public class FileUtils {
return createTmpFile(inputStream, name, ext, null);
}
/**
* 将classpath文件复制到宿主机
* @param fileName
* @return
* @throws IOException
*/
public static String copyClassPathResourcesToHostMachine(String fileName, String fileClassPath, String fileHostPath, Class loaderClass) throws IOException {
// 宿主机目录准备
if (StringUtils.isNotBlank(fileHostPath) && !fileHostPath.endsWith("/")) {
fileHostPath = fileHostPath.concat("/");
}
String homeDir = System.getProperty("user.home");
Path epmetFilesPath = Paths.get(homeDir, "epmet_files", fileHostPath);
if (Files.notExists(epmetFilesPath)) {
Files.createDirectories(epmetFilesPath);
}
Path templateFilePath = epmetFilesPath.resolve(fileName);
String templateFilePathStr = templateFilePath.toString();
if (Files.exists(templateFilePath)) {
return templateFilePathStr;
}
if (StringUtils.isNotBlank(fileClassPath) && !fileClassPath.endsWith("/")) {
fileClassPath = fileClassPath.concat("/");
}
// 将项目中的模板拷贝至用户家目录中
OutputStream os = null;
InputStream is = null;
try {
is = loaderClass.getClassLoader().getResourceAsStream(fileClassPath + fileName);
os = new FileOutputStream(templateFilePathStr);
IOUtils.copy(is, os);
} finally {
if (is != null) {
is.close();
}
if (os != null) {
os.close();
}
}
return templateFilePathStr;
}
}

4
epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
//// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

10
epmet-module/epmet-heart/epmet-heart-server/pom.xml

@ -122,6 +122,16 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>xls</nonFilteredFileExtension>
<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>

4
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

28
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@ -45,12 +45,16 @@ import com.epmet.service.IcCommunitySelfOrganizationService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
@ -181,6 +185,30 @@ public class IcCommunitySelfOrganizationController {
return new Result();
}
/**
* 下载社区自组织导入模板
* @param response
* @throws IOException
*/
@PostMapping("import-template-download")
public void downloadTemplate(HttpServletResponse response) throws IOException {
response.setCharacterEncoding("UTF-8");
response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-disposition");
//response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=社区自组织导入模板.xlsx");
InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/self_org_import_template.xlsx");
try {
ServletOutputStream os = response.getOutputStream();
IOUtils.copy(is, os);
} finally {
if (is != null) {
is.close();
}
}
}
/**
* @Description 添加社区自组织
* @param tokenDto

BIN
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx

Binary file not shown.

4
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

3
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java

@ -86,7 +86,8 @@ public class MemoConcernServiceImpl extends BaseServiceImpl<MemoConcernDao, Memo
insert(entity);
//保存属性
MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);;
MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);
attr.setId(entity.getId());
attr.setType(MemoConstant.WORK_DIARY);
attr.setReadFlag(NumConstant.ZERO);
attr.setReceiver(dto.getCreatedBy());

3
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java

@ -86,7 +86,8 @@ public class MemoWorkDiaryServiceImpl extends BaseServiceImpl<MemoWorkDiaryDao,
insert(entity);
//保存属性
MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);;
MemoAttrDTO attr = ConvertUtils.sourceToTarget(dto, MemoAttrDTO.class);
attr.setId(entity.getId());
attr.setType(MemoConstant.WORK_DIARY);
attr.setReadFlag(NumConstant.ZERO);
attr.setReceiver(dto.getCreatedBy());

4
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.info("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.info("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

5
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml

@ -97,6 +97,9 @@ mybatis-plus:
feign:
hystrix:
threadpool:
default:
coreSize: 50
enabled: true
client:
config:
@ -146,4 +149,4 @@ thread:
queueCapacity: @thread.threadPool.queue-capacity@
keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
threadNamePrefix: @thread.threadPool.thread-name-prefix@
rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@

4
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

10
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -120,6 +120,16 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>xls</nonFilteredFileExtension>
<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>

4
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

37
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@ -21,10 +21,12 @@ import com.baomidou.mybatisplus.extension.api.R;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.FileUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
@ -41,14 +43,21 @@ import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -173,4 +182,28 @@ public class IcPartymemberStyleController {
ValidatorUtils.validateEntity(formDTO,StyleShowListFormDTO.AddUserInternalGroup.class);
return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.showList(formDTO));
}
/**
* 下载党员风采导入模板
* @param response
* @throws IOException
*/
@PostMapping("import/template-download")
public void downloadTemplate(HttpServletResponse response) throws IOException {
response.setCharacterEncoding("UTF-8");
response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-disposition");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
//response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=党员风采导入模板.xlsx");
InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/party_import_template.xlsx");
try {
ServletOutputStream os = response.getOutputStream();
IOUtils.copy(is, os);
} finally {
if (is != null) {
is.close();
}
}
}
}

BIN
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/templates/party_import_template.xlsx

Binary file not shown.

4
epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java

@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer {
serviceListView = namingService.getServicesOfServer(1, 100);
//启动监听
if (serviceListView == null || serviceListView.getCount() == 0) {
log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
// log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务");
return;
}
List<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

Loading…
Cancel
Save