fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -1,36 +1,33 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * 缓存监控
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/monitor/cache")
-public class CacheController
-{
+public class CacheController {
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping()
-    public AjaxResult getInfo() throws Exception
-    {
+    public AjaxResult getInfo() throws Exception {
         Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
         Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
         Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -1,15 +1,5 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -18,51 +8,52 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysLogininforService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 系统访问记录
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/monitor/logininfor")
-public class SysLogininforController extends BaseController
-{
+public class SysLogininforController extends BaseController {
     @Autowired
     private ISysLogininforService logininforService;
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysLogininfor logininfor)
-    {
+    public TableDataInfo list(SysLogininfor logininfor) {
         startPage();
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
         return getDataTable(list);
     }
 
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysLogininfor logininfor)
-    {
+    public void export(HttpServletResponse response, SysLogininfor logininfor) {
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
         ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
         util.exportExcel(response, list, "登录日志");
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] infoIds) {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public AjaxResult clean()
-    {
+    public AjaxResult clean() {
         logininforService.cleanLogininfor();
         return AjaxResult.success();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlAreaController.java

@@ -12,7 +12,6 @@ import com.ruoyi.qdtl.service.ITlAreaService;
 import com.ruoyi.qdtl.service.ITlInspectionDeviceService;
 import com.ruoyi.qdtl.service.ITlInspectionLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -28,14 +27,13 @@ import java.util.Map;
 
 /**
  * 区域管理Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-02-21
  */
 @RestController
 @RequestMapping("/qdtl/area")
-public class TlAreaController extends BaseController
-{
+public class TlAreaController extends BaseController {
     @Autowired
     private ITlAreaService tlAreaService;
     @Autowired
@@ -46,20 +44,18 @@ public class TlAreaController extends BaseController
     /**
      * 查询区域管理列表
      */
-    @PreAuthorize("@ss.hasPermi('system:area:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TlArea tlArea)
-    {
+    public TableDataInfo list(TlArea tlArea) {
         startPage();
         List<TlArea> list = tlAreaService.selectTlAreaList(tlArea);
         if (list.size() > 0) {
             // 查询设备数和巡检点数量
-            Map<String,Integer> deviceArea = tlInspectionDeviceService.queryDeviceByArea();
-            Map<String,Integer> locationArea = tlInspectionLocationService.queryLocationByArea();
+            Map<String, Integer> deviceArea = tlInspectionDeviceService.queryDeviceByArea();
+            Map<String, Integer> locationArea = tlInspectionLocationService.queryLocationByArea();
             for (TlArea area : list) {
                 if ("1".equals(area.getAreaType())) {
-                    area.setDeviceCount(Convert.toInt(deviceArea.get(Convert.toStr(area.getId())),0));
-                    area.setLocationCount(Convert.toInt(locationArea.get(Convert.toStr(area.getId())),0));
+                    area.setDeviceCount(Convert.toInt(deviceArea.get(Convert.toStr(area.getId())), 0));
+                    area.setLocationCount(Convert.toInt(locationArea.get(Convert.toStr(area.getId())), 0));
                 }
             }
         }
@@ -69,11 +65,9 @@ public class TlAreaController extends BaseController
     /**
      * 导出区域管理列表
      */
-    @PreAuthorize("@ss.hasPermi('system:area:export')")
     @Log(title = "区域管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TlArea tlArea)
-    {
+    public void export(HttpServletResponse response, TlArea tlArea) {
         List<TlArea> list = tlAreaService.selectTlAreaList(tlArea);
         ExcelUtil<TlArea> util = new ExcelUtil<TlArea>(TlArea.class);
         util.exportExcel(response, list, "区域管理数据");
@@ -82,43 +76,35 @@ public class TlAreaController extends BaseController
     /**
      * 获取区域管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:area:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlAreaService.selectTlAreaById(id));
     }
 
     /**
      * 新增区域管理
      */
-    @PreAuthorize("@ss.hasPermi('system:area:add')")
     @Log(title = "区域管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TlArea tlArea)
-    {
+    public AjaxResult add(@RequestBody TlArea tlArea) {
         return toAjax(tlAreaService.insertTlArea(tlArea));
     }
 
     /**
      * 修改区域管理
      */
-    @PreAuthorize("@ss.hasPermi('system:area:edit')")
     @Log(title = "区域管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TlArea tlArea)
-    {
+    public AjaxResult edit(@RequestBody TlArea tlArea) {
         return toAjax(tlAreaService.updateTlArea(tlArea));
     }
 
     /**
      * 删除区域管理
      */
-    @PreAuthorize("@ss.hasPermi('system:area:remove')")
     @Log(title = "区域管理", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tlAreaService.deleteTlAreaByIds(ids));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlDocumentController.java

@@ -20,7 +20,6 @@ import com.ruoyi.qdtl.service.ITlDocumentService;
 import com.ruoyi.qdtl.service.ITlPlanRecordService;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -49,7 +48,6 @@ public class TlDocumentController extends BaseController {
     /**
      * 查询公文管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:document:list')")
     @GetMapping("/list")
     public TableDataInfo list(TlDocument tlDocument) {
         startPage();
@@ -146,7 +144,6 @@ public class TlDocumentController extends BaseController {
     /**
      * 获取公文管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:document:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlDocumentService.selectTlDocumentById(id));
@@ -155,7 +152,6 @@ public class TlDocumentController extends BaseController {
     /**
      * 新增公文管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:document:add')")
     @Log(title = "公文管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlDocument tlDocument) {
@@ -168,7 +164,6 @@ public class TlDocumentController extends BaseController {
     /**
      * 修改公文管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:document:edit')")
     @Log(title = "公文管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlDocument tlDocument) {
@@ -181,7 +176,6 @@ public class TlDocumentController extends BaseController {
     /**
      * 删除公文管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:document:remove')")
     @Log(title = "公文管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlElectricCarMileageController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.qdtl.domain.TlElectricCarMileage;
 import com.ruoyi.qdtl.service.ITlElectricCarMileageService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,7 +36,6 @@ public class TlElectricCarMileageController extends BaseController {
     /**
      * 查询电动车里程统计（每日）列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:mileage:list')")
     @GetMapping("/list")
     public TableDataInfo list(TlElectricCarMileage tlElectricCarMileage) {
         startPage();
@@ -48,7 +46,6 @@ public class TlElectricCarMileageController extends BaseController {
     /**
      * 导出电动车里程统计（每日）列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:mileage:export')")
     @Log(title = "电动车里程统计（每日）", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlElectricCarMileage tlElectricCarMileage) {
@@ -60,7 +57,6 @@ public class TlElectricCarMileageController extends BaseController {
     /**
      * 获取电动车里程统计（每日）详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:mileage:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlElectricCarMileageService.selectTlElectricCarMileageById(id));
@@ -69,7 +65,6 @@ public class TlElectricCarMileageController extends BaseController {
     /**
      * 新增电动车里程统计（每日）
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:mileage:add')")
     @Log(title = "电动车里程统计（每日）", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlElectricCarMileage tlElectricCarMileage) {
@@ -79,7 +74,6 @@ public class TlElectricCarMileageController extends BaseController {
     /**
      * 修改电动车里程统计（每日）
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:mileage:edit')")
     @Log(title = "电动车里程统计（每日）", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlElectricCarMileage tlElectricCarMileage) {
@@ -89,7 +83,6 @@ public class TlElectricCarMileageController extends BaseController {
     /**
      * 删除电动车里程统计（每日）
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:mileage:remove')")
     @Log(title = "电动车里程统计（每日）", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlElectricDeviceLocationController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.qdtl.domain.TlElectricDeviceLocation;
 import com.ruoyi.qdtl.service.ITlElectricDeviceLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -79,7 +78,6 @@ public class TlElectricDeviceLocationController extends BaseController {
     /**
      * 导出电动车定位设备轨迹列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:export')")
     @Log(title = "电动车定位设备轨迹", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlElectricDeviceLocation tlElectricDeviceLocation) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlIncidentController.java

@@ -12,7 +12,6 @@ import com.ruoyi.qdtl.domain.TlIncident;
 import com.ruoyi.qdtl.service.ITlIncidentService;
 import com.ruoyi.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -84,7 +83,6 @@ public class TlIncidentController extends BaseController {
     /**
      * 导出巡检事件管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:incident:export')")
     @Log(title = "巡检事件管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlIncident tlIncident) {
@@ -96,7 +94,6 @@ public class TlIncidentController extends BaseController {
     /**
      * 获取巡检事件管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:incident:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlIncidentService.selectTlIncidentById(id));
@@ -127,7 +124,7 @@ public class TlIncidentController extends BaseController {
     @PutMapping("/deal")
     public AjaxResult deal(@RequestBody TlIncident tlIncident) {
         if (ObjectUtil.isNull(tlIncident.getId()) || StrUtil.isBlank(tlIncident.getStatus())) {
-            return AjaxResult.error("缺少必要残损！");
+            return AjaxResult.error("缺少必要参数！");
         }
         TlIncident save = new TlIncident();
         save.setId(tlIncident.getId());
@@ -138,10 +135,23 @@ public class TlIncidentController extends BaseController {
         return toAjax(tlIncidentService.updateTlIncident(save));
     }
 
+    @Log(title = "巡检事件管理-处理备注和图片", businessType = BusinessType.UPDATE)
+    @PutMapping("/dealRemark")
+    public AjaxResult dealRemark(@RequestBody TlIncident tlIncident) {
+        if (ObjectUtil.isNull(tlIncident.getId())) {
+            return AjaxResult.error("缺少必要参数！");
+        }
+        TlIncident save = new TlIncident();
+        save.setId(tlIncident.getId());
+        save.setDealRemark(tlIncident.getDealRemark());
+        save.setDealPics(tlIncident.getDealPics());
+        save.setDealTime(new Date());
+        return toAjax(tlIncidentService.updateTlIncident(save));
+    }
+
     /**
      * 删除巡检事件管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:incident:remove')")
     @Log(title = "巡检事件管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlInspectionDeviceController.java

@@ -1,46 +1,43 @@
 package com.ruoyi.web.controller.qdtl;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.qdtl.domain.TlInspectionDevice;
+import com.ruoyi.qdtl.service.ITlInspectionDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.qdtl.domain.TlInspectionDevice;
-import com.ruoyi.qdtl.service.ITlInspectionDeviceService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 巡检设备管理Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-02-22
  */
 @RestController
 @RequestMapping("/qdtl/device")
-public class TlInspectionDeviceController extends BaseController
-{
+public class TlInspectionDeviceController extends BaseController {
     @Autowired
     private ITlInspectionDeviceService tlInspectionDeviceService;
 
     /**
      * 查询巡检设备管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:device:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TlInspectionDevice tlInspectionDevice)
-    {
+    public TableDataInfo list(TlInspectionDevice tlInspectionDevice) {
         startPage();
         List<TlInspectionDevice> list = tlInspectionDeviceService.selectTlInspectionDeviceList(tlInspectionDevice);
         return getDataTable(list);
@@ -49,11 +46,9 @@ public class TlInspectionDeviceController extends BaseController
     /**
      * 导出巡检设备管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:device:export')")
     @Log(title = "巡检设备管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TlInspectionDevice tlInspectionDevice)
-    {
+    public void export(HttpServletResponse response, TlInspectionDevice tlInspectionDevice) {
         List<TlInspectionDevice> list = tlInspectionDeviceService.selectTlInspectionDeviceList(tlInspectionDevice);
         ExcelUtil<TlInspectionDevice> util = new ExcelUtil<TlInspectionDevice>(TlInspectionDevice.class);
         util.exportExcel(response, list, "巡检设备管理数据");
@@ -62,43 +57,35 @@ public class TlInspectionDeviceController extends BaseController
     /**
      * 获取巡检设备管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:device:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlInspectionDeviceService.selectTlInspectionDeviceById(id));
     }
 
     /**
      * 新增巡检设备管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:device:add')")
     @Log(title = "巡检设备管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TlInspectionDevice tlInspectionDevice)
-    {
+    public AjaxResult add(@RequestBody TlInspectionDevice tlInspectionDevice) {
         return toAjax(tlInspectionDeviceService.insertTlInspectionDevice(tlInspectionDevice));
     }
 
     /**
      * 修改巡检设备管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:device:edit')")
     @Log(title = "巡检设备管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TlInspectionDevice tlInspectionDevice)
-    {
+    public AjaxResult edit(@RequestBody TlInspectionDevice tlInspectionDevice) {
         return toAjax(tlInspectionDeviceService.updateTlInspectionDevice(tlInspectionDevice));
     }
 
     /**
      * 删除巡检设备管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:device:remove')")
     @Log(title = "巡检设备管理", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable Long id)
-    {
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id) {
         return toAjax(tlInspectionDeviceService.deleteTlInspectionDeviceById(id));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlInspectionLineController.java

@@ -10,7 +10,6 @@ import com.ruoyi.qdtl.domain.TlInspectionLocation;
 import com.ruoyi.qdtl.service.ITlInspectionLineService;
 import com.ruoyi.qdtl.service.ITlInspectionLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -42,7 +41,6 @@ public class TlInspectionLineController extends BaseController {
     /**
      * 查询巡检线路管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:line:list')")
     @GetMapping("/list")
     public TableDataInfo list(TlInspectionLine tlInspectionLine) {
         startPage();
@@ -76,7 +74,6 @@ public class TlInspectionLineController extends BaseController {
     /**
      * 获取巡检线路管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:line:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TlInspectionLine tlInspectionLine = tlInspectionLineService.selectTlInspectionLineById(id);
@@ -93,7 +90,6 @@ public class TlInspectionLineController extends BaseController {
     /**
      * 新增巡检线路管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:line:add')")
     @Log(title = "巡检线路管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlInspectionLine tlInspectionLine) {
@@ -103,7 +99,6 @@ public class TlInspectionLineController extends BaseController {
     /**
      * 修改巡检线路管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:line:edit')")
     @Log(title = "巡检线路管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlInspectionLine tlInspectionLine) {
@@ -113,7 +108,6 @@ public class TlInspectionLineController extends BaseController {
     /**
      * 删除巡检线路管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:line:remove')")
     @Log(title = "巡检线路管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlInspectionLineLocationController.java

@@ -1,46 +1,43 @@
 package com.ruoyi.web.controller.qdtl;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.qdtl.domain.TlInspectionLineLocation;
+import com.ruoyi.qdtl.service.ITlInspectionLineLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.qdtl.domain.TlInspectionLineLocation;
-import com.ruoyi.qdtl.service.ITlInspectionLineLocationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 巡检线路点位Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-03-03
  */
 @RestController
 @RequestMapping("/qdtl/lineLocation")
-public class TlInspectionLineLocationController extends BaseController
-{
+public class TlInspectionLineLocationController extends BaseController {
     @Autowired
     private ITlInspectionLineLocationService tlInspectionLineLocationService;
 
     /**
      * 查询巡检线路点位列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TlInspectionLineLocation tlInspectionLineLocation)
-    {
+    public TableDataInfo list(TlInspectionLineLocation tlInspectionLineLocation) {
         startPage();
         List<TlInspectionLineLocation> list = tlInspectionLineLocationService.selectTlInspectionLineLocationList(tlInspectionLineLocation);
         return getDataTable(list);
@@ -49,11 +46,9 @@ public class TlInspectionLineLocationController extends BaseController
     /**
      * 导出巡检线路点位列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:export')")
     @Log(title = "巡检线路点位", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TlInspectionLineLocation tlInspectionLineLocation)
-    {
+    public void export(HttpServletResponse response, TlInspectionLineLocation tlInspectionLineLocation) {
         List<TlInspectionLineLocation> list = tlInspectionLineLocationService.selectTlInspectionLineLocationList(tlInspectionLineLocation);
         ExcelUtil<TlInspectionLineLocation> util = new ExcelUtil<TlInspectionLineLocation>(TlInspectionLineLocation.class);
         util.exportExcel(response, list, "巡检线路点位数据");
@@ -62,43 +57,35 @@ public class TlInspectionLineLocationController extends BaseController
     /**
      * 获取巡检线路点位详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlInspectionLineLocationService.selectTlInspectionLineLocationById(id));
     }
 
     /**
      * 新增巡检线路点位
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:add')")
     @Log(title = "巡检线路点位", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TlInspectionLineLocation tlInspectionLineLocation)
-    {
+    public AjaxResult add(@RequestBody TlInspectionLineLocation tlInspectionLineLocation) {
         return toAjax(tlInspectionLineLocationService.insertTlInspectionLineLocation(tlInspectionLineLocation));
     }
 
     /**
      * 修改巡检线路点位
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:edit')")
     @Log(title = "巡检线路点位", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TlInspectionLineLocation tlInspectionLineLocation)
-    {
+    public AjaxResult edit(@RequestBody TlInspectionLineLocation tlInspectionLineLocation) {
         return toAjax(tlInspectionLineLocationService.updateTlInspectionLineLocation(tlInspectionLineLocation));
     }
 
     /**
      * 删除巡检线路点位
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:remove')")
     @Log(title = "巡检线路点位", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tlInspectionLineLocationService.deleteTlInspectionLineLocationByIds(ids));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlInspectionLocationController.java

@@ -15,7 +15,6 @@ import com.ruoyi.qdtl.service.ITlAreaService;
 import com.ruoyi.qdtl.service.ITlInspectionDeviceService;
 import com.ruoyi.qdtl.service.ITlInspectionLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -50,7 +49,6 @@ public class TlInspectionLocationController extends BaseController {
     /**
      * 查询巡检点管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:list')")
     @GetMapping("/list")
     public TableDataInfo list(TlInspectionLocation tlInspectionLocation) {
         startPage();
@@ -80,7 +78,6 @@ public class TlInspectionLocationController extends BaseController {
     /**
      * 导出巡检点管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:export')")
     @Log(title = "巡检点管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlInspectionLocation tlInspectionLocation) {
@@ -92,7 +89,6 @@ public class TlInspectionLocationController extends BaseController {
     /**
      * 获取巡检点管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlInspectionLocationService.selectTlInspectionLocationById(id));
@@ -101,7 +97,6 @@ public class TlInspectionLocationController extends BaseController {
     /**
      * 新增巡检点管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:add')")
     @Log(title = "巡检点管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlInspectionLocation tlInspectionLocation) {
@@ -111,7 +106,6 @@ public class TlInspectionLocationController extends BaseController {
     /**
      * 修改巡检点管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:edit')")
     @Log(title = "巡检点管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlInspectionLocation tlInspectionLocation) {
@@ -121,7 +115,6 @@ public class TlInspectionLocationController extends BaseController {
     /**
      * 删除巡检点管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:location:remove')")
     @Log(title = "巡检点管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlInspectionLocationLogController.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.qdtl.domain.TlInspectionLocationLog;
 import com.ruoyi.qdtl.service.ITlInspectionLocationLogService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -68,7 +67,6 @@ public class TlInspectionLocationLogController extends BaseController {
     /**
      * 导出巡检记录管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:log:export')")
     @Log(title = "巡检记录管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlInspectionLocationLog tlInspectionLocationLog) {
@@ -84,7 +82,6 @@ public class TlInspectionLocationLogController extends BaseController {
     /**
      * 获取巡检记录管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:log:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlInspectionLocationLogService.selectTlInspectionLocationLogById(id));
@@ -93,7 +90,6 @@ public class TlInspectionLocationLogController extends BaseController {
     /**
      * 新增巡检记录管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:log:add')")
     @Log(title = "巡检记录管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlInspectionLocationLog tlInspectionLocationLog) {
@@ -103,7 +99,6 @@ public class TlInspectionLocationLogController extends BaseController {
     /**
      * 修改巡检记录管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:log:edit')")
     @Log(title = "巡检记录管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlInspectionLocationLog tlInspectionLocationLog) {
@@ -113,7 +108,6 @@ public class TlInspectionLocationLogController extends BaseController {
     /**
      * 删除巡检记录管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:log:remove')")
     @Log(title = "巡检记录管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlInspectionPlanController.java

@@ -17,7 +17,6 @@ import com.ruoyi.qdtl.domain.TlInspectionPlanUser;
 import com.ruoyi.qdtl.service.ITlInspectionPlanService;
 import com.ruoyi.qdtl.service.ITlInspectionPlanUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,7 +46,6 @@ public class TlInspectionPlanController extends BaseController {
     /**
      * 查询巡检计划管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:plan:list')")
     @GetMapping("/list")
     public TableDataInfo list(TlInspectionPlan tlInspectionPlan) {
         startPage();
@@ -84,7 +82,6 @@ public class TlInspectionPlanController extends BaseController {
     /**
      * 获取巡检计划管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:plan:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlInspectionPlanService.selectTlInspectionPlanById(id));
@@ -93,7 +90,6 @@ public class TlInspectionPlanController extends BaseController {
     /**
      * 新增巡检计划管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:plan:add')")
     @Log(title = "巡检计划管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlInspectionPlan tlInspectionPlan) {
@@ -103,7 +99,6 @@ public class TlInspectionPlanController extends BaseController {
     /**
      * 修改巡检计划管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:plan:edit')")
     @Log(title = "巡检计划管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlInspectionPlan tlInspectionPlan) {
@@ -113,7 +108,6 @@ public class TlInspectionPlanController extends BaseController {
     /**
      * 删除巡检计划管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:plan:remove')")
     @Log(title = "巡检计划管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
@@ -128,7 +122,6 @@ public class TlInspectionPlanController extends BaseController {
      * @param endDate
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:plan:query')")
     @GetMapping(value = "/getSchedule")
     public AjaxResult getSchedule(@RequestParam(required = false) String nickName, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate) {
         return AjaxResult.success(tlInspectionPlanService.getSchedule(nickName, startDate, endDate));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlInspectionPlanUserController.java

@@ -1,46 +1,43 @@
 package com.ruoyi.web.controller.qdtl;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.qdtl.domain.TlInspectionPlanUser;
+import com.ruoyi.qdtl.service.ITlInspectionPlanUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.qdtl.domain.TlInspectionPlanUser;
-import com.ruoyi.qdtl.service.ITlInspectionPlanUserService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 巡检计划人员关系Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-03-03
  */
 @RestController
 @RequestMapping("/qdtl/planUser")
-public class TlInspectionPlanUserController extends BaseController
-{
+public class TlInspectionPlanUserController extends BaseController {
     @Autowired
     private ITlInspectionPlanUserService tlInspectionPlanUserService;
 
     /**
      * 查询巡检计划人员关系列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:user:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TlInspectionPlanUser tlInspectionPlanUser)
-    {
+    public TableDataInfo list(TlInspectionPlanUser tlInspectionPlanUser) {
         startPage();
         List<TlInspectionPlanUser> list = tlInspectionPlanUserService.selectTlInspectionPlanUserList(tlInspectionPlanUser);
         return getDataTable(list);
@@ -49,11 +46,9 @@ public class TlInspectionPlanUserController extends BaseController
     /**
      * 导出巡检计划人员关系列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:user:export')")
     @Log(title = "巡检计划人员关系", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TlInspectionPlanUser tlInspectionPlanUser)
-    {
+    public void export(HttpServletResponse response, TlInspectionPlanUser tlInspectionPlanUser) {
         List<TlInspectionPlanUser> list = tlInspectionPlanUserService.selectTlInspectionPlanUserList(tlInspectionPlanUser);
         ExcelUtil<TlInspectionPlanUser> util = new ExcelUtil<TlInspectionPlanUser>(TlInspectionPlanUser.class);
         util.exportExcel(response, list, "巡检计划人员关系数据");
@@ -62,43 +57,35 @@ public class TlInspectionPlanUserController extends BaseController
     /**
      * 获取巡检计划人员关系详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:user:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlInspectionPlanUserService.selectTlInspectionPlanUserById(id));
     }
 
     /**
      * 新增巡检计划人员关系
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:user:add')")
     @Log(title = "巡检计划人员关系", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TlInspectionPlanUser tlInspectionPlanUser)
-    {
+    public AjaxResult add(@RequestBody TlInspectionPlanUser tlInspectionPlanUser) {
         return toAjax(tlInspectionPlanUserService.insertTlInspectionPlanUser(tlInspectionPlanUser));
     }
 
     /**
      * 修改巡检计划人员关系
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:user:edit')")
     @Log(title = "巡检计划人员关系", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TlInspectionPlanUser tlInspectionPlanUser)
-    {
+    public AjaxResult edit(@RequestBody TlInspectionPlanUser tlInspectionPlanUser) {
         return toAjax(tlInspectionPlanUserService.updateTlInspectionPlanUser(tlInspectionPlanUser));
     }
 
     /**
      * 删除巡检计划人员关系
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:user:remove')")
     @Log(title = "巡检计划人员关系", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tlInspectionPlanUserService.deleteTlInspectionPlanUserByIds(ids));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlMonitorController.java

@@ -12,7 +12,6 @@ import com.ruoyi.qdtl.domain.TlMonitor;
 import com.ruoyi.qdtl.service.ITlAreaService;
 import com.ruoyi.qdtl.service.ITlMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -45,7 +44,6 @@ public class TlMonitorController extends BaseController {
     /**
      * 查询监控设备管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:monitor:list')")
     @GetMapping("/list")
     public AjaxResult list(TlMonitor tlMonitor) {
         List<TlMonitor> list = tlMonitorService.selectTlMonitorList(tlMonitor);
@@ -67,7 +65,6 @@ public class TlMonitorController extends BaseController {
     /**
      * 导出监控设备管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:monitor:export')")
     @Log(title = "监控设备管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlMonitor tlMonitor) {
@@ -79,7 +76,6 @@ public class TlMonitorController extends BaseController {
     /**
      * 获取监控设备管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:monitor:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlMonitorService.selectTlMonitorById(id));
@@ -88,7 +84,6 @@ public class TlMonitorController extends BaseController {
     /**
      * 新增监控设备管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:monitor:add')")
     @Log(title = "监控设备管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlMonitor tlMonitor) {
@@ -98,7 +93,6 @@ public class TlMonitorController extends BaseController {
     /**
      * 修改监控设备管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:monitor:edit')")
     @Log(title = "监控设备管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlMonitor tlMonitor) {
@@ -108,7 +102,6 @@ public class TlMonitorController extends BaseController {
     /**
      * 删除监控设备管理
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:monitor:remove')")
     @Log(title = "监控设备管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlPatrolmanController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.qdtl.domain.TlPatrolman;
 import com.ruoyi.qdtl.service.ITlPatrolmanService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +36,6 @@ public class TlPatrolmanController extends BaseController {
     /**
      * 查询巡检员列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:patrolman:list')")
     @GetMapping("/list")
     public TableDataInfo list(TlPatrolman tlPatrolman) {
         startPage();
@@ -58,7 +56,6 @@ public class TlPatrolmanController extends BaseController {
     /**
      * 导出巡检员列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:patrolman:export')")
     @Log(title = "巡检员", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlPatrolman tlPatrolman) {
@@ -70,7 +67,6 @@ public class TlPatrolmanController extends BaseController {
     /**
      * 获取巡检员详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:patrolman:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlPatrolmanService.selectTlPatrolmanById(id));
@@ -79,7 +75,6 @@ public class TlPatrolmanController extends BaseController {
     /**
      * 新增巡检员
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:patrolman:add')")
     @Log(title = "巡检员", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlPatrolman tlPatrolman) {
@@ -89,7 +84,6 @@ public class TlPatrolmanController extends BaseController {
     /**
      * 修改巡检员
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:patrolman:edit')")
     @Log(title = "巡检员", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlPatrolman tlPatrolman) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlPlanRecordController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.qdtl.domain.TlPlanRecord;
 import com.ruoyi.qdtl.service.ITlPlanRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,7 +36,6 @@ public class TlPlanRecordController extends BaseController {
     /**
      * 查询巡检计划记录列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(TlPlanRecord tlPlanRecord) {
         startPage();
@@ -48,7 +46,6 @@ public class TlPlanRecordController extends BaseController {
     /**
      * 导出巡检计划记录列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:record:export')")
     @Log(title = "巡检计划记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlPlanRecord tlPlanRecord) {
@@ -60,7 +57,6 @@ public class TlPlanRecordController extends BaseController {
     /**
      * 获取巡检计划记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:record:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tlPlanRecordService.selectTlPlanRecordById(id));
@@ -69,7 +65,6 @@ public class TlPlanRecordController extends BaseController {
     /**
      * 新增巡检计划记录
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:record:add')")
     @Log(title = "巡检计划记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TlPlanRecord tlPlanRecord) {
@@ -79,7 +74,6 @@ public class TlPlanRecordController extends BaseController {
     /**
      * 修改巡检计划记录
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:record:edit')")
     @Log(title = "巡检计划记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TlPlanRecord tlPlanRecord) {
@@ -89,7 +83,6 @@ public class TlPlanRecordController extends BaseController {
     /**
      * 删除巡检计划记录
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:record:remove')")
     @Log(title = "巡检计划记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlWorkPicController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.qdtl.domain.TlWorkPic;
 import com.ruoyi.qdtl.service.ITlWorkPicService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -47,7 +46,6 @@ public class TlWorkPicController extends BaseController {
     /**
      * 导出工作面貌图片管理列表
      */
-    @PreAuthorize("@ss.hasPermi('qdtl:pic:export')")
     @Log(title = "工作面貌图片管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TlWorkPic tlWorkPic) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -1,9 +1,15 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,45 +19,34 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysConfig;
-import com.ruoyi.system.service.ISysConfigService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 参数配置 信息操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
+public class SysConfigController extends BaseController {
     @Autowired
     private ISysConfigService configService;
 
     /**
      * 获取参数配置列表
      */
-    @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfig config)
-    {
+    public TableDataInfo list(SysConfig config) {
         startPage();
         List<SysConfig> list = configService.selectConfigList(config);
         return getDataTable(list);
     }
 
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysConfig config)
-    {
+    public void export(HttpServletResponse response, SysConfig config) {
         List<SysConfig> list = configService.selectConfigList(config);
         ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
         util.exportExcel(response, list, "参数数据");
@@ -60,10 +55,8 @@ public class SysConfigController extends BaseController
     /**
      * 根据参数编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
-    {
+    public AjaxResult getInfo(@PathVariable Long configId) {
         return AjaxResult.success(configService.selectConfigById(configId));
     }
 
@@ -71,21 +64,17 @@ public class SysConfigController extends BaseController
      * 根据参数键名查询参数值
      */
     @GetMapping(value = "/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable String configKey)
-    {
+    public AjaxResult getConfigKey(@PathVariable String configKey) {
         return AjaxResult.success(configService.selectConfigByKey(configKey));
     }
 
     /**
      * 新增参数配置
      */
-    @PreAuthorize("@ss.hasPermi('system:config:add')")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysConfig config)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysConfig config) {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
             return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setCreateBy(getUsername());
@@ -95,13 +84,10 @@ public class SysConfigController extends BaseController
     /**
      * 修改参数配置
      */
-    @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfig config)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
+    public AjaxResult edit(@Validated @RequestBody SysConfig config) {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
             return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setUpdateBy(getUsername());
@@ -111,11 +97,9 @@ public class SysConfigController extends BaseController
     /**
      * 删除参数配置
      */
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] configIds) {
         configService.deleteConfigByIds(configIds);
         return success();
     }
@@ -123,11 +107,9 @@ public class SysConfigController extends BaseController
     /**
      * 刷新参数缓存
      */
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public AjaxResult refreshCache()
-    {
+    public AjaxResult refreshCache() {
         configService.resetConfigCache();
         return AjaxResult.success();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,10 +1,15 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.Iterator;
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,34 +19,26 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysDeptService;
+
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * 部门信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/dept")
-public class SysDeptController extends BaseController
-{
+public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
 
     /**
      * 获取部门列表
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
-    {
+    public AjaxResult list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(depts);
     }
@@ -49,18 +46,14 @@ public class SysDeptController extends BaseController
     /**
      * 查询部门列表（排除节点）
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
-    {
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
-        while (it.hasNext())
-        {
+        while (it.hasNext()) {
             SysDept d = (SysDept) it.next();
             if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
-            {
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) {
                 it.remove();
             }
         }
@@ -70,10 +63,8 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
-    {
+    public AjaxResult getInfo(@PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
         return AjaxResult.success(deptService.selectDeptById(deptId));
     }
@@ -82,8 +73,7 @@ public class SysDeptController extends BaseController
      * 获取部门下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysDept dept)
-    {
+    public AjaxResult treeselect(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
@@ -92,8 +82,7 @@ public class SysDeptController extends BaseController
      * 加载对应角色部门列表树
      */
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
-    {
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
@@ -104,13 +93,10 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysDept dept) {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(getUsername());
@@ -120,23 +106,16 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysDept dept) {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if (dept.getParentId().equals(deptId))
-        {
+        } else if (dept.getParentId().equals(deptId)) {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
-        {
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
             return AjaxResult.error("该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(getUsername());
@@ -146,17 +125,13 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
-    {
-        if (deptService.hasChildByDeptId(deptId))
-        {
+    public AjaxResult remove(@PathVariable Long deptId) {
+        if (deptService.hasChildByDeptId(deptId)) {
             return AjaxResult.error("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
-        {
+        if (deptService.checkDeptExistUser(deptId)) {
             return AjaxResult.error("部门存在用户,不允许删除");
         }
         deptService.checkDeptDataScope(deptId);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -1,19 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -24,36 +10,45 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 数据字典信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;
 
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
-    {
+    public TableDataInfo list(SysDictData dictData) {
         startPage();
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
     }
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictData dictData)
-    {
+    public void export(HttpServletResponse response, SysDictData dictData) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         util.exportExcel(response, list, "字典数据");
@@ -62,10 +57,8 @@ public class SysDictDataController extends BaseController
     /**
      * 查询字典数据详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
-    {
+    public AjaxResult getInfo(@PathVariable Long dictCode) {
         return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
     }
 
@@ -73,11 +66,9 @@ public class SysDictDataController extends BaseController
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
-    {
+    public AjaxResult dictType(@PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data))
-        {
+        if (StringUtils.isNull(data)) {
             data = new ArrayList<SysDictData>();
         }
         return AjaxResult.success(data);
@@ -86,11 +77,9 @@ public class SysDictDataController extends BaseController
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
         dict.setCreateBy(getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
@@ -98,11 +87,9 @@ public class SysDictDataController extends BaseController
     /**
      * 修改保存字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
         dict.setUpdateBy(getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
@@ -110,11 +97,9 @@ public class SysDictDataController extends BaseController
     /**
      * 删除字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
-    {
+    public AjaxResult remove(@PathVariable Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -1,9 +1,15 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictType;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,42 +19,31 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDictType;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDictTypeService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 数据字典信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/dict/type")
-public class SysDictTypeController extends BaseController
-{
+public class SysDictTypeController extends BaseController {
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictType dictType)
-    {
+    public TableDataInfo list(SysDictType dictType) {
         startPage();
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         return getDataTable(list);
     }
 
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictType dictType)
-    {
+    public void export(HttpServletResponse response, SysDictType dictType) {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
         util.exportExcel(response, list, "字典类型");
@@ -57,23 +52,18 @@ public class SysDictTypeController extends BaseController
     /**
      * 查询字典类型详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictId}")
-    public AjaxResult getInfo(@PathVariable Long dictId)
-    {
+    public AjaxResult getInfo(@PathVariable Long dictId) {
         return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
     }
 
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictType dict)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysDictType dict) {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
             return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setCreateBy(getUsername());
@@ -83,13 +73,10 @@ public class SysDictTypeController extends BaseController
     /**
      * 修改字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict) {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
             return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setUpdateBy(getUsername());
@@ -99,11 +86,9 @@ public class SysDictTypeController extends BaseController
     /**
      * 删除字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public AjaxResult remove(@PathVariable Long[] dictIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
         return success();
     }
@@ -111,11 +96,9 @@ public class SysDictTypeController extends BaseController
     /**
      * 刷新字典缓存
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public AjaxResult refreshCache()
-    {
+    public AjaxResult refreshCache() {
         dictTypeService.resetDictCache();
         return AjaxResult.success();
     }
@@ -124,8 +107,7 @@ public class SysDictTypeController extends BaseController
      * 获取字典选择框列表
      */
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
-    {
+    public AjaxResult optionselect() {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
         return AjaxResult.success(dictTypes);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,8 +1,14 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,34 +18,25 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysMenuService;
+
+import java.util.List;
 
 /**
  * 菜单信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
-{
+public class SysMenuController extends BaseController {
     @Autowired
     private ISysMenuService menuService;
 
     /**
      * 获取菜单列表
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
-    {
+    public AjaxResult list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return AjaxResult.success(menus);
     }
@@ -47,10 +44,8 @@ public class SysMenuController extends BaseController
     /**
      * 根据菜单编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
-    {
+    public AjaxResult getInfo(@PathVariable Long menuId) {
         return AjaxResult.success(menuService.selectMenuById(menuId));
     }
 
@@ -58,8 +53,7 @@ public class SysMenuController extends BaseController
      * 获取菜单下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
-    {
+    public AjaxResult treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
     }
@@ -68,8 +62,7 @@ public class SysMenuController extends BaseController
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
-    {
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysMenu> menus = menuService.selectMenuList(getUserId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@@ -80,17 +73,12 @@ public class SysMenuController extends BaseController
     /**
      * 新增菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysMenu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(getUsername());
@@ -100,21 +88,14 @@ public class SysMenuController extends BaseController
     /**
      * 修改菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(getUsername());
@@ -124,17 +105,13 @@ public class SysMenuController extends BaseController
     /**
      * 删除菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
-    {
-        if (menuService.hasChildByMenuId(menuId))
-        {
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+        if (menuService.hasChildByMenuId(menuId)) {
             return AjaxResult.error("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
-        {
+        if (menuService.checkMenuExistRole(menuId)) {
             return AjaxResult.error("菜单已分配,不允许删除");
         }
         return toAjax(menuService.deleteMenuById(menuId));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -17,7 +17,6 @@ import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -51,7 +50,6 @@ public class SysRoleController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role) {
         startPage();
@@ -60,7 +58,6 @@ public class SysRoleController extends BaseController {
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysRole role) {
         List<SysRole> list = roleService.selectRoleList(role);
@@ -71,7 +68,6 @@ public class SysRoleController extends BaseController {
     /**
      * 根据角色编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
     public AjaxResult getInfo(@PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
@@ -81,7 +77,6 @@ public class SysRoleController extends BaseController {
     /**
      * 新增角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysRole role) {
@@ -98,7 +93,6 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role) {
@@ -127,7 +121,6 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存数据权限
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role) {
@@ -139,7 +132,6 @@ public class SysRoleController extends BaseController {
     /**
      * 状态修改
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role) {
@@ -152,7 +144,6 @@ public class SysRoleController extends BaseController {
     /**
      * 删除角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
     public AjaxResult remove(@PathVariable Long[] roleIds) {
@@ -162,7 +153,6 @@ public class SysRoleController extends BaseController {
     /**
      * 获取角色选择框列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
     public AjaxResult optionselect() {
         return AjaxResult.success(roleService.selectRoleAll());
@@ -182,7 +172,6 @@ public class SysRoleController extends BaseController {
     /**
      * 查询未分配用户角色列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo unallocatedList(SysUser user) {
         startPage();
@@ -193,7 +182,6 @@ public class SysRoleController extends BaseController {
     /**
      * 取消授权用户
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
@@ -203,7 +191,6 @@ public class SysRoleController extends BaseController {
     /**
      * 批量取消授权用户
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
     public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
@@ -213,7 +200,6 @@ public class SysRoleController extends BaseController {
     /**
      * 批量选择用户授权
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -16,7 +16,6 @@ import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,7 +51,6 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
         startPage();
@@ -67,7 +65,6 @@ public class SysUserController extends BaseController {
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user) {
         List<SysUser> list = userService.selectUserList(user);
@@ -76,7 +73,6 @@ public class SysUserController extends BaseController {
     }
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -95,7 +91,6 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{userId}"})
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
@@ -115,7 +110,6 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user) {
@@ -136,7 +130,6 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
@@ -156,7 +149,6 @@ public class SysUserController extends BaseController {
     /**
      * 删除用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds) {
@@ -169,7 +161,6 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
@@ -183,7 +174,6 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
@@ -196,7 +186,6 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取授权角色
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
@@ -210,7 +199,6 @@ public class SysUserController extends BaseController {
     /**
      * 用户授权角色
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -2,6 +2,7 @@ package ${packageName}.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,90 +27,76 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * ${functionName}Controller
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
     @Autowired
     private I${ClassName}Service ${className}Service;
 
-    /**
-     * 查询${functionName}列表
-     */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
-    @GetMapping("/list")
-#if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className})
-    {
+/**
+ * 查询${functionName}列表
+ */
+@GetMapping("/list")
+    #if($table.crud || $table.sub)
+    public TableDataInfo list(${ClassName} ${className}) {
         startPage();
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return getDataTable(list);
     }
-#elseif($table.tree)
-    public AjaxResult list(${ClassName} ${className})
-    {
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        return AjaxResult.success(list);
-    }
-#end
+    #elseif($table.tree)
+        public AjaxResult list(${ClassName} ${className}) {
+            List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+            return AjaxResult.success(list);
+        }
+    #end
 
     /**
      * 导出${functionName}列表
      */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${className})
-    {
+    public void export(HttpServletResponse response, ${ClassName} ${className}) {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class);
         util.exportExcel(response, list, "${functionName}数据");
     }
 
     /**
      * 获取${functionName}详细信息
      */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
     @GetMapping(value = "/{${pkColumn.javaField}}")
-    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
         return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
     }
 
     /**
      * 新增${functionName}
      */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult add(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
     /**
      * 修改${functionName}
      */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.update${ClassName}(${className}));
     }
 
     /**
      * 删除${functionName}
      */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    @DeleteMapping("/{${pkColumn.javaField}s}")
+    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
     }
 }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java

@@ -1,15 +1,5 @@
 package com.ruoyi.quartz.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -18,26 +8,34 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.quartz.domain.SysJobLog;
 import com.ruoyi.quartz.service.ISysJobLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 调度日志操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/monitor/jobLog")
-public class SysJobLogController extends BaseController
-{
+public class SysJobLogController extends BaseController {
     @Autowired
     private ISysJobLogService jobLogService;
 
     /**
      * 查询定时任务调度日志列表
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysJobLog sysJobLog)
-    {
+    public TableDataInfo list(SysJobLog sysJobLog) {
         startPage();
         List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
         return getDataTable(list);
@@ -49,20 +47,18 @@ public class SysJobLogController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:job:export')")
     @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysJobLog sysJobLog)
-    {
+    public void export(HttpServletResponse response, SysJobLog sysJobLog) {
         List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
         ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
         util.exportExcel(response, list, "调度日志");
     }
-    
+
     /**
      * 根据调度编号获取详细信息
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:query')")
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long jobLogId)
-    {
+    public AjaxResult getInfo(@PathVariable Long jobLogId) {
         return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
     }
 
@@ -73,8 +69,7 @@ public class SysJobLogController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobLogIds}")
-    public AjaxResult remove(@PathVariable Long[] jobLogIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] jobLogIds) {
         return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
     }
 
@@ -84,8 +79,7 @@ public class SysJobLogController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @Log(title = "调度日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public AjaxResult clean()
-    {
+    public AjaxResult clean() {
         jobLogService.cleanJobLog();
         return AjaxResult.success();
     }

ruoyi-system/src/main/java/com/ruoyi/qdtl/domain/TlIncident.java

@@ -101,6 +101,26 @@ public class TlIncident extends BaseEntity {
     @Excel(name = "处理人姓名")
     private String dealUserName;
 
+    private String dealRemark;
+
+    private String dealPics;
+
+    public String getDealRemark() {
+        return dealRemark;
+    }
+
+    public void setDealRemark(String dealRemark) {
+        this.dealRemark = dealRemark;
+    }
+
+    public String getDealPics() {
+        return dealPics;
+    }
+
+    public void setDealPics(String dealPics) {
+        this.dealPics = dealPics;
+    }
+
     /**
      * 处理时间
      */

ruoyi-system/src/main/java/com/ruoyi/qdtl/domain/TlInspectionLocationLog.java

@@ -32,6 +32,9 @@ public class TlInspectionLocationLog extends BaseEntity {
     @Excel(name = "巡检点名称")
     private String checkpointName;
 
+    @Excel(name = "区域")
+    private String areaName;
+
     /**
      * 巡检点卡号
      */
@@ -80,12 +83,6 @@ public class TlInspectionLocationLog extends BaseEntity {
     private List<String> areaIds;
 
     /**
-     * 组织名称
-     */
-    @Excel(name = "组织名称")
-    private String areaName;
-
-    /**
      * 经纬度
      */
     private String fence;

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/impl/TlElectricDeviceLocationServiceImpl.java

@@ -1,8 +1,10 @@
 package com.ruoyi.qdtl.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.qdtl.domain.ElectricDeviceLocationRecord;
 import com.ruoyi.qdtl.domain.TlElectricCarMileage;
 import com.ruoyi.qdtl.domain.TlElectricDeviceLocation;
@@ -14,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +37,8 @@ public class TlElectricDeviceLocationServiceImpl implements ITlElectricDeviceLoc
     private ITlElectricCarMileageService electricCarMileageService;
     @Autowired
     private IQdCommonService qdCommonService;
+    @Autowired
+    private RedisCache redisCache;
 
     /**
      * 查询电动车定位设备轨迹
@@ -93,11 +98,24 @@ public class TlElectricDeviceLocationServiceImpl implements ITlElectricDeviceLoc
     @Override
     public void syncDeviceLocation() {
         List<TlElectricDeviceLocation> electricCarsDeviceLocationList = qdCommonService.getElectricCarsDeviceLocationList();
-        electricCarsDeviceLocationList = electricCarsDeviceLocationList.stream().filter(a -> StrUtil.equals(a.getActivationFlag(), "1")).collect(Collectors.toList());
-        if (electricCarsDeviceLocationList.size() > 0) {
-            tlElectricDeviceLocationMapper.saveBatch(electricCarsDeviceLocationList);
+        List<TlElectricDeviceLocation> saveList = new ArrayList<>();
+        for (TlElectricDeviceLocation tlElectricDeviceLocation : electricCarsDeviceLocationList) {
+            if (StrUtil.equals(tlElectricDeviceLocation.getActivationFlag(), "1")) {
+                // 查询是否与上次的值相同
+                String cacheLng = redisCache.getCacheObject("tl:electric:location:" + tlElectricDeviceLocation.getImei());
+                if (StrUtil.equals(tlElectricDeviceLocation.getLng(), cacheLng)) {
+                    continue;
+                }
+                redisCache.setCacheObject("tl:electric:location:" + tlElectricDeviceLocation.getImei(), tlElectricDeviceLocation.getLng());
+                TlElectricDeviceLocation newBean = new TlElectricDeviceLocation();
+                BeanUtil.copyProperties(tlElectricDeviceLocation, newBean);
+                saveList.add(newBean);
+            }
+        }
+        if (saveList.size() > 0) {
+            tlElectricDeviceLocationMapper.saveBatch(saveList);
         }
-        log.info("同步最新的定位数据量：{}条", electricCarsDeviceLocationList.size());
+        log.info("同步最新的定位数据量：{}条", saveList.size());
     }
 
     @Override

ruoyi-system/src/main/resources/mapper/qdtl/TlIncidentMapper.xml

@@ -21,6 +21,8 @@
         <result property="dealUser" column="deal_user"/>
         <result property="dealUserName" column="deal_user_name"/>
         <result property="dealTime" column="deal_time"/>
+        <result property="dealRemark" column="deal_remark"/>
+        <result property="dealPics" column="deal_pics"/>
     </resultMap>
 
     <sql id="selectTlIncidentVo">
@@ -39,7 +41,9 @@
                status,
                deal_user,
                deal_user_name,
-               deal_time
+               deal_time,
+               deal_remark,
+               deal_pics
         from tl_incident
     </sql>
 
@@ -87,6 +91,8 @@
             <if test="dealUser != null">deal_user,</if>
             <if test="dealUserName != null">deal_user_name,</if>
             <if test="dealTime != null">deal_time,</if>
+            <if test="dealRemark != null">deal_remark,</if>
+            <if test="dealPics != null">deal_pics,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -104,6 +110,8 @@
             <if test="dealUser != null">#{dealUser},</if>
             <if test="dealUserName != null">#{dealUserName},</if>
             <if test="dealTime != null">#{dealTime},</if>
+            <if test="dealRemark != null">#{dealRemark},</if>
+            <if test="dealPics != null">#{dealPics},</if>
         </trim>
     </insert>
 
@@ -125,6 +133,8 @@
             <if test="dealUser != null">deal_user = #{dealUser},</if>
             <if test="dealUserName != null">deal_user_name = #{dealUserName},</if>
             <if test="dealTime != null">deal_time = #{dealTime},</if>
+            <if test="dealRemark != null">deal_remark = #{dealRemark},</if>
+            <if test="dealPics != null">deal_pics = #{dealPics},</if>
         </trim>
         where id = #{id}
     </update>