From c18883f498664bcef31f31bbb6e680ed0e930e10 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期二, 23 一月 2024 17:12:14 +0800 Subject: [PATCH] zjh 2024/01/23--3 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 154 +++++++++++++++++++++++++-------------------------- 1 files changed, 76 insertions(+), 78 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java index 996055d..5f3396d 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java @@ -9,6 +9,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.extra.pinyin.PinyinUtil; @@ -18,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.base.Joiner; import com.ltkj.common.excelConfig.ExcelUtils; +import com.ltkj.common.task.TaskService; import com.ltkj.common.utils.SecurityUtils; import com.ltkj.common.utils.StringUtils; import com.ltkj.framework.config.MatchUtils; @@ -28,6 +30,7 @@ import com.ltkj.mall.mallOrderUtils.TjConstants; import com.ltkj.web.config.pdfutils.PDFBinaryUtil; import com.ltkj.web.config.redis.OrderDelayService; +import com.ltkj.web.config.task.TjReservationTask; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -76,8 +79,10 @@ private ITjGroupingProService groupingProService; @Resource private TjAsyncService asyncService; - @Resource - private OrderDelayService delayService; +// @Resource +// private OrderDelayService delayService; + @Autowired + private TaskService taskService; @Resource private ITjReportTemplateService reportTemplateService; @@ -88,71 +93,54 @@ @ApiOperation(value = "瀵煎嚭excel琛ㄦā鏉�") public void importTemplate(HttpServletResponse response) { //鍘熸潵鐨勪笅杞芥ā鏉胯皟鐢ㄦ帴鍙� -// ExcelUtils.exportTemplate(response, "浣撴棰勭害Excel妯℃澘", TjReservation.class); String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\瑗垮畨璺嘲鏈虹數绉戞妧鏈夐檺鍏徃.xls"); -// TjReportTemplate tem = new TjReportTemplate(); -// tem.setName("鍥綋棰勭害Excel妯$増"); -// tem.setRemark("鍥綋棰勭害Excel妯$増"); -// tem.setTemplate(base64String); -// tem.setFlag("1"); -// tem.setOpen("0"); -// reportTemplateService.save(tem); + if(null !=base64String){ + PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + "\\" + "鍥綋棰勭害Excel妯$増.xls"); + String filePath = value + "\\" + "鍥綋棰勭害Excel妯$増.xls"; + File f = new File(filePath); + BufferedInputStream br = null; + OutputStream out = null; + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(f); + br = new BufferedInputStream(fileInputStream); + byte[] bs = new byte[1024]; + int len = 0; + response.reset(); // 闈炲父閲嶈 + if (true) { + // 鍦ㄧ嚎鎵撳紑鏂瑰紡 + URL u = new URL("file:///" + filePath); + //System.out.println(u); + String contentType = u.openConnection().getContentType(); + response.setContentType(contentType); + response.setHeader("Content-Disposition", "inline;filename=鍥綋棰勭害Excel妯$増.xls"); + } else { + // 绾笅杞芥柟寮� + response.setContentType("application/x-msdownload"); + response.setContentType("application/pdf;charset=utf-8"); + response.setHeader("Content-Disposition", "attachment;filename=鍥綋棰勭害Excel妯$増.xls"); + } + out = response.getOutputStream(); + while ((len = br.read(bs)) > 0) { + out.write(bs, 0, len); + } + out.flush(); + out.close(); + br.close(); + fileInputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + //System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e); + } finally { + if (out != null) { + try { + out.close(); + br.close(); + fileInputStream.close(); -// LambdaQueryWrapper<TjReportTemplate> wq = new LambdaQueryWrapper<>(); -// wq.eq(TjReportTemplate::getFlag, 4); -// wq.eq(TjReportTemplate::getName, ""); -// wq.eq(TjReportTemplate::getOpen, 0); -// reportTemplateService.getOne(wq); - - PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + "\\" + "鍥綋棰勭害Excel妯$増.xls"); - String filePath = value + "\\" + "鍥綋棰勭害Excel妯$増.xls"; - File f = new File(filePath); - if (filePath.isEmpty()) { - System.out.println("鏂囦欢涓嶅瓨鍦紒"); - return; - } - BufferedInputStream br = null; - OutputStream out = null; - FileInputStream fileInputStream = null; - try { - fileInputStream = new FileInputStream(f); - br = new BufferedInputStream(fileInputStream); - byte[] bs = new byte[1024]; - int len = 0; - response.reset(); // 闈炲父閲嶈 - if (true) { - // 鍦ㄧ嚎鎵撳紑鏂瑰紡 - URL u = new URL("file:///" + filePath); - //System.out.println(u); - String contentType = u.openConnection().getContentType(); - response.setContentType(contentType); - response.setHeader("Content-Disposition", "inline;filename=鍥綋棰勭害Excel妯$増.xls"); - } else { - // 绾笅杞芥柟寮� - response.setContentType("application/x-msdownload"); - response.setContentType("application/pdf;charset=utf-8"); - response.setHeader("Content-Disposition", "attachment;filename=鍥綋棰勭害Excel妯$増.xls"); - } - out = response.getOutputStream(); - while ((len = br.read(bs)) > 0) { - out.write(bs, 0, len); - } - out.flush(); - out.close(); - br.close(); - fileInputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - //System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e); - } finally { - if (out != null) { - try { - out.close(); - br.close(); - fileInputStream.close(); - - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } } } } @@ -250,6 +238,7 @@ */ @PostMapping("/newExcelImport") @ApiOperation(value = "鍥綋瀵煎叆 (鏂扮増鏈�)") + @Transactional public AjaxResult newExcelImport(@RequestPart(value = "file") @ApiParam(value = "Excel鏂囦欢") MultipartFile file, @RequestParam @ApiParam(value = "鍗曚綅id") String dwId, @RequestParam @ApiParam(value = "鍗曚綅閮ㄩ棬id") String dwDeptId) { @@ -402,7 +391,7 @@ reservation.setTjType(String.valueOf(1)); reservation.setTeamNo(teamNo); tjReservationService.save(reservation); - delayService.reservation(reservation.getId()); +// delayService.reservation(reservation.getId()); } LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>(); wq0.eq(TjCompPay::getCompId, compId); @@ -489,7 +478,9 @@ tjReservation.setIsExpire(2); tjReservation.setTjType(String.valueOf(2)); if (tjReservationService.save(tjReservation)) { - delayService.reservation(tjReservation.getId()); +// delayService.reservation(tjReservation.getId()); + taskService.addTask(new TjReservationTask(tjReservation.getId(), + DateUtil.between(new Date(),DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS))); return AjaxResult.success("棰勭害鎴愬姛!!!"); } LambdaQueryWrapper<TbTransition> remove=new LambdaQueryWrapper<>(); @@ -546,6 +537,7 @@ if (null != reservation && reservation.getIsExpire() == 2) { if (tjReservationService.removeById(id)) { transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())); + taskService.removeTask(new TjReservationTask(id)); return AjaxResult.success("鎾ら攢鎴愬姛"); } return AjaxResult.error("鎾ら攢澶辫触"); @@ -566,6 +558,7 @@ if (null != reservation && reservation.getIsExpire() == 2) { if (tjReservationService.removeById(id)) { transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())); + taskService.removeTask(new TjReservationTask(id)); } } } @@ -590,6 +583,9 @@ tjReservation.setPhoe(reservation.getPhoe()); tjReservation.setName(reservation.getName()); if (tjReservationService.updateById(tjReservation)) { + taskService.removeTask(new TjReservationTask(tjReservation.getId())); + taskService.addTask(new TjReservationTask(tjReservation.getId(), + DateUtil.between(new Date(),DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS))); return AjaxResult.success("鎿嶄綔鎴愬姛"); } return AjaxResult.error("鎿嶄綔澶辫触"); @@ -628,8 +624,6 @@ public AjaxResult newReservationConfirm(@RequestBody ConfirmDto dto) { //棰勭害鐨勬墍鏈変汉 List<TjReservation> rightList = dto.getReservations(); - - //棰勭害鏃堕棿 String reservationTime = dto.getReservationTime(); @@ -670,16 +664,20 @@ reservation.setCompany(dwGrouping.getDwName()); reservation.setPayType(Long.valueOf(dwGrouping.getPayType())); reservation.setPacId(dwDept.getId()); - if(dwGrouping.getPayType().equals("1")){ - compPay=compPay.add(dwGrouping.getYsPrice()); - tramNum+=1; - reservation.setTjType(String.valueOf(1)); - reservation.setTeamNo(teamNo); - }else { - reservation.setTjType(String.valueOf(2)); - } +// if(dwGrouping.getPayType().equals("1")){ +// compPay=compPay.add(dwGrouping.getYsPrice()); +// tramNum+=1; +// reservation.setTjType(String.valueOf(1)); +// reservation.setTeamNo(teamNo); +// }else { +// reservation.setTjType(String.valueOf(2)); +// } + compPay=compPay.add(dwGrouping.getYsPrice()); + tramNum+=1; + reservation.setTjType(String.valueOf(1)); + reservation.setTeamNo(teamNo); tjReservationService.save(reservation); - delayService.reservation(reservation.getId()); + taskService.addTask(new TjReservationTask(reservation.getId(),DateUtil.between(new Date(),DateUtil.endOfDay(reservation.getReservationTime()), DateUnit.MS))); } LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>(); wq0.eq(TjCompPay::getCompId, dwDept.getDwId()); -- Gitblit v1.8.0