diff --git a/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobController.java b/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobController.java
index 735ed1b0..8fc0d513 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobController.java
@@ -39,7 +39,7 @@ public class DcBatchFunctionsJobController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:list')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:list')")
     @GetMapping("list")
     public TableDataInfo listFacility(DcBatchFunctionsJob dcBatchFunctionsJob) {
         return getDataTable(dcBatchFunctionsJobService.pageDcBatchFunctionsJob(dcBatchFunctionsJob));
@@ -52,7 +52,7 @@ public class DcBatchFunctionsJobController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("query")
     public AjaxResult queryFacility(DcBatchFunctionsJob dcBatchFunctionsJob) throws SchedulerException {
         return AjaxResult.success(dcBatchFunctionsJobService.listDcBatchFunctionsJob(dcBatchFunctionsJob));
@@ -65,7 +65,7 @@ public class DcBatchFunctionsJobController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询信息")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("{id}")
     public AjaxResult getFacility(@PathVariable String id) {
         return AjaxResult.success(dcBatchFunctionsJobService.getById(id));
@@ -79,7 +79,7 @@ public class DcBatchFunctionsJobController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:facility:add')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:add')")
     @Log(title = "新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addFacility(@Valid @RequestBody DcBatchFunctionsJob dcBatchFunctionsJob) throws SchedulerException, TaskException {
@@ -93,7 +93,7 @@ public class DcBatchFunctionsJobController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
+ //   @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
     @Log(title = "修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editFacility(@Valid @RequestBody DcBatchFunctionsJob dcBatchFunctionsJob) throws SchedulerException, TaskException {
@@ -107,7 +107,7 @@ public class DcBatchFunctionsJobController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeFacility(@PathVariable List<String> ids) throws SchedulerException, TaskException {
@@ -120,7 +120,7 @@ public class DcBatchFunctionsJobController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/time/{groupId}/{time}")
     public AjaxResult deletesATaskByTime(@PathVariable String groupId, @PathVariable String time) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobGroupController.java b/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobGroupController.java
index a484ccd1..e4b043a9 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobGroupController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcBatchFunctionsJobGroupController.java
@@ -39,7 +39,7 @@ public class DcBatchFunctionsJobGroupController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:list')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:list')")
     @GetMapping("list")
     public TableDataInfo listFacility(DcBatchFunctionsJobGroup dcBatchFunctionsJobGroup) {
         return getDataTable(dcBatchFunctionsJobGroupService.pageDcBatchFunctionsJobGroup(dcBatchFunctionsJobGroup));
@@ -52,7 +52,7 @@ public class DcBatchFunctionsJobGroupController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("query")
     public AjaxResult queryFacility(DcBatchFunctionsJobGroup dcBatchFunctionsJobGroup) {
         return AjaxResult.success(dcBatchFunctionsJobGroupService.listDcBatchFunctionsJobGroup(dcBatchFunctionsJobGroup));
@@ -65,7 +65,7 @@ public class DcBatchFunctionsJobGroupController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询信息")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("{id}")
     public AjaxResult getFacility(@PathVariable String id) {
         return AjaxResult.success(dcBatchFunctionsJobGroupService.getById(id));
@@ -79,7 +79,7 @@ public class DcBatchFunctionsJobGroupController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:facility:add')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:add')")
     @Log(title = "新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addFacility(@Valid @RequestBody DcBatchFunctionsJobGroup dcBatchFunctionsJobGroup) {
@@ -93,7 +93,7 @@ public class DcBatchFunctionsJobGroupController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:edit')")
     @Log(title = "修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editFacility(@Valid @RequestBody DcBatchFunctionsJobGroup dcBatchFunctionsJobGroup) {
@@ -107,7 +107,7 @@ public class DcBatchFunctionsJobGroupController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeFacility(@PathVariable List<String> ids) {
@@ -124,7 +124,7 @@ public class DcBatchFunctionsJobGroupController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("改变状态")
-    @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
     @Log(title = "改变状态", businessType = BusinessType.DELETE)
     @PostMapping("changeStatus")
     public AjaxResult changeStatus(@Valid @RequestBody DcBatchFunctionsJobGroup dcBatchFunctionsJobGroup) throws SchedulerException, TaskException {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
index 0893228a..f37c41de 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
@@ -75,7 +75,7 @@ public class DcDeviceController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询设备列表")
-    @PreAuthorize("@ss.hasPermi('iot:device:list')")
+  //  @PreAuthorize("@ss.hasPermi('iot:device:list')")
     @GetMapping("list")
     public TableDataInfo listDevice(DcDevice dcDevice) {
         return getDataTable(dcDeviceService.pageDevice(dcDevice));
@@ -87,7 +87,7 @@ public class DcDeviceController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("统计异常设备")
-    @PreAuthorize("@ss.hasPermi('iot:device:list')")
+  //  @PreAuthorize("@ss.hasPermi('iot:device:list')")
     @GetMapping("abnormalDevice")
     public AjaxResult statisticalAnomalyDevice() {
         return AjaxResult.success(dcDeviceService.statisticalAnomalyDevice());
@@ -100,7 +100,7 @@ public class DcDeviceController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询设备列表")
-    @PreAuthorize("@ss.hasPermi('iot:device:query')")
+  //  @PreAuthorize("@ss.hasPermi('iot:device:query')")
     @GetMapping("query")
     public AjaxResult queryDevice(DcDevice dcDevice) {
         return AjaxResult.success(dcDeviceService.listDevice(dcDevice));
@@ -113,7 +113,7 @@ public class DcDeviceController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页根据设备桩号查询设备列表")
-    @PreAuthorize("@ss.hasPermi('iot:device:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:device:query')")
     @PostMapping("pileNumberQuery")
     public AjaxResult devicePileNumberQueryDevice(@RequestBody Map<String, Object> parameter) {
         return AjaxResult.success(dcDeviceService.devicePileNumberQueryDevice(parameter));
@@ -126,7 +126,7 @@ public class DcDeviceController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询设备信息")
-    @PreAuthorize("@ss.hasPermi('iot:device:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:device:query')")
     @GetMapping("{id}")
     public AjaxResult getDevice(@PathVariable String id) {
         return AjaxResult.success(dcDeviceService.getDevice(id));
@@ -158,7 +158,7 @@ public class DcDeviceController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:device:add')")
+   // @PreAuthorize("@ss.hasPermi('iot:device:add')")
     @Log(title = "新增设备", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addDevice(@Valid @RequestBody DcDevice dcDevice) {
@@ -172,7 +172,7 @@ public class DcDeviceController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:device:edit')")
+ //   @PreAuthorize("@ss.hasPermi('iot:device:edit')")
     @Log(title = "修改设备", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editDevice(@Valid @RequestBody DcDevice dcDevice) {
@@ -186,7 +186,7 @@ public class DcDeviceController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:device:remove')")
+   // @PreAuthorize("@ss.hasPermi('iot:device:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeDevice(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java b/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java
index 44555175..ff87b615 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java
@@ -35,7 +35,7 @@ public class DcEmergencyPlansController extends BaseController {
      * 交通事件-根据事件数据查询事件预案列表
      */
     @ApiOperation("交通事件-根据事件数据查询事件预案列表")
-    @PreAuthorize("@ss.hasPermi('business:plans:list')")
+    //@PreAuthorize("@ss.hasPermi('business:plans:list')")
     @PostMapping("/list/event/type")
     public AjaxResult listByEventType(@RequestBody DcEvent dcEvent) {
 
@@ -58,7 +58,7 @@ public class DcEmergencyPlansController extends BaseController {
      * 交通事件确定
      */
     @ApiOperation("交通事件确定")
-    @PreAuthorize("@ss.hasPermi('business:plans:edit')")
+    //@PreAuthorize("@ss.hasPermi('business:plans:edit')")
     @PostMapping("/event/confirm")
     public AjaxResult eventConfirm(@RequestBody DcEventAnDcEmergencyPlans dcEventAnDcEmergencyPlans) {
         return AjaxResult.success(dcEmergencyPlansService.executionEventConfirmation(dcEventAnDcEmergencyPlans));
@@ -110,7 +110,7 @@ public class DcEmergencyPlansController extends BaseController {
      * 新增事件预案
      */
     @ApiOperation("新增预案")
-    @PreAuthorize("@ss.hasPermi('business:plans:add')")
+    //@PreAuthorize("@ss.hasPermi('business:plans:add')")
     @PostMapping
     public AjaxResult add(@RequestBody DcEmergencyPlans dcEmergencyPlans) {
         return toAjax(dcEmergencyPlansService.insertDcEmergencyPlans(dcEmergencyPlans));
@@ -120,7 +120,7 @@ public class DcEmergencyPlansController extends BaseController {
      * 修改事件预案
      */
     @ApiOperation("修改预案")
-    @PreAuthorize("@ss.hasPermi('business:plans:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:plans:edit')")
     @PutMapping
     public AjaxResult update(@RequestBody DcEmergencyPlans dcEmergencyPlans) {
         return toAjax(dcEmergencyPlansService.updateDcEmergencyPlans(dcEmergencyPlans));
@@ -130,7 +130,7 @@ public class DcEmergencyPlansController extends BaseController {
      * 批量删除事件预案
      */
     @ApiOperation("批量删除预案")
-    @PreAuthorize("@ss.hasPermi('business:plans:remove')")
+   // @PreAuthorize("@ss.hasPermi('business:plans:remove')")
     @DeleteMapping("/{ids}")
     public AjaxResult update(@PathVariable String[] ids) {
         return toAjax(dcEmergencyPlansService.deleteDcEmergencyPlans(ids));
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java b/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java
index 6630f959..99b64e8e 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcEmployeesController.java
@@ -43,7 +43,7 @@ public class DcEmployeesController extends BaseController
      * 查询值班人员信息列表
      */
     @ApiOperation("获取人员信息列表")
-    @PreAuthorize("@ss.hasPermi('business:employees:list')")
+   // @PreAuthorize("@ss.hasPermi('business:employees:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcEmployees dcEmployees)
     {
@@ -60,7 +60,7 @@ public class DcEmployeesController extends BaseController
      * 查询值班人员信息列表不分页
      */
     @ApiOperation("获取人员信息列表")
-    @PreAuthorize("@ss.hasPermi('business:employees:list')")
+  //  @PreAuthorize("@ss.hasPermi('business:employees:list')")
     @GetMapping("/listAll")
     public AjaxResult listAll(DcEmployees dcEmployees)
     {
@@ -75,7 +75,7 @@ public class DcEmployeesController extends BaseController
      * 导出值班人员信息列表
      */
     @ApiOperation("导出值班人员信息列表")
-    @PreAuthorize("@ss.hasPermi('business:employees:export')")
+   // @PreAuthorize("@ss.hasPermi('business:employees:export')")
     @Log(title = "值班人员信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcEmployees dcEmployees)
@@ -88,7 +88,7 @@ public class DcEmployeesController extends BaseController
      * 获取值班人员信息详细信息
      */
     @ApiOperation("获取人员信息详细信息")
-    @PreAuthorize("@ss.hasPermi('business:employees:query')")
+   // @PreAuthorize("@ss.hasPermi('business:employees:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -99,7 +99,7 @@ public class DcEmployeesController extends BaseController
      * 新增值班人员信息
      */
     @ApiOperation("新增人员信息")
-    @PreAuthorize("@ss.hasPermi('business:employees:add')")
+  //  @PreAuthorize("@ss.hasPermi('business:employees:add')")
     @Log(title = "值班人员信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcEmployees dcEmployees)
@@ -111,7 +111,7 @@ public class DcEmployeesController extends BaseController
      * 修改值班人员信息
      */
     @ApiOperation("修改人员信息")
-    @PreAuthorize("@ss.hasPermi('business:employees:edit')")
+    //@PreAuthorize("@ss.hasPermi('business:employees:edit')")
     @Log(title = "值班人员信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcEmployees dcEmployees)
@@ -123,7 +123,7 @@ public class DcEmployeesController extends BaseController
      * 删除值班人员信息
      */
     @ApiOperation("删除人员信息")
-    @PreAuthorize("@ss.hasPermi('business:employees:remove')")
+   // @PreAuthorize("@ss.hasPermi('business:employees:remove')")
     @Log(title = "值班人员信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventHistoryController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventHistoryController.java
index 116374e4..17b8b913 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcEventHistoryController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcEventHistoryController.java
@@ -72,7 +72,7 @@ public class DcEventHistoryController extends BaseController
      */
     @ApiOperation("获取事件历史信息详细信息")
 
-    @PreAuthorize("@ss.hasPermi('system:history:query')")
+   // @PreAuthorize("@ss.hasPermi('system:history:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -84,7 +84,7 @@ public class DcEventHistoryController extends BaseController
      */
     @ApiOperation("新增事件历史信息")
 
-    @PreAuthorize("@ss.hasPermi('system:history:add')")
+  //  @PreAuthorize("@ss.hasPermi('system:history:add')")
     @Log(title = "事件历史信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcEventHistory dcEventHistory)
@@ -97,7 +97,7 @@ public class DcEventHistoryController extends BaseController
      */
     @ApiOperation("修改事件历史信息")
 
-    @PreAuthorize("@ss.hasPermi('system:history:edit')")
+ //   @PreAuthorize("@ss.hasPermi('system:history:edit')")
     @Log(title = "事件历史信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcEventHistory dcEventHistory)
@@ -110,7 +110,7 @@ public class DcEventHistoryController extends BaseController
      */
     @ApiOperation("删除事件历史信息")
 
-    @PreAuthorize("@ss.hasPermi('system:history:remove')")
+   // @PreAuthorize("@ss.hasPermi('system:history:remove')")
     @Log(title = "事件历史信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcFacilityController.java b/zc-business/src/main/java/com/zc/business/controller/DcFacilityController.java
index a24d8358..88aec8d0 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcFacilityController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcFacilityController.java
@@ -37,7 +37,7 @@ public class DcFacilityController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询路网设施列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:list')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:list')")
     @GetMapping("list")
     public TableDataInfo listFacility(DcFacility dcFacility) {
         return getDataTable(dcFacilityService.pageFacility(dcFacility));
@@ -50,7 +50,7 @@ public class DcFacilityController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询路网设施列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+  //  @PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("query")
     public AjaxResult queryFacility(DcFacility dcFacility) {
         return AjaxResult.success(dcFacilityService.listFacility(dcFacility));
@@ -63,7 +63,7 @@ public class DcFacilityController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询路网设施信息")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("{id}")
     public AjaxResult getFacility(@PathVariable String id) {
         return AjaxResult.success(dcFacilityService.getFacility(id));
@@ -77,7 +77,7 @@ public class DcFacilityController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:facility:add')")
+  //  @PreAuthorize("@ss.hasPermi('iot:facility:add')")
     @Log(title = "新增路网设施", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addFacility(@Valid @RequestBody DcFacility dcFacility) {
@@ -91,7 +91,7 @@ public class DcFacilityController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
+ //   @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
     @Log(title = "修改路网设施", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editFacility(@Valid @RequestBody DcFacility dcFacility) {
@@ -105,7 +105,7 @@ public class DcFacilityController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
+  //  @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeFacility(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcFileDownloadController.java b/zc-business/src/main/java/com/zc/business/controller/DcFileDownloadController.java
index fe581c1c..8f8d43cb 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcFileDownloadController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcFileDownloadController.java
@@ -50,7 +50,7 @@ public class DcFileDownloadController extends BaseController {
     /**
      * 查询文件管理列表
      */
-    @PreAuthorize("@ss.hasPermi('business:download:list')")
+    //@PreAuthorize("@ss.hasPermi('business:download:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcFileDownload dcFileDownload) {
         startPage();
@@ -61,7 +61,7 @@ public class DcFileDownloadController extends BaseController {
     /**
      * 导出文件管理列表
      */
-    @PreAuthorize("@ss.hasPermi('business:download:export')")
+    //@PreAuthorize("@ss.hasPermi('business:download:export')")
     @Log(title = "文件管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcFileDownload dcFileDownload) {
@@ -73,7 +73,7 @@ public class DcFileDownloadController extends BaseController {
     /**
      * 获取文件管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:download:query')")
+  //  @PreAuthorize("@ss.hasPermi('business:download:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(dcFileDownloadService.selectDcFileDownloadById(id));
@@ -82,7 +82,7 @@ public class DcFileDownloadController extends BaseController {
     /**
      * 新增文件管理
      */
-    @PreAuthorize("@ss.hasPermi('business:download:add')")
+   //@PreAuthorize("@ss.hasPermi('business:download:add')")
     @Log(title = "文件管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcFileDownload dcFileDownload) {
@@ -92,7 +92,7 @@ public class DcFileDownloadController extends BaseController {
     /**
      * 修改文件管理
      */
-    @PreAuthorize("@ss.hasPermi('business:download:edit')")
+    //@PreAuthorize("@ss.hasPermi('business:download:edit')")
     @Log(title = "文件管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcFileDownload dcFileDownload) {
@@ -102,7 +102,7 @@ public class DcFileDownloadController extends BaseController {
     /**
      * 删除文件管理
      */
-    @PreAuthorize("@ss.hasPermi('business:download:remove')")
+    //@PreAuthorize("@ss.hasPermi('business:download:remove')")
     @Log(title = "文件管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcHolidaysController.java b/zc-business/src/main/java/com/zc/business/controller/DcHolidaysController.java
index 7c878c5c..a3f70579 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcHolidaysController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcHolidaysController.java
@@ -41,7 +41,7 @@ public class DcHolidaysController extends BaseController
      * 查询节假日 基础数据
 列表
      */
-    @PreAuthorize("@ss.hasPermi('system:holidays:list')")
+   // @PreAuthorize("@ss.hasPermi('system:holidays:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcHolidays dcHolidays)
     {
@@ -54,7 +54,7 @@ public class DcHolidaysController extends BaseController
      * 导出节假日 基础数据
 列表
      */
-    @PreAuthorize("@ss.hasPermi('system:holidays:export')")
+   // @PreAuthorize("@ss.hasPermi('system:holidays:export')")
     @Log(title = "节假日 基础数据 ", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcHolidays dcHolidays)
@@ -68,7 +68,7 @@ public class DcHolidaysController extends BaseController
      * 获取节假日 基础数据
 详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:holidays:query')")
+   // @PreAuthorize("@ss.hasPermi('system:holidays:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -79,7 +79,7 @@ public class DcHolidaysController extends BaseController
      * 新增节假日 基础数据
 
      */
-    @PreAuthorize("@ss.hasPermi('system:holidays:add')")
+    //@PreAuthorize("@ss.hasPermi('system:holidays:add')")
     @Log(title = "节假日 基础数据 ", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcHolidays dcHolidays)
@@ -91,7 +91,7 @@ public class DcHolidaysController extends BaseController
      * 修改节假日 基础数据
 
      */
-    @PreAuthorize("@ss.hasPermi('system:holidays:edit')")
+  //  @PreAuthorize("@ss.hasPermi('system:holidays:edit')")
     @Log(title = "节假日 基础数据 ", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcHolidays dcHolidays)
@@ -103,7 +103,7 @@ public class DcHolidaysController extends BaseController
      * 删除节假日 基础数据
 
      */
-    @PreAuthorize("@ss.hasPermi('system:holidays:remove')")
+   // @PreAuthorize("@ss.hasPermi('system:holidays:remove')")
     @Log(title = "节假日 基础数据 ", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java b/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java
index 2c9f2f16..d42b6691 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java
@@ -51,6 +51,7 @@ public class DcMeteorologicalDetectorController  extends BaseController {
     @GetMapping("/listVisibility")
     public TableDataInfo listVisibility(DcMeteorologicalDetectorData dcMeteorologicalDetectorData)
     {
+        startPage();
         List<DcMeteorologicalDetectorData> list = dcMeteorologicalDetectorDataService.selectlistVisibility(dcMeteorologicalDetectorData);
         return getDataTable(list);
     }
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java b/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java
index 819e2bcf..4639c7bf 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java
@@ -38,7 +38,7 @@ public class DcNoStakeWarningTableController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询路网设施列表")
-    @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:list')")
+   // @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:list')")
     @GetMapping("list")
     public TableDataInfo listFacility(DcNoStakeWarningTable dcNoStakeWarningTable, @RequestParam(value = "endTime", required = false) Date endTime, @RequestParam(value = "startTime", required = false)Date startTime) {
         return getDataTable(dcNoStakeWarningTableService.pageDcNoStakeWarningTable(dcNoStakeWarningTable,endTime,startTime));
@@ -51,7 +51,7 @@ public class DcNoStakeWarningTableController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询路网设施列表")
-    @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:query')")
     @GetMapping("query")
     public AjaxResult queryFacility(DcNoStakeWarningTable dcNoStakeWarningTable, @RequestParam(value = "endTime", required = false) Date endTime, @RequestParam(value = "startTime", required = false)Date startTime) {
         return AjaxResult.success(dcNoStakeWarningTableService.listDcNoStakeWarningTable(dcNoStakeWarningTable,endTime,startTime));
@@ -64,7 +64,7 @@ public class DcNoStakeWarningTableController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询路网设施信息")
-    @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:query')")
     @GetMapping("{id}")
     public AjaxResult getFacility(@PathVariable String id) {
         return AjaxResult.success(dcNoStakeWarningTableService.getDcNoStakeWarningTable(id));
@@ -78,7 +78,7 @@ public class DcNoStakeWarningTableController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:add')")
+    //@PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:add')")
     @Log(title = "新增路网设施", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addFacility(@Valid @RequestBody DcNoStakeWarningTable dcNoStakeWarningTable) {
@@ -92,7 +92,7 @@ public class DcNoStakeWarningTableController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:edit')")
+  //  @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:edit')")
     @Log(title = "修改路网设施", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editFacility(@Valid @RequestBody DcNoStakeWarningTable dcNoStakeWarningTable) {
@@ -106,7 +106,7 @@ public class DcNoStakeWarningTableController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:remove')")
+   // @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeFacility(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java b/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java
index 46374c70..16195efc 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcOperLogController.java
@@ -47,7 +47,7 @@ public class DcOperLogController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:list')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:list')")
     @GetMapping("list")
     public TableDataInfo listFacility( DcOperLog dcOperLog,@RequestParam(value = "endTime", required = false)Date endTime,@RequestParam(value = "startTime", required = false)Date startTime) {
         return getDataTable(dcOperLogService.pageDcOperLog(dcOperLog,endTime,startTime));
@@ -60,7 +60,7 @@ public class DcOperLogController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询列表")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("query")
     public AjaxResult queryFacility( DcOperLog dcOperLog, @RequestParam(value = "endTime", required = false) Date endTime, @RequestParam(value = "startTime", required = false)Date startTime) {
         return AjaxResult.success(dcOperLogService.listDcOperLog(dcOperLog,endTime,startTime));
@@ -73,7 +73,7 @@ public class DcOperLogController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询信息")
-    @PreAuthorize("@ss.hasPermi('iot:facility:query')")
+  //  @PreAuthorize("@ss.hasPermi('iot:facility:query')")
     @GetMapping("{id}")
     public AjaxResult getFacility(@PathVariable String id) {
         return AjaxResult.success(dcOperLogService.getById(id));
@@ -87,7 +87,7 @@ public class DcOperLogController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:facility:add')")
+    //@PreAuthorize("@ss.hasPermi('iot:facility:add')")
     @Log(title = "新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addFacility(@Valid @RequestBody DcOperLog dcOperLog) {
@@ -101,7 +101,7 @@ public class DcOperLogController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
+   // @PreAuthorize("@ss.hasPermi('iot:facility:edit')")
     @Log(title = "修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editFacility(@Valid @RequestBody DcOperLog dcOperLog) {
@@ -115,7 +115,7 @@ public class DcOperLogController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
+  //  @PreAuthorize("@ss.hasPermi('iot:facility:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeFacility(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcOrganizationController.java b/zc-business/src/main/java/com/zc/business/controller/DcOrganizationController.java
index 448185f0..f1da4165 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcOrganizationController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcOrganizationController.java
@@ -45,7 +45,7 @@ public class DcOrganizationController extends BaseController
      * 查询机构管理列表
      */
     @ApiOperation("查询机构管理列表")
-    @PreAuthorize("@ss.hasPermi('business:organization:list')")
+  //  @PreAuthorize("@ss.hasPermi('business:organization:list')")
     @GetMapping("/list")
 
     public TableDataInfo list(DcOrganization dcOrganization)
@@ -59,7 +59,7 @@ public class DcOrganizationController extends BaseController
      * 导出机构管理列表
      */
     @ApiOperation("导出机构管理列表")
-    @PreAuthorize("@ss.hasPermi('business:organization:export')")
+  //  @PreAuthorize("@ss.hasPermi('business:organization:export')")
     @Log(title = "机构管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcOrganization dcOrganization)
@@ -73,7 +73,7 @@ public class DcOrganizationController extends BaseController
      * 获取机构管理详细信息
      */
     @ApiOperation("获取机构管理详细信息")
-    @PreAuthorize("@ss.hasPermi('business:organization:query')")
+  //  @PreAuthorize("@ss.hasPermi('business:organization:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -84,7 +84,7 @@ public class DcOrganizationController extends BaseController
      * 新增机构管理
      */
     @ApiOperation("新增机构管理")
-    @PreAuthorize("@ss.hasPermi('business:organization:add')")
+   // @PreAuthorize("@ss.hasPermi('business:organization:add')")
     @Log(title = "机构管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcOrganization dcOrganization)
@@ -99,7 +99,7 @@ public class DcOrganizationController extends BaseController
      * 修改机构管理
      */
     @ApiOperation("修改机构管理")
-    @PreAuthorize("@ss.hasPermi('business:organization:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:organization:edit')")
     @Log(title = "机构管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcOrganization dcOrganization)
@@ -111,7 +111,7 @@ public class DcOrganizationController extends BaseController
      * 删除机构管理
      */
     @ApiOperation("删除机构管理")
-    @PreAuthorize("@ss.hasPermi('business:organization:remove')")
+  //  @PreAuthorize("@ss.hasPermi('business:organization:remove')")
     @Log(title = "机构管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcProcessConfigController.java b/zc-business/src/main/java/com/zc/business/controller/DcProcessConfigController.java
index aa66c16b..0ef8cb3d 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcProcessConfigController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcProcessConfigController.java
@@ -40,7 +40,7 @@ public class DcProcessConfigController extends BaseController
     /**
      * 查询事件流程配置列表
      */
-    @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:list')")
+    //@PreAuthorize("@ss.hasPermi('business:dcProcessConfig:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcProcessConfig dcProcessConfig)
     {
@@ -52,7 +52,7 @@ public class DcProcessConfigController extends BaseController
     /**
      * 导出事件流程配置列表
      */
-    @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:export')")
+    //@PreAuthorize("@ss.hasPermi('business:dcProcessConfig:export')")
     @Log(title = "事件流程配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcProcessConfig dcProcessConfig)
@@ -65,7 +65,7 @@ public class DcProcessConfigController extends BaseController
     /**
      * 获取事件流程配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:query')")
+   // @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -75,7 +75,7 @@ public class DcProcessConfigController extends BaseController
     /**
      * 新增事件流程配置
      */
-    @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:add')")
+  //  @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:add')")
     @Log(title = "事件流程配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcProcessConfig dcProcessConfig)
@@ -86,7 +86,7 @@ public class DcProcessConfigController extends BaseController
     /**
      * 修改事件流程配置
      */
-    @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:edit')")
     @Log(title = "事件流程配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcProcessConfig dcProcessConfig)
@@ -97,7 +97,7 @@ public class DcProcessConfigController extends BaseController
     /**
      * 删除事件流程配置
      */
-    @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:remove')")
+   // @PreAuthorize("@ss.hasPermi('business:dcProcessConfig:remove')")
     @Log(title = "事件流程配置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcProductController.java b/zc-business/src/main/java/com/zc/business/controller/DcProductController.java
index 629b0273..2f4314e2 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcProductController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcProductController.java
@@ -37,7 +37,7 @@ public class DcProductController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询产品列表")
-    @PreAuthorize("@ss.hasPermi('iot:product:list')")
+    //@PreAuthorize("@ss.hasPermi('iot:product:list')")
     @GetMapping("list")
     public TableDataInfo listProduct(DcProduct dcProduct) {
         return getDataTable(dcProdurtService.pageProduct(dcProduct));
@@ -50,7 +50,7 @@ public class DcProductController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询产品列表")
-    @PreAuthorize("@ss.hasPermi('iot:product:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:product:query')")
     @GetMapping("query")
     public AjaxResult queryProduct(DcProduct dcProduct) {
         return AjaxResult.success(dcProdurtService.listProduct(dcProduct));
@@ -63,7 +63,7 @@ public class DcProductController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询产品信息")
-    @PreAuthorize("@ss.hasPermi('iot:product:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:product:query')")
     @GetMapping("{id}")
     public AjaxResult getProduct(@PathVariable String id) {
         return AjaxResult.success(dcProdurtService.getProduct(id));
@@ -77,7 +77,7 @@ public class DcProductController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:product:add')")
+   // @PreAuthorize("@ss.hasPermi('iot:product:add')")
     @Log(title = "新增产品", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addProduct(@Valid @RequestBody DcProduct dcProduct) {
@@ -91,7 +91,7 @@ public class DcProductController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:product:edit')")
+   // @PreAuthorize("@ss.hasPermi('iot:product:edit')")
     @Log(title = "修改产品", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editProduct(@Valid @RequestBody DcProduct dcProduct) {
@@ -105,7 +105,7 @@ public class DcProductController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:product:remove')")
+   // @PreAuthorize("@ss.hasPermi('iot:product:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeProduct(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java b/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java
index e02d512d..28a116d4 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java
@@ -41,7 +41,7 @@ public class DcPublishManageController extends BaseController
     /**
      * 查询信息发布管理记录列表
      */
-    @PreAuthorize("@ss.hasPermi('business:manage:list')")
+   // @PreAuthorize("@ss.hasPermi('business:manage:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcPublishManage dcPublishManage)
     {
@@ -52,7 +52,7 @@ public class DcPublishManageController extends BaseController
     /**
      * 查询事件发布详情，传参事件id
      */
-    @PreAuthorize("@ss.hasPermi('business:manage:list')")
+ //   @PreAuthorize("@ss.hasPermi('business:manage:list')")
     @GetMapping("/listEvent")
     public AjaxResult listEvent(DcPublishManage dcPublishManage)
     {
@@ -66,7 +66,7 @@ public class DcPublishManageController extends BaseController
     /**
      * 获取信息发布管理记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:manage:query')")
+  //  @PreAuthorize("@ss.hasPermi('business:manage:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +76,7 @@ public class DcPublishManageController extends BaseController
     /**
      * 新增信息发布管理记录
      */
-    @PreAuthorize("@ss.hasPermi('business:manage:add')")
+   // @PreAuthorize("@ss.hasPermi('business:manage:add')")
     @Log(title = "信息发布管理记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcPublishManage dcPublishManage)
@@ -87,7 +87,7 @@ public class DcPublishManageController extends BaseController
     /**
      * 修改信息发布管理记录
      */
-    @PreAuthorize("@ss.hasPermi('business:manage:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:manage:edit')")
     @Log(title = "信息发布管理记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcPublishManage dcPublishManage)
@@ -98,7 +98,7 @@ public class DcPublishManageController extends BaseController
     /**
      * 删除信息发布管理记录
      */
-    @PreAuthorize("@ss.hasPermi('business:manage:remove')")
+   // @PreAuthorize("@ss.hasPermi('business:manage:remove')")
     @Log(title = "信息发布管理记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -160,7 +160,7 @@ public class DcPublishManageController extends BaseController
     /**
      * 公众服务统计导出
      */
-    @PreAuthorize("@ss.hasPermi('business:manage:export')")
+    //@PreAuthorize("@ss.hasPermi('business:manage:export')")
     @Log(title = "信息发布管理记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcPublishManage dcPublishManage)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java b/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java
index afe6ae94..2539f120 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcPublishingChannelsController.java
@@ -41,7 +41,7 @@ public class DcPublishingChannelsController extends BaseController
     /**
      * 查询发布渠道列表
      */
-    @PreAuthorize("@ss.hasPermi('business:channels:list')")
+    //@PreAuthorize("@ss.hasPermi('business:channels:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody DcPublishingChannels dcPublishingChannels)
     {
@@ -53,7 +53,7 @@ public class DcPublishingChannelsController extends BaseController
     /**
      * 导出发布渠道列表
      */
-    @PreAuthorize("@ss.hasPermi('business:channels:export')")
+    //@PreAuthorize("@ss.hasPermi('business:channels:export')")
     @Log(title = "发布渠道", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcPublishingChannels dcPublishingChannels)
@@ -66,7 +66,7 @@ public class DcPublishingChannelsController extends BaseController
     /**
      * 获取发布渠道详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:channels:query')")
+   // @PreAuthorize("@ss.hasPermi('business:channels:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -76,7 +76,7 @@ public class DcPublishingChannelsController extends BaseController
     /**
      * 新增发布渠道
      */
-    @PreAuthorize("@ss.hasPermi('business:channels:add')")
+    //@PreAuthorize("@ss.hasPermi('business:channels:add')")
     @Log(title = "发布渠道", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcPublishingChannels dcPublishingChannels)
@@ -95,7 +95,7 @@ public class DcPublishingChannelsController extends BaseController
     /**
      * 修改发布渠道
      */
-    @PreAuthorize("@ss.hasPermi('business:channels:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:channels:edit')")
     @Log(title = "发布渠道", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcPublishingChannels dcPublishingChannels)
@@ -107,7 +107,7 @@ public class DcPublishingChannelsController extends BaseController
     /**
      * 删除发布渠道
      */
-    @PreAuthorize("@ss.hasPermi('business:channels:remove')")
+    //@PreAuthorize("@ss.hasPermi('business:channels:remove')")
     @Log(title = "发布渠道", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcRegionController.java b/zc-business/src/main/java/com/zc/business/controller/DcRegionController.java
index 4e9c1032..dc979142 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcRegionController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcRegionController.java
@@ -38,7 +38,7 @@ public class DcRegionController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询道路列表")
-    @PreAuthorize("@ss.hasPermi('iot:road:list')")
+  //  @PreAuthorize("@ss.hasPermi('iot:road:list')")
     @GetMapping("list")
     public TableDataInfo listRoad(DcRegion dcRegion) {
         return getDataTable(dcRegionService.list());
@@ -51,7 +51,7 @@ public class DcRegionController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询道路列表")
-    @PreAuthorize("@ss.hasPermi('iot:road:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:road:query')")
     @GetMapping("query")
     public AjaxResult queryRoad(DcRegion dcRegion) {
         return AjaxResult.success(dcRegionService.list());
@@ -64,7 +64,7 @@ public class DcRegionController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询道路信息")
-    @PreAuthorize("@ss.hasPermi('iot:road:query')")
+   // @PreAuthorize("@ss.hasPermi('iot:road:query')")
     @GetMapping("{id}")
     public AjaxResult getRoad(@PathVariable String id) {
         return AjaxResult.success(dcRegionService.getById(id));
@@ -78,7 +78,7 @@ public class DcRegionController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:road:add')")
+  //  @PreAuthorize("@ss.hasPermi('iot:road:add')")
     @Log(title = "新增道路", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addRoad(@Valid @RequestBody DcRegion dcRegion) {
@@ -92,7 +92,7 @@ public class DcRegionController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:road:edit')")
+   // @PreAuthorize("@ss.hasPermi('iot:road:edit')")
     @Log(title = "修改道路", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editRoad(@Valid @RequestBody DcRegion dcRegion) {
@@ -108,7 +108,7 @@ public class DcRegionController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:road:remove')")
+  //  @PreAuthorize("@ss.hasPermi('iot:road:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeRoad(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcRoadController.java b/zc-business/src/main/java/com/zc/business/controller/DcRoadController.java
index 7dc30bf6..895a778d 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcRoadController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcRoadController.java
@@ -37,7 +37,7 @@ public class DcRoadController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询道路列表")
-    @PreAuthorize("@ss.hasPermi('iot:road:list')")
+    //@PreAuthorize("@ss.hasPermi('iot:road:list')")
     @GetMapping("list")
     public TableDataInfo listRoad(DcRoad dcRoad) {
         return getDataTable(dcRoadService.pageRoad(dcRoad));
@@ -50,7 +50,7 @@ public class DcRoadController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询道路列表")
-    @PreAuthorize("@ss.hasPermi('iot:road:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:road:query')")
     @GetMapping("query")
     public AjaxResult queryRoad(DcRoad dcRoad) {
         return AjaxResult.success(dcRoadService.listRoad(dcRoad));
@@ -63,7 +63,7 @@ public class DcRoadController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询道路信息")
-    @PreAuthorize("@ss.hasPermi('iot:road:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:road:query')")
     @GetMapping("{id}")
     public AjaxResult getRoad(@PathVariable String id) {
         return AjaxResult.success(dcRoadService.getRoad(id));
@@ -77,7 +77,7 @@ public class DcRoadController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:road:add')")
+   // @PreAuthorize("@ss.hasPermi('iot:road:add')")
     @Log(title = "新增道路", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addRoad(@Valid @RequestBody DcRoad dcRoad) {
@@ -91,7 +91,7 @@ public class DcRoadController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:road:edit')")
+    //@PreAuthorize("@ss.hasPermi('iot:road:edit')")
     @Log(title = "修改道路", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editRoad(@Valid @RequestBody DcRoad dcRoad) {
@@ -105,7 +105,7 @@ public class DcRoadController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:road:remove')")
+    //@PreAuthorize("@ss.hasPermi('iot:road:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeRoad(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java b/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java
index 9487c289..c7da72d3 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcRoadSectionController.java
@@ -42,7 +42,7 @@ public class DcRoadSectionController extends BaseController
      * 查询辖区路段列表
      */
     @ApiOperation("查询辖区路段列表")
-    @PreAuthorize("@ss.hasPermi('business:roadSection:list')")
+   // @PreAuthorize("@ss.hasPermi('business:roadSection:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcRoadSection dcRoadSection)
     {
@@ -60,7 +60,7 @@ public class DcRoadSectionController extends BaseController
      * 查询辖区路段列表(不分页)
      */
     @ApiOperation("查询辖区路段列表")
-    @PreAuthorize("@ss.hasPermi('business:roadSection:list')")
+    //@PreAuthorize("@ss.hasPermi('business:roadSection:list')")
     @GetMapping("/listAll")
     public AjaxResult listAll(DcRoadSection dcRoadSection)
     {
@@ -72,7 +72,7 @@ public class DcRoadSectionController extends BaseController
      * 导出辖区路段列表
      */
     @ApiOperation("导出辖区路段列表")
-    @PreAuthorize("@ss.hasPermi('business:roadSection:export')")
+   // @PreAuthorize("@ss.hasPermi('business:roadSection:export')")
     @Log(title = "辖区路段", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcRoadSection dcRoadSection)
@@ -86,7 +86,7 @@ public class DcRoadSectionController extends BaseController
      * 获取辖区路段详细信息
      */
     @ApiOperation("获取辖区路段详细信息")
-    @PreAuthorize("@ss.hasPermi('business:roadSection:query')")
+  //  @PreAuthorize("@ss.hasPermi('business:roadSection:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -97,7 +97,7 @@ public class DcRoadSectionController extends BaseController
      * 新增辖区路段
      */
     @ApiOperation("新增辖区路段")
-    @PreAuthorize("@ss.hasPermi('business:roadSection:add')")
+  //  @PreAuthorize("@ss.hasPermi('business:roadSection:add')")
     @Log(title = "辖区路段", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcRoadSection dcRoadSection)
@@ -109,7 +109,7 @@ public class DcRoadSectionController extends BaseController
      * 修改辖区路段
      */
     @ApiOperation("修改辖区路段")
-    @PreAuthorize("@ss.hasPermi('business:roadSection:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:roadSection:edit')")
     @Log(title = "辖区路段", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcRoadSection dcRoadSection)
@@ -121,7 +121,7 @@ public class DcRoadSectionController extends BaseController
      * 删除辖区路段
      */
     @ApiOperation("删除辖区路段")
-    @PreAuthorize("@ss.hasPermi('business:roadSection:remove')")
+   // @PreAuthorize("@ss.hasPermi('business:roadSection:remove')")
     @Log(title = "辖区路段", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java b/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java
index ac8244fe..a51c3bff 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcShiftsController.java
@@ -55,7 +55,7 @@ public class DcShiftsController extends BaseController
      * 查询值班列表
      */
     @ApiOperation("查询值班列表")
-    @PreAuthorize("@ss.hasPermi('business:shifts:list')")
+  //  @PreAuthorize("@ss.hasPermi('business:shifts:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcShifts dcShifts)
     {
@@ -68,7 +68,7 @@ public class DcShiftsController extends BaseController
      * 导出值班列表
      */
     @ApiOperation("导出值班列表")
-    @PreAuthorize("@ss.hasPermi('business:shifts:export')")
+    //@PreAuthorize("@ss.hasPermi('business:shifts:export')")
     @Log(title = "值班", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcShifts dcShifts)
@@ -82,7 +82,7 @@ public class DcShiftsController extends BaseController
      * 获取值班详细信息
      */
     @ApiOperation("获取值班详细信息")
-    @PreAuthorize("@ss.hasPermi('business:shifts:query')")
+   // @PreAuthorize("@ss.hasPermi('business:shifts:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -101,7 +101,7 @@ public class DcShiftsController extends BaseController
      * 新增值班
      */
     @ApiOperation("新增值班")
-    @PreAuthorize("@ss.hasPermi('business:shifts:add')")
+   // @PreAuthorize("@ss.hasPermi('business:shifts:add')")
     @Log(title = "值班", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcShifts dcShifts) throws Exception {
@@ -112,7 +112,7 @@ public class DcShiftsController extends BaseController
      * 修改值班
      */
     @ApiOperation("修改值班")
-    @PreAuthorize("@ss.hasPermi('business:shifts:edit')")
+    //@PreAuthorize("@ss.hasPermi('business:shifts:edit')")
     @Log(title = "值班", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcShifts dcShifts) throws Exception {
@@ -123,7 +123,7 @@ public class DcShiftsController extends BaseController
      * 删除值班
      */
     @ApiOperation("删除值班")
-    @PreAuthorize("@ss.hasPermi('business:shifts:remove')")
+   // @PreAuthorize("@ss.hasPermi('business:shifts:remove')")
     @Log(title = "值班", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) throws Exception{
@@ -132,7 +132,7 @@ public class DcShiftsController extends BaseController
     /**
      * 删除值班,某个时间下驻点下的全部值班信息
      */
-    @PreAuthorize("@ss.hasPermi('business:shifts:remove')")
+  //  @PreAuthorize("@ss.hasPermi('business:shifts:remove')")
     @Log(title = "值班", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public AjaxResult removeDelete(@RequestBody DcShifts shifts) throws Exception{
@@ -141,7 +141,7 @@ public class DcShiftsController extends BaseController
 
     //导出模板
     @ApiOperation("导出模板")
-    @PreAuthorize("@ss.hasPermi('baseData:equipment:export')")
+  //  @PreAuthorize("@ss.hasPermi('baseData:equipment:export')")
     @Log(title = "值班模板", businessType = BusinessType.EXPORT)
     @PostMapping("/exportModel")
     public void exportModel(HttpServletResponse response)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcStakeMarkController.java b/zc-business/src/main/java/com/zc/business/controller/DcStakeMarkController.java
index ee7a0f91..9482bd04 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcStakeMarkController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcStakeMarkController.java
@@ -38,7 +38,7 @@ public class DcStakeMarkController extends BaseController {
      * @return 分页查询结果
      */
     @ApiOperation("分页查询桩号列表")
-    @PreAuthorize("@ss.hasPermi('iot:stakeMark:list')")
+   // @PreAuthorize("@ss.hasPermi('iot:stakeMark:list')")
     @GetMapping("list")
     public TableDataInfo listStakeMark(DcStakeMark dcStakeMark) {
         return getDataTable(dcStakeMarkService.pageStakeMark(dcStakeMark));
@@ -51,7 +51,7 @@ public class DcStakeMarkController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("无分页查询桩号列表")
-    @PreAuthorize("@ss.hasPermi('iot:stakeMark:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:stakeMark:query')")
     @GetMapping("query")
     public AjaxResult queryStakeMark(DcStakeMark dcStakeMark) {
         return AjaxResult.success(dcStakeMarkService.listStakeMark(dcStakeMark));
@@ -64,7 +64,7 @@ public class DcStakeMarkController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("根据id查询桩号信息")
-    @PreAuthorize("@ss.hasPermi('iot:stakeMark:query')")
+    //@PreAuthorize("@ss.hasPermi('iot:stakeMark:query')")
     @GetMapping("{id}")
     public AjaxResult getStakeMark(@PathVariable String id) {
         return AjaxResult.success(dcStakeMarkService.getStakeMark(id));
@@ -78,7 +78,7 @@ public class DcStakeMarkController extends BaseController {
      * @return 新增操作结果
      */
     @ApiOperation("新增")
-    @PreAuthorize("@ss.hasPermi('iot:stakeMark:add')")
+   // @PreAuthorize("@ss.hasPermi('iot:stakeMark:add')")
     @Log(title = "新增桩号", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult addStakeMark(@Valid @RequestBody DcStakeMark dcStakeMark) {
@@ -92,7 +92,7 @@ public class DcStakeMarkController extends BaseController {
      * @return 修改操作结果
      */
     @ApiOperation("修改")
-    @PreAuthorize("@ss.hasPermi('iot:stakeMark:edit')")
+    //@PreAuthorize("@ss.hasPermi('iot:stakeMark:edit')")
     @Log(title = "修改桩号", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editStakeMark(@Valid @RequestBody DcStakeMark dcStakeMark) {
@@ -106,7 +106,7 @@ public class DcStakeMarkController extends BaseController {
      * @return 删除操作结果
      */
     @ApiOperation("删除")
-    @PreAuthorize("@ss.hasPermi('iot:stakeMark:remove')")
+    //@PreAuthorize("@ss.hasPermi('iot:stakeMark:remove')")
     @Log(title = "删除", businessType = BusinessType.DELETE)
     @DeleteMapping("{ids}")
     public AjaxResult removeStakeMark(@PathVariable List<String> ids) {
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java
index 06dee7a5..19f3a0a4 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java
@@ -1,12 +1,13 @@
 package com.zc.business.controller;
 
 import com.google.gson.Gson;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.common.utils.uuid.UUID;
 import com.zc.business.domain.DcHolidays;
 import com.zc.business.domain.DcNoStakeWarningTable;
+import com.zc.business.domain.DcTollStationStatisticsData;
+import com.zc.business.domain.DcTollStationStatisticsDataMap;
 import com.zc.business.service.IDcGantryStatisticsDataService;
 import com.zc.business.service.IDcHolidaysService;
+import com.zc.business.service.IDcTollStationStatisticsDataService;
 import com.zc.business.service.impl.DcNoStakeWarningTableServiceImpl;
 import com.zc.common.core.websocket.WebSocketService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,9 +15,13 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -31,11 +36,12 @@ public class DcTrafficFlowWarning {
     private IDcHolidaysService dcHolidaysService;
     @Autowired
     private IDcGantryStatisticsDataService dcGantryStatisticsDataService;
-    //@Scheduled(cron = "0/10 * * * * ?")
-   //@Scheduled(cron = "0 0/5 * * * ?")
-    public void DcTrafficFlow() {
-        System.out.println("每隔10秒执行一次：" + new Date());
+    @Autowired
+    private IDcTollStationStatisticsDataService iDcTollStationStatisticsDataService;
 
+    //@Scheduled(cron = "0/10 * * * * ?")
+ @Scheduled(cron = "0 0 9 * * ?")
+    public void DcTrafficFlow() throws ParseException {
         // 获取当前日期
         LocalDate currentDate = LocalDate.now();
         // 获取当前年份
@@ -48,8 +54,10 @@ public class DcTrafficFlowWarning {
         LocalDate dateAfterSevenDays = currentDate.plusDays(7);
         // 格式化日期输出（可选）
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-          String formattedDate = dateAfterSevenDays.format(formatter);
-        //String formattedDate ="2024-05-01";
+        DateTimeFormatter formatterStr = DateTimeFormatter.ofPattern("yyyy年M月d日");
+      String formattedDate = dateAfterSevenDays.format(formatter);
+        String formattedDateStr = dateAfterSevenDays.format(formatterStr);
+     //     String formattedDate ="2024-05-01";
 
         for (DcHolidays holidays : dcHolidaysList) {
             String vacation = holidays.getVacation();
@@ -58,31 +66,55 @@ public class DcTrafficFlowWarning {
             if (formattedDate.equals(dates[0])) {
                 //当前假期名称
                 String name = holidays.getName();
-               dcHolidays.setDate(currentYear-1);
+                dcHolidays.setDate(currentYear - 1);
 
-                DcHolidays dcHolidaysLast = dcHolidaysService.selectDcHolidaysListNameByDate(currentYear-1,name);
+                DcHolidays dcHolidaysLast = dcHolidaysService.selectDcHolidaysListNameByDate(currentYear - 1, name);
                 String vacation1 = dcHolidaysLast.getVacation();
 
 
                 String[] date = vacation1.split("\\|");
-                Map<String, Map<String, List<Map<String,String>>>> mapListOne = new HashMap<>();
+                Map<String, Map<String, List<Map<String, String>>>> mapListOne = new HashMap<>();
 
-                Map<String, List<Map<String,String>>> map = new HashMap<>();
-                Map<String, List<Map<String,String>>> map2 = new HashMap<>();
+                Map<String, List<Map<String, String>>> map = new HashMap<>();
+                Map<String, List<Map<String, String>>> map2 = new HashMap<>();
+                Map<String, List<Map<String, String>>> map3 = new HashMap<>();
+                Map<String, List<Map<String, String>>> map4 = new HashMap<>();
                 for (int i1 = 0; i1 < date.length; i1++) {
-                    List<Map<String,String>> mapList = dcGantryStatisticsDataService.realTimeTrafficFlow( date[i1],"1","4");
-                    List<Map<String,String>> mapList2 = dcGantryStatisticsDataService.realTimeTrafficFlow(date[i1],"3","4");
+                    //交通流
+                    List<Map<String, String>> mapList = dcGantryStatisticsDataService.realTimeTrafficFlow(date[i1], "1", "4");
+                    List<Map<String, String>> mapList2 = dcGantryStatisticsDataService.realTimeTrafficFlow(date[i1], "3", "4");
+                    //收费站
+                    // access_type 1 入口 2出口
+                    // period_type 时间颗粒度
+                    List<Map<String, String>> dcTollStationStatisticsDataTwo = iDcTollStationStatisticsDataService.TollBoothStatistics(date[i1], "2", "4");
+                    List<Map<String, String>> dcTollStationStatisticsData = iDcTollStationStatisticsDataService.TollBoothStatistics(date[i1], "1", "4");
+
                     // 计算当前日期加上七天后的日期
-                    LocalDate dateAfterSevenDay = currentDate.plusDays(7+i1);
+                    LocalDate dateAfterSevenDay = currentDate.plusDays(7 + i1);
                     DateTimeFormatter formattedDateLst = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                     String formatted = dateAfterSevenDay.format(formattedDateLst);
-                    map.put(formatted,mapList);
-                    map2.put(formatted,mapList2);
+                    map.put(formatted, mapList);
+                    map2.put(formatted, mapList2);
+                    map3.put(formatted, dcTollStationStatisticsData);
+                    map4.put(formatted, dcTollStationStatisticsDataTwo);
 
                 }
-
-                mapListOne.put("1",map);
-                mapListOne.put("3",map2);
+/*                //根据时间进行升序排序
+                Map<String, List<Map<String, String>>> sortedMap = map3.entrySet().stream()
+                        .sorted(Map.Entry.comparingByKey())
+                        .collect(Collectors.toMap(
+                                Map.Entry::getKey,
+                                Map.Entry::getValue,
+                                (oldValue, newValue) -> oldValue, // 如果有重复的key，默认保留旧值
+                                LinkedHashMap::new // 为了保持排序，使用LinkedHashMap
+                        ));
+
+// 用排序后的Map替换原来的map3
+                map3 = sortedMap;*/
+                mapListOne.put("1", map);//菏泽方向
+                mapListOne.put("3", map2);//济南方向
+                mapListOne.put("4", map3);//收费站入口
+                mapListOne.put("5", map4);//收费站出口
 
                 // 创建Gson对象
                 Gson gson = new Gson();
@@ -90,21 +122,26 @@ public class DcTrafficFlowWarning {
                 String jsonString = gson.toJson(mapListOne);
                 DcNoStakeWarningTable dcNoStakeWarningTable = new DcNoStakeWarningTable();
 
-                dcNoStakeWarningTable.setWarningDescription(name +"交通流数据预警提醒");
+                // 计算当前日期加上七天的日期
+                LocalDate dateAfterSevenDa = currentDate.plusDays(7+date.length);
+                // 计算当前日期加上七天的日期
+                // 格式化日期输出（可选）
+                DateTimeFormatter formatte = DateTimeFormatter.ofPattern("M月d日");
+                String formattedDa = dateAfterSevenDa.format(formatte);
+
+                dcNoStakeWarningTable.setWarningDescription("预计"+ formattedDateStr+"-"+formattedDa+"，高速车流量剧增。平台预警提醒您:提前调度路管人员前往匝道等交通事故多发路段巡查，以便及时救援。");
                 dcNoStakeWarningTable.setWarningType("1");
                 dcNoStakeWarningTable.setOtherConfig(jsonString);
                 dcNoStakeWarningTable.setWarningTime(new Date());
-
+//存入记录
                 dcNoStakeWarningTableService.addDcNoStakeWarningTable(dcNoStakeWarningTable);
-
-                Map<String,Object> contentMap = new HashMap<>();
-                contentMap.put("content",name +"交通流数据预警提醒");
-                contentMap.put("trafficFlowDataEarlyWarning",jsonString);
+                Long id = dcNoStakeWarningTable.getId();
+                Map<String, Object> contentMap = new HashMap<>();
+                contentMap.put("content",  "预计"+ formattedDateStr+"-"+formattedDa+"，高速车流量剧增。平台预警提醒您:提前调度路管人员前往匝道等交通事故多发路段巡查，以便及时救援。");
+                contentMap.put("id", id);
                 WebSocketService.broadcast("trafficFlowDataEarlyWarning", contentMap);
 
-                // 打印JSON字符串
-                System.out.println(jsonString.length());
-
+                System.out.println(jsonString);
             }
         }
     }
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficPoliceController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficPoliceController.java
index f4012a23..0319aa49 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficPoliceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficPoliceController.java
@@ -107,7 +107,7 @@ public class DcTrafficPoliceController extends BaseController
      */
     @ApiOperation("修改交管数据")
 
-    @PreAuthorize("@ss.hasPermi('system:police:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:police:edit')")
     @Log(title = "交管数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcTrafficPolice dcTrafficPolice)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java
index 91e83aed..30e81ce8 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java
@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -408,7 +409,7 @@ public AjaxResult trafficFlowAtTollStationEntrance(String startDate, String endD
     @ApiOperation("获取据库中收费站数数据")
     @GetMapping("/history/TollBoothStatistics")
     public AjaxResult TollBoothStatistics(String startDate,String accessType,String periodType) throws HttpException, IOException{
-        List<DcTollStationStatisticsData> mapList = dcTollStationStatisticsDataService.TollBoothStatistics(startDate,accessType,periodType);
+        List<Map<String, String>> mapList = dcTollStationStatisticsDataService.TollBoothStatistics(startDate,accessType,periodType);
         // 将查询结果封装为成功响应并返回
         return AjaxResult.success(mapList);
     }
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcVehiclesController.java b/zc-business/src/main/java/com/zc/business/controller/DcVehiclesController.java
index 25b98120..e6323725 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcVehiclesController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcVehiclesController.java
@@ -37,7 +37,7 @@ public class DcVehiclesController extends BaseController
     /**
      * 查询车辆信息列表
      */
-    @PreAuthorize("@ss.hasPermi('business:vehicles:list')")
+    //@PreAuthorize("@ss.hasPermi('business:vehicles:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcVehicles dcVehicles)
     {
@@ -49,7 +49,7 @@ public class DcVehiclesController extends BaseController
     /**
      * 导出车辆信息列表
      */
-    @PreAuthorize("@ss.hasPermi('business:vehicles:export')")
+    //@PreAuthorize("@ss.hasPermi('business:vehicles:export')")
     @Log(title = "车辆信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DcVehicles dcVehicles)
@@ -62,7 +62,7 @@ public class DcVehiclesController extends BaseController
     /**
      * 获取车辆信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:vehicles:query')")
+   // @PreAuthorize("@ss.hasPermi('business:vehicles:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +72,7 @@ public class DcVehiclesController extends BaseController
     /**
      * 新增车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('business:vehicles:add')")
+   // @PreAuthorize("@ss.hasPermi('business:vehicles:add')")
     @Log(title = "车辆信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcVehicles dcVehicles)
@@ -83,7 +83,7 @@ public class DcVehiclesController extends BaseController
     /**
      * 修改车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('business:vehicles:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:vehicles:edit')")
     @Log(title = "车辆信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcVehicles dcVehicles)
@@ -94,7 +94,7 @@ public class DcVehiclesController extends BaseController
     /**
      * 删除车辆信息
      */
-    @PreAuthorize("@ss.hasPermi('business:vehicles:remove')")
+   // @PreAuthorize("@ss.hasPermi('business:vehicles:remove')")
     @Log(title = "车辆信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java
index ffb01f0c..e1a95b98 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java
@@ -63,7 +63,7 @@ public class DcWarningController extends BaseController
      * 查询预警信息列表
      */
     @ApiOperation("查询感知事件列表")
-    @PreAuthorize("@ss.hasPermi('business:warning:list')")
+   // @PreAuthorize("@ss.hasPermi('business:warning:list')")
     @GetMapping("/list")
     public TableDataInfo list(DcWarning dcWarning)
     {
@@ -75,7 +75,7 @@ public class DcWarningController extends BaseController
     /**
      * 导出预警信息列表
      */
-    @PreAuthorize("@ss.hasPermi('business:warning:export')")
+    //@PreAuthorize("@ss.hasPermi('business:warning:export')")
     @Log(title = "预警信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response,@RequestBody DcWarning dcWarning)
@@ -90,7 +90,7 @@ public class DcWarningController extends BaseController
     /**
      * 新增预警信息
      */
-    @PreAuthorize("@ss.hasPermi('business:warning:add')")
+   // @PreAuthorize("@ss.hasPermi('business:warning:add')")
     @Log(title = "预警信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DcWarning dcWarning)
@@ -104,7 +104,7 @@ public class DcWarningController extends BaseController
     /**
      * 修改预警信息
      */
-    @PreAuthorize("@ss.hasPermi('business:warning:edit')")
+   // @PreAuthorize("@ss.hasPermi('business:warning:edit')")
     @Log(title = "预警信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DcWarning dcWarning)
@@ -115,7 +115,7 @@ public class DcWarningController extends BaseController
     /**
      * 删除预警信息
      */
-    @PreAuthorize("@ss.hasPermi('business:warning:remove')")
+    //@PreAuthorize("@ss.hasPermi('business:warning:remove')")
     @Log(title = "预警信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{id}")
     public AjaxResult remove(@PathVariable String id)
diff --git a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
index 170b58b2..d6ed67d4 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DeviceController.java
@@ -38,7 +38,7 @@ public class DeviceController extends BaseController
     /**
      * 查询设备状态列表
      */
-    @PreAuthorize("@ss.hasPermi('system:device:list')")
+   // @PreAuthorize("@ss.hasPermi('system:device:list')")
     @GetMapping("/list")
     public TableDataInfo list(Device device)
     {
@@ -50,7 +50,7 @@ public class DeviceController extends BaseController
     /**
      * 导出设备状态列表
      */
-    @PreAuthorize("@ss.hasPermi('system:device:export')")
+    //@PreAuthorize("@ss.hasPermi('system:device:export')")
     @Log(title = "设备状态", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Device device)
@@ -63,7 +63,7 @@ public class DeviceController extends BaseController
     /**
      * 获取设备状态详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:device:query')")
+   // @PreAuthorize("@ss.hasPermi('system:device:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class DeviceController extends BaseController
     /**
      * 新增设备状态
      */
-    @PreAuthorize("@ss.hasPermi('system:device:add')")
+   // @PreAuthorize("@ss.hasPermi('system:device:add')")
     @Log(title = "设备状态", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Device device)
@@ -84,7 +84,7 @@ public class DeviceController extends BaseController
     /**
      * 修改设备状态
      */
-    @PreAuthorize("@ss.hasPermi('system:device:edit')")
+   // @PreAuthorize("@ss.hasPermi('system:device:edit')")
     @Log(title = "设备状态", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Device device)
@@ -95,7 +95,7 @@ public class DeviceController extends BaseController
     /**
      * 删除设备状态
      */
-    @PreAuthorize("@ss.hasPermi('system:device:remove')")
+   // @PreAuthorize("@ss.hasPermi('system:device:remove')")
     @Log(title = "设备状态", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java
index 3b1ee9bc..6f2fa88b 100644
--- a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -279,7 +280,7 @@ public class NonAutomaticWarningController extends BaseController {
         return AjaxResult.error();
     }
 
-//    @PostConstruct
+    @PostConstruct
     public AjaxResult eventSubscriptionPostConstruct() throws Exception {
         NonAutomaticWarning stringStringHashMap = new NonAutomaticWarning();
         JSONObject nonAutomaticWarning = JSONObject.parseObject(configService.selectConfigByKey("nonAutomaticWarning"));
diff --git a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java
index 2c16ff5f..d612aad8 100644
--- a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java
@@ -7,16 +7,20 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.system.service.ISysConfigService;
+import com.zc.business.domain.DcNoStakeWarningTable;
 import com.zc.business.domain.DcRegion;
 import com.zc.business.enums.UniversalEnum;
+import com.zc.business.service.impl.DcNoStakeWarningTableServiceImpl;
 import com.zc.business.service.impl.DcRegionServiceImpl;
 import com.zc.common.core.httpclient.OkHttp;
 import com.zc.common.core.httpclient.exception.HttpException;
 import com.zc.common.core.httpclient.request.RequestParams;
+import com.zc.common.core.websocket.WebSocketService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import okhttp3.Response;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -55,25 +59,175 @@ public class WeatherForecastController extends BaseController {
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private DcNoStakeWarningTableServiceImpl noStakeWarningTableService;
+
+
+    /***
+     * 定时查询气象预警信息并上报
+     */
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void updateDeviceState() {
+
+        HashMap<String, Object> hashMap = new HashMap<>();
+        hashMap.put("roadId", UniversalEnum.ROAD_ID.getValue());
+        hashMap.put("earlyWorningLevel", UniversalEnum.EARLY_WORNING_LEVEL.getValue());
+        //hashMap.put("managerId", UniversalEnum.MANAGER_ID.getValue());
+        AjaxResult ajaxResult = currentWeatherWarningInformationQuery(hashMap);
+
+        String code = String.valueOf(ajaxResult.get("code"));
+        if (!Objects.equals(code, UniversalEnum.TWO_HUNDRED.getValue())) {
+            return;
+        }
+        JSONArray data = (JSONArray) JSON.toJSON(ajaxResult.get("data"));
+        data.forEach(item -> {
+            JSONObject jsonObject = (JSONObject) JSON.toJSON(item);
+            String earlyWorningSignal = jsonObject.getString("earlyWorningSignal");
+            String[] split = earlyWorningSignal.split(UniversalEnum.EMPTY_STRING.getValue());
+            String earlyWarningType = split[UniversalEnum.ZERO.getNumber()];
+            String warningLevel = split[UniversalEnum.THREE.getNumber()];
+
+            switch (warningLevel) {
+                case "0":
+                    //蓝色预警
+                    jsonObject.put("warningLevelStringNumber", UniversalEnum.ZERO.getValue());
+                    jsonObject.put("warningLevelString", UniversalEnum.BLUE_ALERT.toString());
+                    break;
+                case "1":
+                    //黄色预警
+                    jsonObject.put("warningLevelStringNumber", UniversalEnum.ONE.getValue());
+                    jsonObject.put("warningLevelString", UniversalEnum.YELLOW_ALERT.toString());
+                    break;
+                case "2":
+                    //橙色预警
+                    jsonObject.put("warningLevelStringNumber", UniversalEnum.TWO.getValue());
+                    jsonObject.put("warningLevelString", UniversalEnum.ORANGE_ALERT.toString());
+                    break;
+                case "3":
+                    //红色预警
+                    jsonObject.put("warningLevelStringNumber", UniversalEnum.THREE.getValue());
+                    jsonObject.put("warningLevelString", UniversalEnum.RED_ALERT.toString());
+                    break;
+            }
+
+            switch (earlyWarningType) {
+                case "0":
+                    //台风
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.ZERO.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.TYPHOON.toString());
+                    break;
+                case "1":
+                    //暴雨
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.ONE.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.RAINSTORM.toString());
+                    break;
+                case "2":
+                    //暴雪
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.TWO.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.BLIZZARD.toString());
+                    break;
+                case "3":
+                    //寒潮
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.THREE.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.COLD_WAVE.toString());
+                    break;
+                case "4":
+                    //大风
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.FOUR.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.GALE.toString());
+                    break;
+                case "5":
+                    //沙尘暴
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.FIVE.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.SANDSTORM.toString());
+                    break;
+                case "6":
+                    //高温
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.SIX.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.HYPERTHERMIA.toString());
+                    break;
+                case "7":
+                    //干旱
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.SEVEN.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.ARIDITY.toString());
+                    break;
+                case "8":
+                    //雷电
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.EIGHT.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.AEGIS.toString());
+                    break;
+                case "9":
+                    //冰雹
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.NINE.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.HAILSTONE.toString());
+                    break;
+                case "10":
+                    //霜冻
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.TEN.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.FROST.toString());
+                    break;
+                case "11":
+                    //大雾
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.ELEVEN.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.HEAVY_FOG.toString());
+                    break;
+                case "12":
+                    //霾
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.TWELVE.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.HAZE.toString());
+                    break;
+                case "13":
+                    //道路结冰
+                    jsonObject.put("earlyWarningTypeStringNumber", UniversalEnum.THIRTEEN.getValue());
+                    jsonObject.put("earlyWarningTypeString", UniversalEnum.ICY_ROADS.toString());
+                    break;
+            }
+
+            //List<JSONObject> currentWeatherAndForecastInformation = redisCache.getCacheList(UniversalEnum.CURRENT_WEATHER_AND_FORECAST_INFORMATION.getValue());
+            //List<JSONObject> collect = currentWeatherAndForecastInformation.stream().filter(ite ->
+            //        !Objects.equals(ite.getString("earlyWorningIssueDate"), jsonObject.getString("earlyWorningIssueDate"))
+            //                && !Objects.equals(ite.getString("earlyWorningTitle"), jsonObject.getString("earlyWorningTitle"))
+            //                && !Objects.equals(ite.getString("stationName"), jsonObject.getString("stationName"))).collect(Collectors.toList());
+            List<DcNoStakeWarningTable> dcNoStakeWarningTables = noStakeWarningTableService.listDcNoStakeWarningTable(new DcNoStakeWarningTable(),null,null);
+            List<DcNoStakeWarningTable> collect = dcNoStakeWarningTables.stream().filter(ite ->
+                    Objects.equals(ite.getWarningTime(), jsonObject.getDate("earlyWorningIssueDate"))
+                            && Objects.equals(ite.getWarningDescription(), jsonObject.getString("earlyWorningContent"))
+                            && Objects.equals(ite.getWarningType(), UniversalEnum.TWO.getValue())).collect(Collectors.toList());
+            if (collect.size() == UniversalEnum.ZERO.getNumber()) {
+                WebSocketService.broadcast(UniversalEnum.THREE.getValue(), jsonObject); //推送事件消息 不是感知事件
+                DcNoStakeWarningTable dcNoStakeWarningTable = new DcNoStakeWarningTable();
+                dcNoStakeWarningTable.setWarningDescription(jsonObject.getString("earlyWorningContent"));
+                dcNoStakeWarningTable.setWarningType(UniversalEnum.TWO.getValue());
+                dcNoStakeWarningTable.setWarningTime(jsonObject.getDate("earlyWorningIssueDate"));
+                dcNoStakeWarningTable.setOtherConfig(String.valueOf(jsonObject));
+                noStakeWarningTableService.addDcNoStakeWarningTable(dcNoStakeWarningTable);
+            }
+
+        });
+        //redisCache.setCacheList(UniversalEnum.CURRENT_WEATHER_AND_FORECAST_INFORMATION.getValue(), data);
+
+
+    }
+
     /*
      * 当前气象及预报信息查询
      * */
     @ApiOperation("当前气象及预报信息查询")
     @PostMapping(value = "/currentWeatherAndForecastInformation")
-    public AjaxResult currentWeatherAndForecastInformation(@RequestBody HashMap<String,Object> parameter) {
+    public AjaxResult currentWeatherAndForecastInformation(@RequestBody HashMap<String, Object> parameter) {
 
         String stakeNum = String.valueOf(parameter.get("stakeNum"));
         String[] split = stakeNum.split("[|]");
 
         StringBuilder numStake = new StringBuilder();
 
-        for (int i = 0; i < split.length; i++) {
+        for (int i = UniversalEnum.ZERO.getNumber(); i < split.length; i++) {
             String[] split1 = split[i].split("[+]");
-            String k = split1[0].replace("K", "");
+            String k = split1[UniversalEnum.ZERO.getNumber()].replace(UniversalEnum.CAPITAL_K.getValue(), UniversalEnum.EMPTY_STRING.getValue());
             int parseInt = Integer.parseInt(k);
-            numStake.append("K").append(findNearestMultipleOfFive(parseInt)).append("+000");
-            if (i != split.length - 1) {
-                numStake.append("|");
+            numStake.append(UniversalEnum.CAPITAL_K.getValue()).append(findNearestMultipleOfFive(parseInt)).append("+000");
+            if (i != split.length - UniversalEnum.ONE.getNumber()) {
+                numStake.append(UniversalEnum.VERTICAL_LINE.getValue());
             }
         }
 
@@ -98,31 +252,31 @@ public class WeatherForecastController extends BaseController {
             if (response.body() != null) {
 
                 JSONObject jsonResult = JSONObject.parseObject(response.body().string());
-                if (jsonResult.getInteger("code") == 200) {
+                if (jsonResult.getInteger("code") == UniversalEnum.TWO_HUNDRED.getNumber()) {
                     JSONArray data = jsonResult.getJSONArray("data");
-                    if (data.size() != 0) {
+                    if (data.size() != UniversalEnum.ZERO.getNumber()) {
                         redisCache.setCacheList("currentWeatherAndForecastInformation", data);
                         return AjaxResult.success(data);
                     } else {
                         return AjaxResult.success(redisCache.getCacheList("currentWeatherAndForecastInformation"));
                     }
                 } else {
-                    return AjaxResult.error(jsonResult.getInteger("code"), "请求失败");
+                    return AjaxResult.error(jsonResult.getInteger("code"), UniversalEnum.REQUEST_FAILED.getValue());
                 }
             }
         } catch (Exception ignored) {
 
 
         }
-        return AjaxResult.error("请求失败");
+        return AjaxResult.error(UniversalEnum.REQUEST_FAILED.getValue());
     }
 
     public static int findNearestMultipleOfFive(int number) {
         // 计算除以5的余数
-        int remainder = number % 5;
+        int remainder = number % UniversalEnum.FIVE.getNumber();
 
         // 如果余数为0，则number已经是5的倍数
-        if (remainder == 0) {
+        if (remainder == UniversalEnum.ZERO.getNumber()) {
             return number;
         }
 
@@ -130,7 +284,7 @@ public class WeatherForecastController extends BaseController {
         // 要么是number加上(5 - 余数)（如果余数大于或等于3）
         // 这里选择的是较小的那个值（向上或向下取整）
         int lowerMultiple = number - remainder;
-        int higherMultiple = number + (5 - remainder);
+        int higherMultiple = number + (UniversalEnum.FIVE.getNumber() - remainder);
 
         // 返回两者中较小的那个
         return (lowerMultiple < higherMultiple) ? lowerMultiple : higherMultiple;
@@ -162,7 +316,7 @@ public class WeatherForecastController extends BaseController {
             if (response.body() != null) {
 
                 JSONObject jsonResult = JSONObject.parseObject(response.body().string());
-                if (jsonResult.getInteger("code") == 200) {
+                if (jsonResult.getInteger("code") == UniversalEnum.TWO_HUNDRED.getNumber()) {
                     JSONArray jsonArray = jsonResult.getJSONArray("data");
                     List<Object> collect = jsonArray.stream().filter(item -> {
                         JSONObject jsonObject = (JSONObject) JSON.toJSON(item);
@@ -187,21 +341,21 @@ public class WeatherForecastController extends BaseController {
                         //    return false;
                         //}
                     }).collect(Collectors.toList());
-                    if (collect.size() != 0) {
+                    if (collect.size() != UniversalEnum.ZERO.getNumber()) {
                         redisCache.setCacheList("currentWeatherWarningInformationQuery", collect);
                         return AjaxResult.success(collect);
                     } else {
                         return AjaxResult.success(redisCache.getCacheList("currentWeatherWarningInformationQuery"));
                     }
                 } else {
-                    return AjaxResult.error(jsonResult.getInteger("code"), "请求失败");
+                    return AjaxResult.error(jsonResult.getInteger("code"), UniversalEnum.REQUEST_FAILED.getValue());
                 }
             }
         } catch (Exception ignored) {
 
 
         }
-        return AjaxResult.error("请求失败");
+        return AjaxResult.error(UniversalEnum.REQUEST_FAILED.getValue());
     }
 
 
@@ -261,18 +415,18 @@ public class WeatherForecastController extends BaseController {
                     Response response // 请求响应
                             = okHttp
                             .headers(new HashMap<>())
-                            .url(weather.getString("METEOROLOGICALEARLYWARNINGURI") + dcRegion.getLongitude() + "," + dcRegion.getLatitude() + weather.getString("KEY") + weather.getString("METEOROLOGICALEARLYWARNINGKEY")) // 请求地址
+                            .url(weather.getString("METEOROLOGICALEARLYWARNINGURI") + dcRegion.getLongitude() + UniversalEnum.COMMA.getNumber() + dcRegion.getLatitude() + weather.getString("KEY") + weather.getString("METEOROLOGICALEARLYWARNINGKEY")) // 请求地址
                             .get(); // 请求方法
 
                     if (response.body() != null) {
 
                         JSONObject jsonResult = JSONObject.parseObject(response.body().string());
-                        if (jsonResult.getInteger("code") == 200) {
+                        if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_TWO_HUNDRED.getNumber()) {
 
                             jsonObject.put(weather.getString("METEOROLOGICALEARLYWARNING") + dcRegion.getId(), extracted(jsonResult, "warning", dcRegion));
 
                         } else {
-                            return AjaxResult.error(jsonResult.getInteger("code"), "请求失败");
+                            return AjaxResult.error(jsonResult.getInteger("code"), UniversalEnum.REQUEST_FAILED.getValue());
                         }
                     }
                 } catch (Exception e) {
@@ -280,7 +434,7 @@ public class WeatherForecastController extends BaseController {
                 }
             }
         }
-        redisCache.setCacheObject(weather.getString("METEOROLOGICALEARLYWARNING"), jsonObject, 13, TimeUnit.MINUTES);
+        redisCache.setCacheObject(weather.getString("METEOROLOGICALEARLYWARNING"), jsonObject, UniversalEnum.THIRTEEN.getNumber(), TimeUnit.MINUTES);
         JSONArray meteorologicalEarlyWarning1 = jsonObject.getJSONArray("meteorologicalEarlyWarning1");
         JSONArray meteorologicalEarlyWarning2 = jsonObject.getJSONArray("meteorologicalEarlyWarning2");
         JSONArray meteorologicalEarlyWarning3 = jsonObject.getJSONArray("meteorologicalEarlyWarning3");
@@ -289,14 +443,14 @@ public class WeatherForecastController extends BaseController {
         JSONArray meteorologicalEarlyWarning6 = jsonObject.getJSONArray("meteorologicalEarlyWarning6");
         JSONArray meteorologicalEarlyWarning7 = jsonObject.getJSONArray("meteorologicalEarlyWarning7");
         JSONArray meteorologicalEarlyWarning8 = jsonObject.getJSONArray("meteorologicalEarlyWarning8");
-        return AjaxResult.success((meteorologicalEarlyWarning1 == null ? 0 : meteorologicalEarlyWarning1.size()) +
-                (meteorologicalEarlyWarning2 == null ? 0 : meteorologicalEarlyWarning2.size()) +
-                (meteorologicalEarlyWarning3 == null ? 0 : meteorologicalEarlyWarning3.size()) +
-                (meteorologicalEarlyWarning4 == null ? 0 : meteorologicalEarlyWarning4.size()) +
-                (meteorologicalEarlyWarning5 == null ? 0 : meteorologicalEarlyWarning5.size()) +
-                (meteorologicalEarlyWarning6 == null ? 0 : meteorologicalEarlyWarning6.size()) +
-                (meteorologicalEarlyWarning7 == null ? 0 : meteorologicalEarlyWarning7.size()) +
-                (meteorologicalEarlyWarning8 == null ? 0 : meteorologicalEarlyWarning8.size()));
+        return AjaxResult.success((meteorologicalEarlyWarning1 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning1.size()) +
+                (meteorologicalEarlyWarning2 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning2.size()) +
+                (meteorologicalEarlyWarning3 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning3.size()) +
+                (meteorologicalEarlyWarning4 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning4.size()) +
+                (meteorologicalEarlyWarning5 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning5.size()) +
+                (meteorologicalEarlyWarning6 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning6.size()) +
+                (meteorologicalEarlyWarning7 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning7.size()) +
+                (meteorologicalEarlyWarning8 == null ? UniversalEnum.ZERO.getNumber() : meteorologicalEarlyWarning8.size()));
 
     }
 
@@ -324,13 +478,13 @@ public class WeatherForecastController extends BaseController {
                     Response response // 请求响应
                             = okHttp
                             .headers(new HashMap<>())
-                            .url(uri + dcRegion.getLongitude() + "," + dcRegion.getLatitude() + weather.getString("KEY") + accessKey) // 请求地址
+                            .url(uri + dcRegion.getLongitude() + UniversalEnum.COMMA.getValue() + dcRegion.getLatitude() + weather.getString("KEY") + accessKey) // 请求地址
                             .get(); // 请求方法
 
                     if (response.body() != null) {
 
                         JSONObject jsonResult = JSONObject.parseObject(response.body().string());
-                        if (jsonResult.getInteger("code") == 200) {
+                        if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_TWO_HUNDRED.getNumber()) {
 
                             if (Objects.equals(redisKey, weather.getString("WEATHERFACTS"))) {
 
@@ -345,7 +499,7 @@ public class WeatherForecastController extends BaseController {
                                 jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult, "hourly", dcRegion));
                             }
                         } else {
-                            return AjaxResult.error(jsonResult.getInteger("code"), "请求失败");
+                            return AjaxResult.error(jsonResult.getInteger("code"), UniversalEnum.REQUEST_FAILED.getValue());
                         }
                     }
                 } catch (Exception e) {
@@ -358,15 +512,15 @@ public class WeatherForecastController extends BaseController {
 
             if (Objects.equals(redisKey, weather.getString("WEATHERFACTS"))) {
 
-                redisCache.setCacheObject(redisKey, jsonObject, 13, TimeUnit.MINUTES);
+                redisCache.setCacheObject(redisKey, jsonObject, UniversalEnum.THIRTEEN.getNumber(), TimeUnit.MINUTES);
 
             } else if (Objects.equals(redisKey, weather.getString("METEOROLOGICALEARLYWARNING"))) {
 
-                redisCache.setCacheObject(redisKey, jsonObject, 13, TimeUnit.MINUTES);
+                redisCache.setCacheObject(redisKey, jsonObject, UniversalEnum.THIRTEEN.getNumber(), TimeUnit.MINUTES);
 
             } else if (Objects.equals(redisKey, weather.getString("HOURLYWEATHER"))) {
 
-                redisCache.setCacheObject(redisKey, jsonObject, 13, TimeUnit.MINUTES);
+                redisCache.setCacheObject(redisKey, jsonObject, UniversalEnum.THIRTEEN.getNumber(), TimeUnit.MINUTES);
             }
 
             return AjaxResult.success(jsonObject);
@@ -376,7 +530,7 @@ public class WeatherForecastController extends BaseController {
     private static Object extracted(JSONObject jsonResult, String type, DcRegion dcRegion) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("code", jsonResult.getString("code"));
-        if (Objects.equals(jsonResult.getString("code"), "200")) {
+        if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_TWO_HUNDRED.getNumber()) {
             if (Objects.equals(type, "now")) {
 
                 JSONObject object = jsonResult.getJSONObject(type);
@@ -389,22 +543,22 @@ public class WeatherForecastController extends BaseController {
                 });
                 return jsonArray;
             }
-        } else if (Objects.equals(jsonResult.getString("code"), "500")) {
-            jsonObject.put("msg", "请求失败：无响应或超时");
-        } else if (Objects.equals(jsonResult.getString("code"), "429")) {
-            jsonObject.put("msg", "请求失败：每分钟访问次数过多，请稍后重试");
-        } else if (Objects.equals(jsonResult.getString("code"), "404")) {
-            jsonObject.put("msg", "请求失败：查询的地区或者数据不存在");
-        } else if (Objects.equals(jsonResult.getString("code"), "403")) {
-            jsonObject.put("msg", "请求失败：无访问权限，可能是绑定的PackageName、BundleID、域名IP地址不一致");
-        } else if (Objects.equals(jsonResult.getString("code"), "402")) {
-            jsonObject.put("msg", "请求失败：超过访问次数或余额不足以支持继续访问服务");
-        } else if (Objects.equals(jsonResult.getString("code"), "401")) {
-            jsonObject.put("msg", "请求失败：认证失败，可能使用了错误的KEY、数字签名错误、KEY的类型错误");
-        } else if (Objects.equals(jsonResult.getString("code"), "400")) {
-            jsonObject.put("msg", "请求失败：请求错误，可能包含错误的请求参数或缺少必选的请求参数");
-        } else if (Objects.equals(jsonResult.getString("code"), "204")) {
-            jsonObject.put("msg", "请求失败：请求成功，但你查询的地区暂时没有你需要的数据");
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_FIVE_HUNDRED.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_FIVE_HUNDRED.getValue());
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_TWENTY_NINE.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_TWENTY_NINE.getValue());
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_FOUR.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_FOUR.getValue());
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_THREE.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_THREE.getValue());
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_TWO.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_TWO.getValue());
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_ONE.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED_AND_ONE.getValue());
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_FOUR_HUNDRED.getValue());
+        } else if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_TWO_HUNDRED_AND_FORTY.getNumber()) {
+            jsonObject.put("msg", UniversalEnum.WEATHER_FORECAST_TWO_HUNDRED_AND_FORTY.getValue());
         }
         return jsonObject;
     }
@@ -424,16 +578,16 @@ public class WeatherForecastController extends BaseController {
         Response response // 请求响应
                 = okHttp
                 .headers(new HashMap<>())
-                .url(weather.getString("WEATHERFACTSURI") + longitude + "," + latitude + weather.getString("KEY") + weather.getString("WEATHERFACTSKEY")) // 请求地址
+                .url(weather.getString("WEATHERFACTSURI") + longitude + UniversalEnum.COMMA.getValue() + latitude + weather.getString("KEY") + weather.getString("WEATHERFACTSKEY")) // 请求地址
                 .get(); // 请求方法
 
         if (response.body() != null) {
 
             JSONObject jsonResult = JSONObject.parseObject(response.body().string());
-            if (jsonResult.getInteger("code") == 200) {
+            if (jsonResult.getInteger("code") == UniversalEnum.WEATHER_FORECAST_TWO_HUNDRED.getNumber()) {
                 jsonObject.put("weatherInTheAreaWhereTheIncidentOccurred", jsonResult);
             } else {
-                return AjaxResult.error(jsonResult.getInteger("code"), "请求失败");
+                return AjaxResult.error(jsonResult.getInteger("code"), UniversalEnum.REQUEST_FAILED.getValue());
             }
         }
         return AjaxResult.success(jsonObject);
diff --git a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
index 57517a85..68208a6d 100644
--- a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
+++ b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
@@ -28,6 +28,12 @@ public enum UniversalEnum {
     // Windows
     WINDOWS(0, "Windows"),
 
+    // http
+    HTTP(0, "http://"),
+
+    // https
+    HTTPS(0, "https://"),
+
     // weixintuisontoken
     WEIXINTUISONTOKEN(0, "weixintuisontoken"),
 
@@ -184,6 +190,9 @@ public enum UniversalEnum {
     // 封闭数量统计
     CLOSED_QUANTITY_STATISTICS(0, "封闭数量统计"),
 
+    // 节假日 基础数据数据
+    HOLIDAY_BASIC_DATA_DATA(0, "节假日 基础数据数据"),
+
     // 时间
     TIME(0, "时间"),
 
@@ -364,6 +373,9 @@ public enum UniversalEnum {
     //雨棚可变信息标志
     AWNING_VARIABLE_INFORMATION_SIGN(0, "雨棚可变信息标志"),
 
+    //站前可变信息标志
+    VARIABLE_MESSAGE_SIGN_IN_FRONT_OF_STATION(0, "站前可变信息标志"),
+
     //站前悬臂式可变信息标志
     CANTILEVER_VARIABLE_INFORMATION_SIGN_IN_FRONT_OF_STATION(0, "站前悬臂式可变信息标志"),
 
@@ -760,6 +772,9 @@ public enum UniversalEnum {
     // 秒
     SECONDS(0, "秒"),
 
+    // 交通流数据预警提醒
+    TRAFFIC_FLOW_DATA_WARNING_REMINDER(0, "交通流数据预警提醒"),
+
     // 总统计数
     PRESIDENTIAL_COUNT(0, "总统计数"),
 
@@ -1056,6 +1071,9 @@ public enum UniversalEnum {
     // 发生浓雾异常天气事件
     AN_ABNORMAL_WEATHER_EVENT_OF_DENSE_FOG_OCCURRED(0, "发生浓雾异常天气事件"),
 
+    // SET
+    SET(0, "SET"),
+
     // SETMD
     SETMD(0, "SETMD"),
 
@@ -1410,6 +1428,9 @@ public enum UniversalEnum {
     // 一万
     TEN_THOUSAND(10000, "10000"),
 
+    // 40001
+    FORTY_THOUSAND_AND_ONE(40001, "40001"),
+
     // 42001
     FORTY_TWO_THOUSAND_ONE(42001, "42001"),
 
@@ -1467,6 +1488,9 @@ public enum UniversalEnum {
     // 天气服务500
     WEATHER_FORECAST_FIVE_HUNDRED(500, "请求失败：无响应或超时"),
 
+    // *6001
+    ASTERISK_ASTERISK_SIX_THOUSAND_AND_ONE(500, "*6001"),
+
     // 数据中心流量统计IP端口
     DATA_CENTER_TRAFFIC_STATISTICS_IP_PORT(0, "http://10.166.139.16:8080"),
 
@@ -1530,9 +1554,21 @@ public enum UniversalEnum {
     // 设备功能调用 /api/iot/device/functions/
     DEVICE_FUNCTION_CALL(0, "/api/iot/device/functions/"),
 
+    // 雷达图 http://d1.weather.com.cn/newwebgis/radar/radar_list_new.json?_=
+    RADAR_MAP(0, "http://d1.weather.com.cn/newwebgis/radar/radar_list_new.json?_="),
+
+    // 雷达图天气 http://www.weather.com.cn/
+    RADAR_MAP_WEATHER(0, "http://www.weather.com.cn/"),
+
+    // 雷达图返回 http://www.weather.com.cn/
+    RADAR_MAP_BACK(0, "https://10.0.111.11/leidatu/"),
+
     // 查询指定事件历史数据列表 /api/iot/device/events/history/
     EXAMPLE_QUERY_THE_HISTORICAL_DATA_LIST_OF_A_SPECIFIED_EVENT(0, "/api/iot/device/events/history/"),
 
+    // 查询物联设备事件数据 https://apis.tianapi.com/jiejiari/index?key=
+    GET_HOLIDAYS(0, "https://apis.tianapi.com/jiejiari/index?key="),
+
     // 查询物联设备事件数据 /api/iot/device/logs/
     QUERY_EVENT_DATA_OF_IOT_DEVICES(0, "/api/iot/device/logs/"),
 
@@ -1599,9 +1635,24 @@ public enum UniversalEnum {
     // 非机预警图片地址前缀
     NON_MACHINE_WARNING_IMAGE_ADDRESS_PREFIX(0, "https://10.0.111.11/fjyj"),
 
+    // 设置预置位 :9021/preset/addPreset
+    SET_PRESET_BIT(0, ":9021/preset/addPreset"),
+
     // currentWeatherAndForecastInformation
     CURRENT_WEATHER_AND_FORECAST_INFORMATION(0, "currentWeatherAndForecastInformation"),
 
+    // /preset/addPreset
+    NEW_PRESET_BIT(0, "/preset/addPreset"),
+
+    // /preset/presetList
+    EXAMPLE_QUERY_THE_PRESET_BIT_LIST(0, "/preset/presetList"),
+
+    // login.do
+    LOGIN_DO(0, "login.do"),
+
+    // queryTerm.do?accessToken=
+    QUERY_TERM_DO_ACCESS_TOKEN(0, "queryTerm.do?accessToken="),
+
     // dc_device_type
     DC_DEVICE_TYPE(0, "dc_device_type"),
 
@@ -1626,6 +1677,12 @@ public enum UniversalEnum {
     // congestionEnd
     CONGESTION_END(0, "congestionEnd"),
 
+    // batchFunctions
+    BATCH_FUNCTIONS(0, "batchFunctions"),
+
+    // functions
+    FUNCTIONS(0, "functions"),
+
     // illegalParkingEnd
     ILLEGAL_PARKING_END(0, "illegalParkingEnd"),
 
@@ -1671,6 +1728,9 @@ public enum UniversalEnum {
     // sbx-fun-kl
     SBX_FUN_KL(0, "sbx-fun-kl"),
 
+    // online
+    ON_LINE(0, "online"),
+
     // POST
     POST(0, "POST"),
 
@@ -1848,6 +1908,24 @@ public enum UniversalEnum {
     // MODIFY
     MODIFY(0, "MODIFY"),
 
+    // trafficPoliceStatus
+    TRAFFIC_POLICE_STATUS(0, "trafficPoliceStatus"),
+
+    // planStatus
+    PLAN_STATUS(0, "planStatus"),
+
+    // medicalStatus
+    MEDICAL_STATUS(0, "medicalStatus"),
+
+    // boardStatus
+    BOARD_STATUS(0, "boardStatus"),
+
+    // chemicalsStatus
+    CHEMICALS_STATUS(0, "chemicalsStatus"),
+
+    // fireStatus
+    FIRE_STATUS(0, "fireStatus"),
+
     // Add
     Add(0, "Add"),
 
@@ -2016,6 +2094,9 @@ public enum UniversalEnum {
     // 2-1
     TWO_ONE(2, "2-1"),
 
+    // 2-2
+    TWO_TWO(2, "2-2"),
+
     // 2-3
     TWO_THREE(2, "2-3"),
 
@@ -2100,6 +2181,9 @@ public enum UniversalEnum {
     // 8-3
     EIGHT_THREE(8, "8-3"),
 
+    // 8-4
+    EIGHT_FOUR(8, "8-4"),
+
     // 9-1
     NINE_ONE(9, "9-1"),
 
@@ -2445,6 +2529,12 @@ public enum UniversalEnum {
     // 发送企业微信消息成功
     SENDING_AN_ENTERPRISE_WECHAT_MESSAGE_SUCCEEDED_PROCEDURE(0, "发送企业微信消息成功"),
 
+    // 接口已关闭
+    THE_INTERFACE_IS_CLOSED(0, "接口已关闭"),
+
+    // 接口已关闭
+    FUNCTIONAL_DEVELOPMENT(0, "功能开发中"),
+
     // 发布失败
     PUBLISHING_FAILURE(0, "发布失败"),
 
diff --git a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java
index d4071155..c43f1417 100644
--- a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java
+++ b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java
@@ -269,7 +269,7 @@ public class OperationLogAspect {
                             dcPublishManage.setPublishChannels(7);
                         }
 
-                        dcPublishManage.setContentDetails(String.valueOf(pointArgs));
+                        dcPublishManage.setContentDetails(JSON.toJSONString(pointArgs));
                         dcPublishManageService.insertDcPublishManage(dcPublishManage);
                     }
                 }
diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcTollStationStatisticsDataMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcTollStationStatisticsDataMapper.java
index ad336882..83bbec5f 100644
--- a/zc-business/src/main/java/com/zc/business/mapper/DcTollStationStatisticsDataMapper.java
+++ b/zc-business/src/main/java/com/zc/business/mapper/DcTollStationStatisticsDataMapper.java
@@ -2,11 +2,14 @@ package com.zc.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zc.business.domain.DcTollStationStatisticsData;
+import com.zc.business.domain.DcTollStationStatisticsDataMap;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 这是一个接口的注释，用于描述收费站数据统计的Mapper。
@@ -32,6 +35,6 @@ public interface DcTollStationStatisticsDataMapper extends BaseMapper<DcTollStat
      */
     Date getMaxStatisticalDate();
 
-    List<DcTollStationStatisticsData> TollBoothStatistics(@Param("startDate") String startDate, @Param("accessType") String accessType, @Param("periodType") String periodType);
+    List<Map<String, String>> TollBoothStatistics(@Param("startDate") String startDate, @Param("accessType") String accessType, @Param("periodType") String periodType);
 }
 
diff --git a/zc-business/src/main/java/com/zc/business/service/IDcTollStationStatisticsDataService.java b/zc-business/src/main/java/com/zc/business/service/IDcTollStationStatisticsDataService.java
index 3a240ba7..95b630b6 100644
--- a/zc-business/src/main/java/com/zc/business/service/IDcTollStationStatisticsDataService.java
+++ b/zc-business/src/main/java/com/zc/business/service/IDcTollStationStatisticsDataService.java
@@ -3,8 +3,10 @@ package com.zc.business.service;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zc.business.domain.DcTollStationStatisticsData;
+import com.zc.business.domain.DcTollStationStatisticsDataMap;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 收费站数据统计接口。该接口扩展了IService接口，用于对DcTollStationStatisticsData类型的实体进行数据库操作。
@@ -39,5 +41,5 @@ public interface IDcTollStationStatisticsDataService extends IService<DcTollStat
      */
     List<DcTollStationStatisticsData> accumulatedFlow(DcTollStationStatisticsData request);
 
-    List<DcTollStationStatisticsData> TollBoothStatistics(String startDate, String accessType, String periodType);
+    List<Map<String, String>> TollBoothStatistics(String startDate, String accessType, String periodType);
 }
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
index ebf7399c..2f7cba6c 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
@@ -427,7 +427,11 @@ public class DcDeviceServiceImpl extends ServiceImpl<DcDeviceMapper, DcDevice> i
         String childType = String.valueOf(parameter.get("childType"));
         String deviceState = String.valueOf(parameter.get("deviceState"));
         String direction = String.valueOf(parameter.get("direction"));
+        Integer useState = Integer.parseInt(parameter.get("useState").toString());
         DcDevice device = new DcDevice();
+        if (!Objects.equals(useState, "null")) {
+            device.setUseState(useState);
+        }
         if (!Objects.equals(childType, "null")) {
             device.setChildType(childType);
         }
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
index dca0f978..a913e615 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
@@ -494,6 +494,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                 end.add(markArray[1]);
                 parameter.put("startStakeMark", start);
                 parameter.put("endStakeMark", end);
+                parameter.put("useState",1);
                 dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
                 Collections.sort(dcDevices, new Comparator<DcDevice>() {
                     @Override
@@ -517,6 +518,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                 end.add("154");
                 parameter.put("startStakeMark", start);
                 parameter.put("endStakeMark", end);
+                parameter.put("useState",1);
                 dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
                 Collections.sort(dcDevices, new Comparator<DcDevice>() {
                     @Override
@@ -543,6 +545,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                 end.add("154");
                 parameter.put("startStakeMark", start);
                 parameter.put("endStakeMark", end);
+                parameter.put("useState",1);
                 dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
                 Collections.sort(dcDevices, new Comparator<DcDevice>() {
                     @Override
@@ -566,6 +569,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                 end.add(markArray[1]);
                 parameter.put("startStakeMark", start);
                 parameter.put("endStakeMark", end);
+                parameter.put("useState",1);
                 dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
                 Collections.sort(dcDevices, new Comparator<DcDevice>() {
                     @Override
@@ -594,6 +598,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
             parameter.put("startStakeMark", start);
             parameter.put("endStakeMark", end);
             parameter.put("deviceType", dcExecuteAction.getDeviceType());
+            parameter.put("useState",1);
             // 根据桩号范围，查询附近设备
             dcDevices = dcDeviceService.devicePileNumberQueryDevice(parameter);
         }
@@ -767,6 +772,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                     try {
                         // 根据不通设备类型，执行不通的功能操作
                         invokedFunction(
+                                dcExecuteAction.getDeviceType(),
                                 id,
                                 dcEventAnDcEmergencyPlans.getOperationType(),
                                 dcDevices,
@@ -820,11 +826,29 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
     /**
      * 根据不通设备类型，执行不通的功能操作
      */
-    public void invokedFunction(String eventId,
+    public void invokedFunction(int deviceType,
+                                String eventId,
                                 Integer operationType,
                                 List<DcDevice> dcDevices,
                                 JSONObject otherConfig,
                                 JSONArray resultArray) {
+        // 获取设备类型名称
+        String deviceTypeName = Arrays.stream(DeviceTypeEnum.values())
+                .filter(deviceTypeEnum -> deviceTypeEnum.getCode() == deviceType)
+                .findFirst()
+                .map(DeviceTypeEnum::getInfo)
+                .orElse("类型异常");
+
+        if (dcDevices.size() == 0) {
+            JSONObject result = new JSONObject();
+            JSONObject errorResult = new JSONObject();
+            errorResult.put("code",500);
+            errorResult.put("msg","操作失败");
+            result.put("deviceName", deviceTypeName);
+            result.put("content", "未找到相关设备");
+            result.put("result", errorResult);
+            resultArray.add(result);
+        }
 
         for (DcDevice device : dcDevices) {
 
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcTollStationStatisticsDataImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcTollStationStatisticsDataImpl.java
index 2d89a62d..27aed6bb 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcTollStationStatisticsDataImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcTollStationStatisticsDataImpl.java
@@ -25,10 +25,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -234,7 +231,7 @@ public class DcTollStationStatisticsDataImpl extends ServiceImpl<DcTollStationSt
     }
 
     @Override
-    public  List<DcTollStationStatisticsData> TollBoothStatistics(String startDate, String accessType, String periodType) {
+    public List<Map<String, String>> TollBoothStatistics(String startDate, String accessType, String periodType) {
         return dcTollStationStatisticsDataMapper.TollBoothStatistics(startDate,accessType,periodType);
     }
 
diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
index a68051b1..c04132fe 100644
--- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
@@ -276,8 +276,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             m.visibility_type != 4
             <if test="visibilityType != null and visibilityType != ''">AND m.visibility_type = #{visibilityType}</if>
-            AND DATE(m.create_time) = CURDATE()
-        </where>
+/*            AND DATE(m.create_time) = CURDATE()
+*/        </where>
+        ORDER BY
+        m.create_time desc
     </select>
     <select id="selectStatisticsDay" resultMap="countMap" resultType="map">
         WITH RECURSIVE dates_in_month AS (
diff --git a/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml
index b6c8fe35..a08b9fa8 100644
--- a/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml
@@ -101,16 +101,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-        <select id="TollBoothStatistics" parameterType="string" resultType="DcTollStationStatisticsDataMap" >
+        <select id="TollBoothStatistics" parameterType="string" resultType="com.zc.business.domain.DcTollStationStatisticsDataMap" >
             SELECT
-                fa.facility_name,
-                fa.stake_mark,
-                dt.id,
-                dt.access_type,
-                dt.period_type,
-                dt.traffic_volume,
-                dt.toll_station_code,
-                dt.statistical_date
+                IFNULL( fa.facility_name, '') AS facility_name,
+                IFNULL(fa.stake_mark, '') AS stake_mark,
+                IFNULL(dt.id,'') AS id,
+                IFNULL( dt.access_type, '') AS access_type,
+                IFNULL( dt.period_type, '') AS period_type,
+                IFNULL( dt.traffic_volume, 0) AS traffic_volume,
+                IFNULL( dt.toll_station_code, '') AS toll_station_code,
+                IFNULL( dt.statistical_date, '') AS statistical_date
             FROM
                 dc_facility AS fa
                     LEFT JOIN