From 1114e00ac3741c8fd4c2b4b093998c46912ddec1 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Wed, 18 Sep 2024 17:30:41 +0800 Subject: [PATCH] =?UTF-8?q?update:=E7=A4=BE=E5=9B=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsClubJoinTeamController.java | 4 +-- .../controller/LawsClubMeetingController.java | 4 +-- ...LawsClubResearchInformationController.java | 4 +-- .../impl/LawsClubJoinTeamServiceImpl.java | 26 ++++++++++++++++--- .../impl/LawsClubMeetingServiceImpl.java | 22 +++++++++++++--- ...awsClubResearchInformationServiceImpl.java | 23 +++++++++++++--- 6 files changed, 65 insertions(+), 18 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubJoinTeamController.java b/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubJoinTeamController.java index 5c362bad..3e31f370 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubJoinTeamController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubJoinTeamController.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.club.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.modules.laws.club.service.ILawsClubJoinTeamService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,7 +35,6 @@ public class LawsClubJoinTeamController { @AutoLog(value = "社团管理-入团信息表-模板下载") @ApiOperation(value="社团管理-入团信息表-模板下载", notes="社团管理-入团信息表-模板下载") @GetMapping(value = "/exportTemplate") -// @RequiresPermissions("clubManagement:clubManagement:templateDownload") public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { lawsClubJoinTeamService.exportTemplate(request,response); } @@ -45,7 +45,7 @@ public class LawsClubJoinTeamController { @AutoLog(value = "社团管理-入团信息表-导入") @ApiOperation(value="社团管理-入团信息表-导入", notes="社团管理-入团信息表-导入") @PostMapping(value = "/importExcel") -// @RequiresPermissions("clubManagement:clubManagement:import") + @Translation public Result excelimport(HttpServletRequest request) { return lawsClubJoinTeamService.importExcel(request); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubMeetingController.java index c45dafe2..ae0f9932 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubMeetingController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubMeetingController.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.club.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.modules.laws.club.service.ILawsClubMeetingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,7 +38,6 @@ public class LawsClubMeetingController { @AutoLog(value = "社团管理-参会信息表-模板下载") @ApiOperation(value="社团管理-参会信息表-模板下载", notes="社团管理-参会信息表-模板下载") @GetMapping(value = "/exportTemplate") -// @RequiresPermissions("clubManagement:clubManagement:templateDownload") public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { lawsClubMeetingService.exportTemplate(request,response); } @@ -48,7 +48,7 @@ public class LawsClubMeetingController { @AutoLog(value = "社团管理-参会信息表-导入") @ApiOperation(value="社团管理-参会信息表-导入", notes="社团管理-参会信息表-导入") @PostMapping(value = "/importExcel") -// @RequiresPermissions("clubManagement:clubManagement:import") + @Translation public Result excelimport(HttpServletRequest request) { return lawsClubMeetingService.importExcel(request); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubResearchInformationController.java b/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubResearchInformationController.java index 5c574abd..d8c0f48d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubResearchInformationController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/controller/LawsClubResearchInformationController.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.club.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.modules.laws.club.service.ILawsClubResearchInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,7 +38,6 @@ public class LawsClubResearchInformationController { @AutoLog(value = "社团管理-征集调研信息表-模板下载") @ApiOperation(value="社团管理-征集调研信息表-模板下载", notes="社团管理-征集调研信息表-模板下载") @GetMapping(value = "/exportTemplate") -// @RequiresPermissions("clubManagement:clubManagement:templateDownload") public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { lawsClubResearchInformationService.exportTemplate(request,response); } @@ -48,7 +48,7 @@ public class LawsClubResearchInformationController { @AutoLog(value = "社团管理-征集调研信息表-导入") @ApiOperation(value="社团管理-征集调研信息表-导入", notes="社团管理-征集调研信息表-导入") @PostMapping(value = "/importExcel") -// @RequiresPermissions("clubManagement:clubManagement:import") + @Translation public Result excelimport(HttpServletRequest request) { return lawsClubResearchInformationService.importExcel(request); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubJoinTeamServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubJoinTeamServiceImpl.java index 73355ef0..68071d69 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubJoinTeamServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubJoinTeamServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.DictModel; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.laws.club.entity.LawsClubJoinTeam; import com.jero.modules.laws.club.mapper.LawsClubJoinTeamMapper; import com.jero.modules.laws.club.service.ILawsClubJoinTeamService; @@ -19,6 +20,7 @@ import com.jero.modules.tag.entity.LawsTag; import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; +import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.BeanUtils; @@ -33,11 +35,10 @@ import java.io.IOException; import java.io.OutputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -87,6 +88,8 @@ public class LawsClubJoinTeamServiceImpl extends ServiceImpl importExcel(HttpServletRequest request) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + System.out.println(loginUser); MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); List lawsClubJoinTeamList = new ArrayList<>(); @@ -108,6 +111,7 @@ public class LawsClubJoinTeamServiceImpl extends ServiceImpl value != null && !value.isEmpty()); } + private Date convertStringToDate(String dateStr) { + if (StringUtils.isBlank(dateStr)) { + return null; + } + try { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date date = simpleDateFormat.parse(dateStr); + return date; + }catch (Exception e) { + log.error("日期转换异常"); + } + return null; + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubResearchInformationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubResearchInformationServiceImpl.java index 29b0aaa7..f72610ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubResearchInformationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/club/service/impl/LawsClubResearchInformationServiceImpl.java @@ -14,6 +14,7 @@ import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictService; +import com.jero.modules.system.service.ISysRolePermissionService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.tag.entity.LawsTag; import lombok.SneakyThrows; @@ -33,11 +34,9 @@ import java.io.IOException; import java.io.OutputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -110,6 +109,8 @@ public class LawsClubResearchInformationServiceImpl extends ServiceImpl