From e6e316c9bfaeb7e872dc79c010b515707613dde2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 十月 2024 17:29:29 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TReportLossController.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 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 aa9afb7..7f18211 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
@@ -145,36 +145,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.setHandleTime(new Date());
tReportLoss.setHandleUserId(ShiroKit.getUser().getObjectId());
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("/home/igotechgh/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("/home/igotechgh/nginx/html/files/html/reportLossResult_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -183,12 +210,12 @@
fileWriter.flush();
fileWriter.close();
- 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