From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java
index d92249a..6686631 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java
@@ -2,22 +2,22 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TFeedback;
import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.service.ITFeedbackService;
import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
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.TFeedback;
-import com.stylefeng.guns.modular.system.service.ITFeedbackService;
+import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
@@ -30,15 +30,17 @@
@Controller
@RequestMapping("/tFeedback")
public class TFeedbackController extends BaseController {
-
+
private String PREFIX = "/system/tFeedback/";
-
+
@Autowired
private ITFeedbackService tFeedbackService;
-
+
@Autowired
private ITSystemNoticeService tSystemNoticeService;
-
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到司机反馈管理首页
*/
@@ -46,7 +48,7 @@
public String index() {
return PREFIX + "tFeedback.html";
}
-
+
/**
* 跳转到用户反馈管理首页
*/
@@ -100,16 +102,16 @@
Integer state) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
- page.setRecords(tFeedbackService.getFeedbackList(page,beginTime,endTime,2,driverName,driverPhone,state));
+ } else {
+ page.setRecords(tFeedbackService.getFeedbackList(page, beginTime, endTime, 2, driverName, driverPhone, state));
}
return super.packForBT(page);
}
@@ -125,16 +127,16 @@
Integer state) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1) {
page.setRecords(null);
- }else{
- page.setRecords(tFeedbackService.getFeedbackList(page,beginTime,endTime,1,userName,userPhone,state));
+ } else {
+ page.setRecords(tFeedbackService.getFeedbackList(page, beginTime, endTime, 1, userName, userPhone, state));
}
return super.packForBT(page);
}
@@ -146,18 +148,18 @@
@ResponseBody
public Object immediately(@RequestParam Integer id,@RequestParam String remark) {
TFeedback tFeedback = tFeedbackService.selectById(id);
- if (SinataUtil.isNotEmpty(tFeedback)){
+ if (SinataUtil.isNotEmpty(tFeedback)) {
tFeedback.setCldate(new Date());
tFeedback.setRemark(remark);
- tFeedback.setHandleUserId(ShiroKit.getUser().getId());
+ tFeedback.setHandleUserId(shiroExtUtil.getUser().getId());
tFeedback.setState(2);
tFeedbackService.updateById(tFeedback);
-
+
//增加系统消息
TSystemNotice notice = new TSystemNotice();
notice.setType(2);
notice.setUserType(tFeedback.getType());
- notice.setContent("反馈处理结果:【"+remark+"】。");
+ notice.setContent("反馈处理结果:【" + remark + "】。");
notice.setUserId(tFeedback.getUserId());
notice.setInsertTime(new Date());
notice.setRead(1);
--
Gitblit v1.7.1