LY 去除大屏接口权限

master/src/main/java/com/ruoyi/project/aspen/controller/TElecdashboardAlarmController.java

@@ -36,7 +36,6 @@ public class TElecdashboardAlarmController extends BaseController
     /**
      * 查询电厂大屏预警列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:alarm:list')")
     @GetMapping("/list")
     public TableDataInfo list(TElecdashboardAlarm tElecdashboardAlarm)
     {
@@ -48,7 +47,6 @@ public class TElecdashboardAlarmController extends BaseController
     /**
      * 导出电厂大屏预警列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:alarm:export')")
     @Log(title = "电厂大屏预警", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TElecdashboardAlarm tElecdashboardAlarm)
@@ -61,7 +59,6 @@ public class TElecdashboardAlarmController extends BaseController
     /**
      * 获取电厂大屏预警详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:alarm:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +68,6 @@ public class TElecdashboardAlarmController extends BaseController
     /**
      * 新增电厂大屏预警
      */
-    @PreAuthorize("@ss.hasPermi('aspen:alarm:add')")
     @Log(title = "电厂大屏预警", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TElecdashboardAlarm tElecdashboardAlarm)
@@ -82,7 +78,6 @@ public class TElecdashboardAlarmController extends BaseController
     /**
      * 修改电厂大屏预警
      */
-    @PreAuthorize("@ss.hasPermi('aspen:alarm:edit')")
     @Log(title = "电厂大屏预警", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TElecdashboardAlarm tElecdashboardAlarm)
@@ -93,7 +88,6 @@ public class TElecdashboardAlarmController extends BaseController
     /**
      * 删除电厂大屏预警
      */
-    @PreAuthorize("@ss.hasPermi('aspen:alarm:remove')")
     @Log(title = "电厂大屏预警", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/aspen/controller/TElecdashboardDayController.java

@@ -36,7 +36,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 查询日期最靠前的30条电厂大屏每日数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:list')")
     @GetMapping("/listLatest30")
     public TableDataInfo listLatest30()
     {
@@ -48,7 +47,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 查询日期最靠前的7条电厂大屏每日数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:list')")
     @GetMapping("/listLatest7")
     public TableDataInfo listLatest7()
     {
@@ -60,7 +58,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 查询电厂大屏每日数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:list')")
     @GetMapping("/list")
     public TableDataInfo list(TElecdashboardDay tElecdashboardDay)
     {
@@ -72,7 +69,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 导出电厂大屏每日数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:export')")
     @Log(title = "电厂大屏每日数据", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TElecdashboardDay tElecdashboardDay)
@@ -85,7 +81,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 获取电厂大屏每日数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -95,7 +90,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 新增电厂大屏每日数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:add')")
     @Log(title = "电厂大屏每日数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TElecdashboardDay tElecdashboardDay)
@@ -106,7 +100,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 修改电厂大屏每日数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:edit')")
     @Log(title = "电厂大屏每日数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TElecdashboardDay tElecdashboardDay)
@@ -117,7 +110,6 @@ public class TElecdashboardDayController extends BaseController
     /**
      * 删除电厂大屏每日数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:day:remove')")
     @Log(title = "电厂大屏每日数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/aspen/controller/TElecdashboardHourController.java

@@ -36,7 +36,6 @@ public class TElecdashboardHourController extends BaseController
     /**
      * 查询日期最靠前的24条电厂大屏每小时数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:hour:list')")
     @GetMapping("/listLatest24")
     public TableDataInfo listLatest24()
     {
@@ -48,7 +47,6 @@ public class TElecdashboardHourController extends BaseController
     /**
      * 查询电厂大屏每小时数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:hour:list')")
     @GetMapping("/list")
     public TableDataInfo list(TElecdashboardHour tElecdashboardHour)
     {
@@ -60,7 +58,6 @@ public class TElecdashboardHourController extends BaseController
     /**
      * 导出电厂大屏每小时数据列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:hour:export')")
     @Log(title = "电厂大屏每小时数据", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TElecdashboardHour tElecdashboardHour)
@@ -73,7 +70,6 @@ public class TElecdashboardHourController extends BaseController
     /**
      * 获取电厂大屏每小时数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:hour:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -83,7 +79,6 @@ public class TElecdashboardHourController extends BaseController
     /**
      * 新增电厂大屏每小时数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:hour:add')")
     @Log(title = "电厂大屏每小时数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TElecdashboardHour tElecdashboardHour)
@@ -94,7 +89,6 @@ public class TElecdashboardHourController extends BaseController
     /**
      * 修改电厂大屏每小时数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:hour:edit')")
     @Log(title = "电厂大屏每小时数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TElecdashboardHour tElecdashboardHour)
@@ -105,7 +99,6 @@ public class TElecdashboardHourController extends BaseController
     /**
      * 删除电厂大屏每小时数据
      */
-    @PreAuthorize("@ss.hasPermi('aspen:hour:remove')")
     @Log(title = "电厂大屏每小时数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/aspen/controller/TElecdashboardRealtimeController.java

@@ -36,7 +36,6 @@ public class TElecdashboardRealtimeController extends BaseController
     /**
      * 获取日期最靠前的电厂大屏实时数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:realtime:query')")
     @GetMapping("/getInfoByMaxDate")
     public AjaxResult getInfoByMaxDate()
     {
@@ -46,7 +45,6 @@ public class TElecdashboardRealtimeController extends BaseController
     /**
      * 查询【请填写功能名称】列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:realtime:list')")
     @GetMapping("/list")
     public TableDataInfo list(TElecdashboardRealtime tElecdashboardRealtime)
     {
@@ -58,7 +56,6 @@ public class TElecdashboardRealtimeController extends BaseController
     /**
      * 导出【请填写功能名称】列表
      */
-    @PreAuthorize("@ss.hasPermi('aspen:realtime:export')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TElecdashboardRealtime tElecdashboardRealtime)
@@ -71,7 +68,6 @@ public class TElecdashboardRealtimeController extends BaseController
     /**
      * 获取【请填写功能名称】详细信息
      */
-    @PreAuthorize("@ss.hasPermi('aspen:realtime:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -81,7 +77,6 @@ public class TElecdashboardRealtimeController extends BaseController
     /**
      * 新增【请填写功能名称】
      */
-    @PreAuthorize("@ss.hasPermi('aspen:realtime:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TElecdashboardRealtime tElecdashboardRealtime)
@@ -92,7 +87,6 @@ public class TElecdashboardRealtimeController extends BaseController
     /**
      * 修改【请填写功能名称】
      */
-    @PreAuthorize("@ss.hasPermi('aspen:realtime:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TElecdashboardRealtime tElecdashboardRealtime)
@@ -103,7 +97,6 @@ public class TElecdashboardRealtimeController extends BaseController
     /**
      * 删除【请填写功能名称】
      */
-    @PreAuthorize("@ss.hasPermi('aspen:realtime:remove')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -77,7 +77,7 @@ public class TJobticketController extends BaseController {
             //查询续票
             if (list.size() > 0) {
                 //线程池
-                ExecutorService executorService = Executors.newFixedThreadPool(list.size());
+                ExecutorService executorService = Executors.newFixedThreadPool(20);
                 final CountDownLatch latch = new CountDownLatch(list.size()); //相同线程数量的计数
                 for (TJobticket t : list
                 ) {

master/src/main/java/com/ruoyi/project/sems/mapper/TMeasureThicknessMapper.java

@@ -48,7 +48,6 @@ public interface TMeasureThicknessMapper extends BaseMapper<TMeasureThickness> {
 
     /**
      * 新增定点测厚
-     *
      * @param tMeasureThickness 定点测厚
      * @return 结果
      */