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/specialTrain/TSiteController.java |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
index a44d3f5..e7d269f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
@@ -6,29 +6,27 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 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.DateUtil;
+import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.model.TDriverLine;
 import com.stylefeng.guns.modular.system.model.TLocation;
 import com.stylefeng.guns.modular.system.model.TRegion;
+import com.stylefeng.guns.modular.system.model.TSite;
 import com.stylefeng.guns.modular.system.service.ITLocationService;
 import com.stylefeng.guns.modular.system.service.ITRegionService;
+import com.stylefeng.guns.modular.system.service.ITSiteService;
 import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
+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.TSite;
-import com.stylefeng.guns.modular.system.service.ITSiteService;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -48,18 +46,19 @@
 
     @Autowired
     private ITSiteService tSiteService;
-
+    
     @Autowired
     private ITRegionService tRegionService;
-
+    
     @Autowired
     private ITLocationService itLocationService;
-
+    
     @Autowired
     private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
-
-
+    @Resource
+    private ShiroExtUtil shiroExtUtil;
+    
+    
     /**
      * 跳转到跨城站点管理首页
      */
@@ -127,16 +126,16 @@
     public Object list(String insertTime,String name,String insertUser,String city,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(tSiteService.getSiteList(page,beginTime,endTime,name,insertUser,city,state));
+        } else {
+            page.setRecords(tSiteService.getSiteList(page, beginTime, endTime, name, insertUser, city, state));
         }
         return super.packForBT(page);
     }
@@ -148,12 +147,12 @@
     @ResponseBody
     public Object add(TSite tSite,@RequestParam String subArr) {
         tSite.setInsertTime(new Date());
-        tSite.setInsertUserId(ShiroKit.getUser().getId());
+        tSite.setInsertUserId(shiroExtUtil.getUser().getId());
         tSite.setState(1);
         tSiteService.insert(tSite);
-
+    
         //添加站点区域
-        addLocation(subArr,tSite.getId());
+        addLocation(subArr, tSite.getId());
         return ResultUtil.success();
     }
 

--
Gitblit v1.7.1