yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates 导出志愿单

This commit is contained in:
zhouwentao 2024-06-24 19:21:27 +08:00
parent b655739219
commit 45f3157477
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java
View File

@ -398,7 +398,9 @@ public class MiniUserController {
Collection<String> keys = redisTemplate.keys(CommonConstant.PREFIX_USER_TOKEN + "*"); Collection<String> keys = redisTemplate.keys(CommonConstant.PREFIX_USER_TOKEN + "*");
for (String key : keys) { for (String key : keys) {
String token = (String)redisUtil.get(key); String token = (String)redisUtil.get(key);
SysUser sysUser = sysUserService.getUserByName(JwtUtil.getUsername(token)); String username = JwtUtil.getUsername(token);
if (username.equals(user.getUsername())) {
SysUser sysUser = sysUserService.getUserByName(username);
if (sysUser!=null) { if (sysUser!=null) {
if(sysUser.getId().equals(user.getId())){ if(sysUser.getId().equals(user.getId())){
//清空用户登录Token缓存 //清空用户登录Token缓存
@ -410,6 +412,8 @@ public class MiniUserController {
} }
} }
} }
}
} }
public static String phoneDecrypt(String encrypted, String sessionKey, String iv) { public static String phoneDecrypt(String encrypted, String sessionKey, String iv) {

11
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtVolunteerController.java
View File

@ -314,7 +314,7 @@ public class ArtVolunteerController {
} }
@GetMapping(value = "/preview") @GetMapping(value = "/preview")
public void preview(@RequestParam(value = "id") String id, HttpServletResponse response) throws IOException { public void preview(@RequestParam(value = "id") String id,@RequestParam(value = "type",defaultValue = "1") String type, HttpServletResponse response) throws IOException {
// VolunteerDTO volunteerDTO = yxVolunteerService.findById(id); // VolunteerDTO volunteerDTO = yxVolunteerService.findById(id);
YxVolunteer yxVolunteer = yxVolunteerService.getById(id); YxVolunteer yxVolunteer = yxVolunteerService.getById(id);
AssertUtils.notNull(yxVolunteer,"请求参数有误"); AssertUtils.notNull(yxVolunteer,"请求参数有误");
@ -358,7 +358,14 @@ public class ArtVolunteerController {
variables.put("professionalCategory",professionalCategory); variables.put("professionalCategory",professionalCategory);
variables.put("batchList",batchList); variables.put("batchList",batchList);
listVars.add(variables); listVars.add(variables);
PdfUtil.preview(templateEngine,"志愿单导出.pdf", "preview.html", listVars, response); if (StringUtils.isNotBlank(type) && "1".equals(type)) {
// 下载
PdfUtil.download(templateEngine, "preview.html", listVars, response,"志愿单导出.pdf");
}else{
// 预览
PdfUtil.preview(templateEngine, "preview.html", listVars, response);
}
} }
} }
} }

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/PdfUtil.java
View File

@ -138,15 +138,8 @@ public class PdfUtil {
* @param response HttpServletResponse * @param response HttpServletResponse
* *
*/ */
public static void preview(TemplateEngine templateEngine,String pdfFileName, String templateName, List<Map<String, Object>> listVars, HttpServletResponse response) { public static void preview(TemplateEngine templateEngine,String templateName, List<Map<String, Object>> listVars, HttpServletResponse response) {
response.setContentType("application/pdf"); response.setContentType("application/pdf");
String encodedFileName = null;
try {
encodedFileName = URLEncoder.encode(pdfFileName, "UTF-8");
response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encodedFileName);
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
try (ServletOutputStream out = response.getOutputStream()) { try (ServletOutputStream out = response.getOutputStream()) {
generateAll(templateEngine, templateName, out, listVars); generateAll(templateEngine, templateName, out, listVars);
out.flush(); out.flush();