diff --git a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/DataQueryController.java b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/DataQueryController.java index d04dcd1..50f4f62 100644 --- a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/DataQueryController.java +++ b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/DataQueryController.java @@ -8,6 +8,7 @@ import com.inspur.industrial.domain.BottomCylData; import com.inspur.industrial.domain.IpcData; import com.inspur.industrial.domain.ScollerData; import com.inspur.industrial.service.IDataQueryService; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -136,6 +137,7 @@ public class DataQueryController { /** * 超压底缸导出数据记录 */ + @PreAuthorize("@ss.hasPermi('dataquery:bottomcyl:export')") @Log(title = "超压底缸数据记录", businessType = BusinessType.EXPORT) @PostMapping("/bottomCylExport") public void bottomCylExport( @@ -152,7 +154,8 @@ public class DataQueryController { /** * 超压底缸导出数据记录 */ - @Log(title = "数据记录", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('dataquery:topscoller:export')") + @Log(title = "中高辊顶辊数据记录", businessType = BusinessType.EXPORT) @PostMapping("/topScollerExport") public void topScollerExport( HttpServletResponse response, @@ -168,7 +171,8 @@ public class DataQueryController { /** * 超压底缸导出数据记录 */ - @Log(title = "数据记录", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('dataquery:bottomscoller:export')") + @Log(title = "中高辊底辊数据记录", businessType = BusinessType.EXPORT) @PostMapping("/bottomScollerExport") public void export( HttpServletResponse response, diff --git a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRulesController.java b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRulesController.java index 4b2732e..d7e4e84 100644 --- a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRulesController.java +++ b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRulesController.java @@ -37,7 +37,7 @@ public class IpcAlarmRulesController extends BaseController /** * 查询设备报警规则列表 */ - @PreAuthorize("@ss.hasPermi('system:rules:list')") + @PreAuthorize("@ss.hasPermi('alarm:rules:list')") @GetMapping("/list") public TableDataInfo list(IpcAlarmRules ipcAlarmRules) { @@ -56,7 +56,7 @@ public class IpcAlarmRulesController extends BaseController /** * 导出设备报警规则列表 */ - @PreAuthorize("@ss.hasPermi('system:rules:export')") + @PreAuthorize("@ss.hasPermi('alarm:rules:export')") @Log(title = "设备报警规则", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, IpcAlarmRules ipcAlarmRules) @@ -69,7 +69,7 @@ public class IpcAlarmRulesController extends BaseController /** * 获取设备报警规则详细信息 */ - @PreAuthorize("@ss.hasPermi('system:rules:query')") + @PreAuthorize("@ss.hasPermi('alarm:rules:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { @@ -79,7 +79,7 @@ public class IpcAlarmRulesController extends BaseController /** * 新增设备报警规则 */ - @PreAuthorize("@ss.hasPermi('system:rules:add')") + @PreAuthorize("@ss.hasPermi('alarm:rules:add')") @Log(title = "设备报警规则", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody IpcAlarmRules ipcAlarmRules) @@ -90,7 +90,7 @@ public class IpcAlarmRulesController extends BaseController /** * 修改设备报警规则 */ - @PreAuthorize("@ss.hasPermi('system:rules:edit')") + @PreAuthorize("@ss.hasPermi('alarm:rules:edit')") @Log(title = "设备报警规则", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody IpcAlarmRules ipcAlarmRules) @@ -101,7 +101,7 @@ public class IpcAlarmRulesController extends BaseController /** * 删除设备报警规则 */ - @PreAuthorize("@ss.hasPermi('system:rules:remove')") + @PreAuthorize("@ss.hasPermi('alarm:rules:remove')") @Log(title = "设备报警规则", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) diff --git a/zfipc-ui/src/views/dataLog/index.vue b/zfipc-ui/src/views/dataLog/index.vue index c3ad2bb..04d3fc7 100644 --- a/zfipc-ui/src/views/dataLog/index.vue +++ b/zfipc-ui/src/views/dataLog/index.vue @@ -29,6 +29,7 @@ icon="el-icon-download" size="mini" @click="handleBottomCylExport" + v-hasPermi="['dataquery:bottomcyl:export']" >导出