From 821fc2f632f8b974a2c0fc37630e13c5fbe6086c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 17:26:16 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java | 82 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java
index e2646f9..de8c8df 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java
@@ -1,38 +1,32 @@
package com.stylefeng.guns.modular.system.controller;
-import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
-import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TEmail;
+import com.stylefeng.guns.modular.system.model.TReportLoss;
import com.stylefeng.guns.modular.system.model.TUser;
+import com.stylefeng.guns.modular.system.service.ITReportLossService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.service.TEmailService;
import com.stylefeng.guns.modular.system.util.EmailUtil;
-import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.model.TReportLoss;
-import com.stylefeng.guns.modular.system.service.ITReportLossService;
+import org.springframework.web.bind.annotation.ResponseBody;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.FileWriter;
import java.util.Date;
-import java.util.Map;
/**
* 控制器
@@ -145,36 +139,63 @@
public Object detail(@PathVariable("tReportLossId") Integer tReportLossId) {
return tReportLossService.selectById(tReportLossId);
}
+
+
+
@RequestMapping(value = "/dispose")
@ResponseBody
public Object dispose(Integer id,String info) {
TReportLoss tReportLoss = tReportLossService.selectById(id);
tReportLoss.setDisposeInfo(info);
tReportLoss.setStatus(2);
- tReportLoss.setHandleUserId(ShiroKit.getUser().getObjectId());
+ tReportLoss.setHandleTime(new Date());
+ tReportLoss.setHandleUserId(ShiroKit.getUser().getId());
boolean b = tReportLossService.updateById(tReportLoss);
if(b){
try {
TUser userInfo = userService.selectById(tReportLoss.getUserId());
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ Integer language = userInfo.getLanguage();
String path = templatePath + "user/reportLossResult.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
- document.getElementById("chinese").remove();
- document.getElementById("french").remove();
- document.getElementsByTag("title").get(0).text("Notification of the result of the loss report");
- Element english_user = document.getElementById("english_user");
- english_user.text("Hello " + userInfo.getNickName() + "，");
- Element english_content = document.getElementById("english_content");
- english_content.text(info);
- EmailUtil.send(userInfo.getEmail(), "Notification of the result of the loss report", document.html());
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("物品报失处理结果");
+ Element chinese_user = document.getElementById("chinese_user");
+ chinese_user.text("您好 " + userInfo.getNickName() + "，");
+ Element chinese_content = document.getElementById("chinese_content");
+ chinese_content.text(info);
+ EmailUtil.send(userInfo.getEmail(), "物品报失处理结果", document.html());
+ }
+ if(2 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Solutions for reporting lost items");
+ Element english_user = document.getElementById("english_user");
+ english_user.text("Hello " + userInfo.getNickName() + "，");
+ Element english_content = document.getElementById("english_content");
+ english_content.text(info);
+ EmailUtil.send(userInfo.getEmail(), "Solutions for reporting lost items", document.html());
+ }
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Solutions pour signaler les objets perdus");
+ Element french_user = document.getElementById("french_user");
+ french_user.text("Bonjour " + userInfo.getNickName() + "，");
+ Element french_content = document.getElementById("french_content");
+ french_content.text(info);
+ EmailUtil.send(userInfo.getEmail(), "Solutions pour signaler les objets perdus", document.html());
+ }
//开始生成pdf收据和html收据
- File file = new File("/usr/local/nginx/html/files/html/");
+ File file = new File("/data/nginx/html/files/html/");
if(!file.exists()){
file.mkdirs();
}
String randomString = ToolUtil.getRandomString(10);
- file = new File("/usr/local/nginx/html/files/html/reportLossResult_" + randomString + ".html");
+ file = new File("/data/nginx/html/files/html/reportLossResult_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -182,24 +203,13 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
- File file1 = new File("/usr/local/nginx/html/files/pdf/");
- if(!file1.exists()){
- file1.mkdirs();
- }
- file1 = new File("/usr/local/nginx/html/files/pdf/reportLossResult_" + randomString + ".pdf");
- if(!file1.exists()){
- file1.createNewFile();
- }
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
- String link ="http://182.160.16.251:81/files/html/reportLossResult_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/reportLossResult_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
- tEmail.setName("Notification of the result of the loss report");
+ tEmail.setName(language == 1 ? "物品报失处理结果" : language == 2 ? "Solutions for reporting lost items" : "Solutions pour signaler les objets perdus");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
tEmail.setWeek(EmailUtil.getWeek(2,i));
--
Gitblit v1.7.1