Commit bddc1309 authored by 耿迪迪's avatar 耿迪迪

权限及账号修改 gengdidi

parent fc952a7f
...@@ -36,7 +36,7 @@ public class TContractorController extends BaseController ...@@ -36,7 +36,7 @@ public class TContractorController extends BaseController
/** /**
* 查询承包商信息列表 * 查询承包商信息列表
*/ */
@PreAuthorize("@ss.hasPermi('contractor:contractorInfo:list')") //@PreAuthorize("@ss.hasPermi('contractor:contractorInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TContractor tContractor) public TableDataInfo list(TContractor tContractor)
{ {
......
...@@ -38,7 +38,7 @@ public class TContractorPersonController extends BaseController ...@@ -38,7 +38,7 @@ public class TContractorPersonController extends BaseController
/** /**
* 查询承包商人员信息列表 * 查询承包商人员信息列表
*/ */
@PreAuthorize("@ss.hasPermi('contractor:contractorPerson:list')") //@PreAuthorize("@ss.hasPermi('contractor:contractorPerson:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TContractorPerson tContractorPerson) public TableDataInfo list(TContractorPerson tContractorPerson)
{ {
......
...@@ -44,7 +44,7 @@ public class TDeviceInfoController extends BaseController ...@@ -44,7 +44,7 @@ public class TDeviceInfoController extends BaseController
/** /**
* 查询设备信息管理列表 * 查询设备信息管理列表
*/ */
@PreAuthorize("@ss.hasPermi('deviceManagement:deviceInfo:list')") //@PreAuthorize("@ss.hasPermi('deviceManagement:deviceInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDeviceInfo tDeviceInfo) public TableDataInfo list(TDeviceInfo tDeviceInfo)
{ {
......
...@@ -38,7 +38,7 @@ public class TMaintainPlanController extends BaseController ...@@ -38,7 +38,7 @@ public class TMaintainPlanController extends BaseController
/** /**
* 查询设备保养计划列表 * 查询设备保养计划列表
*/ */
@PreAuthorize("@ss.hasPermi('deviceManagement:maintainPlan:list')") //@PreAuthorize("@ss.hasPermi('deviceManagement:maintainPlan:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TMaintainPlan tMaintainPlan) public TableDataInfo list(TMaintainPlan tMaintainPlan)
{ {
......
...@@ -38,7 +38,7 @@ public class TRepairOrderController extends BaseController ...@@ -38,7 +38,7 @@ public class TRepairOrderController extends BaseController
/** /**
* 查询设备维修工单列表 * 查询设备维修工单列表
*/ */
@PreAuthorize("@ss.hasPermi('deviceManagement:repairOrder:list')") //@PreAuthorize("@ss.hasPermi('deviceManagement:repairOrder:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TRepairOrder tRepairOrder) public TableDataInfo list(TRepairOrder tRepairOrder)
{ {
......
...@@ -38,7 +38,7 @@ public class TSpecialDeviceRecordController extends BaseController ...@@ -38,7 +38,7 @@ public class TSpecialDeviceRecordController extends BaseController
/** /**
* 查询特种设备台账列表 * 查询特种设备台账列表
*/ */
@PreAuthorize("@ss.hasPermi('deviceManagement:specialDeviceRecord:list')") //@PreAuthorize("@ss.hasPermi('deviceManagement:specialDeviceRecord:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSpecialDeviceRecord tSpecialDeviceRecord) public TableDataInfo list(TSpecialDeviceRecord tSpecialDeviceRecord)
{ {
......
...@@ -36,7 +36,7 @@ public class THiddenLibraryController extends BaseController ...@@ -36,7 +36,7 @@ public class THiddenLibraryController extends BaseController
/** /**
* 查询隐患排查库列表 * 查询隐患排查库列表
*/ */
@PreAuthorize("@ss.hasPermi('system:library:list')") //@PreAuthorize("@ss.hasPermi('system:library:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(THiddenLibrary tHiddenLibrary) public TableDataInfo list(THiddenLibrary tHiddenLibrary)
{ {
...@@ -48,7 +48,7 @@ public class THiddenLibraryController extends BaseController ...@@ -48,7 +48,7 @@ public class THiddenLibraryController extends BaseController
/** /**
* 导出隐患排查库列表 * 导出隐患排查库列表
*/ */
@PreAuthorize("@ss.hasPermi('system:library:export')") //@PreAuthorize("@ss.hasPermi('system:library:export')")
@Log(title = "隐患排查库", businessType = BusinessType.EXPORT) @Log(title = "隐患排查库", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(THiddenLibrary tHiddenLibrary) public AjaxResult export(THiddenLibrary tHiddenLibrary)
...@@ -61,7 +61,7 @@ public class THiddenLibraryController extends BaseController ...@@ -61,7 +61,7 @@ public class THiddenLibraryController extends BaseController
/** /**
* 获取隐患排查库详细信息 * 获取隐患排查库详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:library:query')") //@PreAuthorize("@ss.hasPermi('system:library:query')")
@GetMapping(value = "/{libraryId}") @GetMapping(value = "/{libraryId}")
public AjaxResult getInfo(@PathVariable("libraryId") Long libraryId) public AjaxResult getInfo(@PathVariable("libraryId") Long libraryId)
{ {
...@@ -71,7 +71,7 @@ public class THiddenLibraryController extends BaseController ...@@ -71,7 +71,7 @@ public class THiddenLibraryController extends BaseController
/** /**
* 新增隐患排查库 * 新增隐患排查库
*/ */
@PreAuthorize("@ss.hasPermi('system:library:add')") //@PreAuthorize("@ss.hasPermi('system:library:add')")
@Log(title = "隐患排查库", businessType = BusinessType.INSERT) @Log(title = "隐患排查库", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody THiddenLibrary tHiddenLibrary) public AjaxResult add(@RequestBody THiddenLibrary tHiddenLibrary)
...@@ -82,7 +82,7 @@ public class THiddenLibraryController extends BaseController ...@@ -82,7 +82,7 @@ public class THiddenLibraryController extends BaseController
/** /**
* 修改隐患排查库 * 修改隐患排查库
*/ */
@PreAuthorize("@ss.hasPermi('system:library:edit')") //@PreAuthorize("@ss.hasPermi('system:library:edit')")
@Log(title = "隐患排查库", businessType = BusinessType.UPDATE) @Log(title = "隐患排查库", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody THiddenLibrary tHiddenLibrary) public AjaxResult edit(@RequestBody THiddenLibrary tHiddenLibrary)
...@@ -93,7 +93,7 @@ public class THiddenLibraryController extends BaseController ...@@ -93,7 +93,7 @@ public class THiddenLibraryController extends BaseController
/** /**
* 删除隐患排查库 * 删除隐患排查库
*/ */
@PreAuthorize("@ss.hasPermi('system:library:remove')") //@PreAuthorize("@ss.hasPermi('system:library:remove')")
@Log(title = "隐患排查库", businessType = BusinessType.DELETE) @Log(title = "隐患排查库", businessType = BusinessType.DELETE)
@DeleteMapping("/{libraryIds}") @DeleteMapping("/{libraryIds}")
public AjaxResult remove(@PathVariable Long[] libraryIds) public AjaxResult remove(@PathVariable Long[] libraryIds)
......
...@@ -36,7 +36,7 @@ public class THiddenTroubleAssessmentController extends BaseController ...@@ -36,7 +36,7 @@ public class THiddenTroubleAssessmentController extends BaseController
/** /**
* 查询排查评估列表 * 查询排查评估列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:assessment:list')") ////@PreAuthorize("@ss.hasPermi('system:assessment:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(THiddenTroubleAssessment tHiddenTroubleAssessment) public TableDataInfo list(THiddenTroubleAssessment tHiddenTroubleAssessment)
{ {
...@@ -48,7 +48,7 @@ public class THiddenTroubleAssessmentController extends BaseController ...@@ -48,7 +48,7 @@ public class THiddenTroubleAssessmentController extends BaseController
/** /**
* 导出排查评估列表 * 导出排查评估列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:assessment:export')") ////@PreAuthorize("@ss.hasPermi('system:assessment:export')")
@Log(title = "排查评估", businessType = BusinessType.EXPORT) @Log(title = "排查评估", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(THiddenTroubleAssessment tHiddenTroubleAssessment) public AjaxResult export(THiddenTroubleAssessment tHiddenTroubleAssessment)
...@@ -61,7 +61,7 @@ public class THiddenTroubleAssessmentController extends BaseController ...@@ -61,7 +61,7 @@ public class THiddenTroubleAssessmentController extends BaseController
/** /**
* 获取排查评估详细信息 * 获取排查评估详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:assessment:query')") ////@PreAuthorize("@ss.hasPermi('system:assessment:query')")
@GetMapping(value = "/{assessmentId}") @GetMapping(value = "/{assessmentId}")
public AjaxResult getInfo(@PathVariable("assessmentId") Long assessmentId) public AjaxResult getInfo(@PathVariable("assessmentId") Long assessmentId)
{ {
...@@ -76,7 +76,7 @@ public class THiddenTroubleAssessmentController extends BaseController ...@@ -76,7 +76,7 @@ public class THiddenTroubleAssessmentController extends BaseController
/** /**
* 新增排查评估 * 新增排查评估
*/ */
//@PreAuthorize("@ss.hasPermi('system:assessment:add')") ////@PreAuthorize("@ss.hasPermi('system:assessment:add')")
@Log(title = "排查评估", businessType = BusinessType.INSERT) @Log(title = "排查评估", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody THiddenTroubleAssessment tHiddenTroubleAssessment) public AjaxResult add(@RequestBody THiddenTroubleAssessment tHiddenTroubleAssessment)
...@@ -87,7 +87,7 @@ public class THiddenTroubleAssessmentController extends BaseController ...@@ -87,7 +87,7 @@ public class THiddenTroubleAssessmentController extends BaseController
/** /**
* 修改排查评估 * 修改排查评估
*/ */
//@PreAuthorize("@ss.hasPermi('system:assessment:edit')") ////@PreAuthorize("@ss.hasPermi('system:assessment:edit')")
@Log(title = "排查评估", businessType = BusinessType.UPDATE) @Log(title = "排查评估", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody THiddenTroubleAssessment tHiddenTroubleAssessment) public AjaxResult edit(@RequestBody THiddenTroubleAssessment tHiddenTroubleAssessment)
...@@ -98,7 +98,7 @@ public class THiddenTroubleAssessmentController extends BaseController ...@@ -98,7 +98,7 @@ public class THiddenTroubleAssessmentController extends BaseController
/** /**
* 删除排查评估 * 删除排查评估
*/ */
//@PreAuthorize("@ss.hasPermi('system:assessment:remove')") ////@PreAuthorize("@ss.hasPermi('system:assessment:remove')")
@Log(title = "排查评估", businessType = BusinessType.DELETE) @Log(title = "排查评估", businessType = BusinessType.DELETE)
@DeleteMapping("/{assessmentIds}") @DeleteMapping("/{assessmentIds}")
public AjaxResult remove(@PathVariable Long[] assessmentIds) public AjaxResult remove(@PathVariable Long[] assessmentIds)
......
...@@ -36,7 +36,7 @@ public class THiddenTroubleWorkController extends BaseController ...@@ -36,7 +36,7 @@ public class THiddenTroubleWorkController extends BaseController
/** /**
* 查询隐患排查任务列表 * 查询隐患排查任务列表
*/ */
@PreAuthorize("@ss.hasPermi('system:workCheck:list')") //@PreAuthorize("@ss.hasPermi('system:workCheck:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(THiddenTroubleWork tHiddenTroubleWork) public TableDataInfo list(THiddenTroubleWork tHiddenTroubleWork)
{ {
...@@ -48,7 +48,7 @@ public class THiddenTroubleWorkController extends BaseController ...@@ -48,7 +48,7 @@ public class THiddenTroubleWorkController extends BaseController
/** /**
* 导出隐患排查任务列表 * 导出隐患排查任务列表
*/ */
@PreAuthorize("@ss.hasPermi('system:workCheck:export')") //@PreAuthorize("@ss.hasPermi('system:workCheck:export')")
@Log(title = "隐患排查任务", businessType = BusinessType.EXPORT) @Log(title = "隐患排查任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(THiddenTroubleWork tHiddenTroubleWork) public AjaxResult export(THiddenTroubleWork tHiddenTroubleWork)
...@@ -61,7 +61,7 @@ public class THiddenTroubleWorkController extends BaseController ...@@ -61,7 +61,7 @@ public class THiddenTroubleWorkController extends BaseController
/** /**
* 获取隐患排查任务详细信息 * 获取隐患排查任务详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:workCheck:query')") //@PreAuthorize("@ss.hasPermi('system:workCheck:query')")
@GetMapping(value = "/{workId}") @GetMapping(value = "/{workId}")
public AjaxResult getInfo(@PathVariable("workId") Long workId) public AjaxResult getInfo(@PathVariable("workId") Long workId)
{ {
...@@ -71,7 +71,7 @@ public class THiddenTroubleWorkController extends BaseController ...@@ -71,7 +71,7 @@ public class THiddenTroubleWorkController extends BaseController
/** /**
* 新增隐患排查任务 * 新增隐患排查任务
*/ */
@PreAuthorize("@ss.hasPermi('system:workCheck:add')") //@PreAuthorize("@ss.hasPermi('system:workCheck:add')")
@Log(title = "隐患排查任务", businessType = BusinessType.INSERT) @Log(title = "隐患排查任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody THiddenTroubleWork tHiddenTroubleWork) public AjaxResult add(@RequestBody THiddenTroubleWork tHiddenTroubleWork)
...@@ -86,7 +86,7 @@ public class THiddenTroubleWorkController extends BaseController ...@@ -86,7 +86,7 @@ public class THiddenTroubleWorkController extends BaseController
/** /**
* 修改隐患排查任务 * 修改隐患排查任务
*/ */
@PreAuthorize("@ss.hasPermi('system:workCheck:edit')") //@PreAuthorize("@ss.hasPermi('system:workCheck:edit')")
@Log(title = "隐患排查任务", businessType = BusinessType.UPDATE) @Log(title = "隐患排查任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody THiddenTroubleWork tHiddenTroubleWork) public AjaxResult edit(@RequestBody THiddenTroubleWork tHiddenTroubleWork)
...@@ -97,7 +97,7 @@ public class THiddenTroubleWorkController extends BaseController ...@@ -97,7 +97,7 @@ public class THiddenTroubleWorkController extends BaseController
/** /**
* 删除隐患排查任务 * 删除隐患排查任务
*/ */
@PreAuthorize("@ss.hasPermi('system:workCheck:remove')") //@PreAuthorize("@ss.hasPermi('system:workCheck:remove')")
@Log(title = "隐患排查任务", businessType = BusinessType.DELETE) @Log(title = "隐患排查任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{workIds}") @DeleteMapping("/{workIds}")
public AjaxResult remove(@PathVariable Long[] workIds) public AjaxResult remove(@PathVariable Long[] workIds)
......
...@@ -36,7 +36,7 @@ public class TStaningBookController extends BaseController ...@@ -36,7 +36,7 @@ public class TStaningBookController extends BaseController
/** /**
* 查询隐患台账列表 * 查询隐患台账列表
*/ */
@PreAuthorize("@ss.hasPermi('system:book:list')") //@PreAuthorize("@ss.hasPermi('system:book:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TStaningBook tStaningBook) public TableDataInfo list(TStaningBook tStaningBook)
{ {
...@@ -48,7 +48,7 @@ public class TStaningBookController extends BaseController ...@@ -48,7 +48,7 @@ public class TStaningBookController extends BaseController
/** /**
* 导出隐患台账列表 * 导出隐患台账列表
*/ */
@PreAuthorize("@ss.hasPermi('system:book:export')") //@PreAuthorize("@ss.hasPermi('system:book:export')")
@Log(title = "隐患台账", businessType = BusinessType.EXPORT) @Log(title = "隐患台账", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TStaningBook tStaningBook) public AjaxResult export(TStaningBook tStaningBook)
...@@ -61,7 +61,7 @@ public class TStaningBookController extends BaseController ...@@ -61,7 +61,7 @@ public class TStaningBookController extends BaseController
/** /**
* 获取隐患台账详细信息 * 获取隐患台账详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:book:query')") //@PreAuthorize("@ss.hasPermi('system:book:query')")
@GetMapping(value = "/{bookId}") @GetMapping(value = "/{bookId}")
public AjaxResult getInfo(@PathVariable("bookId") Long bookId) public AjaxResult getInfo(@PathVariable("bookId") Long bookId)
{ {
...@@ -71,7 +71,7 @@ public class TStaningBookController extends BaseController ...@@ -71,7 +71,7 @@ public class TStaningBookController extends BaseController
/** /**
* 新增隐患台账 * 新增隐患台账
*/ */
@PreAuthorize("@ss.hasPermi('system:book:add')") //@PreAuthorize("@ss.hasPermi('system:book:add')")
@Log(title = "隐患台账", businessType = BusinessType.INSERT) @Log(title = "隐患台账", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TStaningBook tStaningBook) public AjaxResult add(@RequestBody TStaningBook tStaningBook)
...@@ -82,7 +82,7 @@ public class TStaningBookController extends BaseController ...@@ -82,7 +82,7 @@ public class TStaningBookController extends BaseController
/** /**
* 修改隐患台账 * 修改隐患台账
*/ */
@PreAuthorize("@ss.hasPermi('system:book:edit')") //@PreAuthorize("@ss.hasPermi('system:book:edit')")
@Log(title = "隐患台账", businessType = BusinessType.UPDATE) @Log(title = "隐患台账", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TStaningBook tStaningBook) public AjaxResult edit(@RequestBody TStaningBook tStaningBook)
...@@ -93,7 +93,7 @@ public class TStaningBookController extends BaseController ...@@ -93,7 +93,7 @@ public class TStaningBookController extends BaseController
/** /**
* 删除隐患台账 * 删除隐患台账
*/ */
@PreAuthorize("@ss.hasPermi('system:book:remove')") //@PreAuthorize("@ss.hasPermi('system:book:remove')")
@Log(title = "隐患台账", businessType = BusinessType.DELETE) @Log(title = "隐患台账", businessType = BusinessType.DELETE)
@DeleteMapping("/{bookIds}") @DeleteMapping("/{bookIds}")
public AjaxResult remove(@PathVariable Long[] bookIds) public AjaxResult remove(@PathVariable Long[] bookIds)
......
...@@ -27,7 +27,7 @@ public class CacheController ...@@ -27,7 +27,7 @@ public class CacheController
@Autowired @Autowired
private RedisTemplate<String, String> redisTemplate; private RedisTemplate<String, String> redisTemplate;
@PreAuthorize("@ss.hasPermi('monitor:cache:list')") //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping() @GetMapping()
public AjaxResult getInfo() throws Exception public AjaxResult getInfo() throws Exception
{ {
......
...@@ -16,7 +16,7 @@ import com.zehong.framework.web.domain.Server; ...@@ -16,7 +16,7 @@ import com.zehong.framework.web.domain.Server;
@RequestMapping("/monitor/server") @RequestMapping("/monitor/server")
public class ServerController public class ServerController
{ {
@PreAuthorize("@ss.hasPermi('monitor:server:list')") //@PreAuthorize("@ss.hasPermi('monitor:server:list')")
@GetMapping() @GetMapping()
public AjaxResult getInfo() throws Exception public AjaxResult getInfo() throws Exception
{ {
......
...@@ -29,7 +29,7 @@ public class SysLogininforController extends BaseController ...@@ -29,7 +29,7 @@ public class SysLogininforController extends BaseController
@Autowired @Autowired
private ISysLogininforService logininforService; private ISysLogininforService logininforService;
@PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") //@PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor) public TableDataInfo list(SysLogininfor logininfor)
{ {
...@@ -39,7 +39,7 @@ public class SysLogininforController extends BaseController ...@@ -39,7 +39,7 @@ public class SysLogininforController extends BaseController
} }
@Log(title = "登录日志", businessType = BusinessType.EXPORT) @Log(title = "登录日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") //@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysLogininfor logininfor) public AjaxResult export(SysLogininfor logininfor)
{ {
...@@ -48,7 +48,7 @@ public class SysLogininforController extends BaseController ...@@ -48,7 +48,7 @@ public class SysLogininforController extends BaseController
return util.exportExcel(list, "登录日志"); return util.exportExcel(list, "登录日志");
} }
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") //@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "登录日志", businessType = BusinessType.DELETE) @Log(title = "登录日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}") @DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds) public AjaxResult remove(@PathVariable Long[] infoIds)
...@@ -56,7 +56,7 @@ public class SysLogininforController extends BaseController ...@@ -56,7 +56,7 @@ public class SysLogininforController extends BaseController
return toAjax(logininforService.deleteLogininforByIds(infoIds)); return toAjax(logininforService.deleteLogininforByIds(infoIds));
} }
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") //@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "登录日志", businessType = BusinessType.CLEAN) @Log(title = "登录日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() public AjaxResult clean()
......
...@@ -29,7 +29,7 @@ public class SysOperlogController extends BaseController ...@@ -29,7 +29,7 @@ public class SysOperlogController extends BaseController
@Autowired @Autowired
private ISysOperLogService operLogService; private ISysOperLogService operLogService;
@PreAuthorize("@ss.hasPermi('monitor:operlog:list')") //@PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysOperLog operLog) public TableDataInfo list(SysOperLog operLog)
{ {
...@@ -39,7 +39,7 @@ public class SysOperlogController extends BaseController ...@@ -39,7 +39,7 @@ public class SysOperlogController extends BaseController
} }
@Log(title = "操作日志", businessType = BusinessType.EXPORT) @Log(title = "操作日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:operlog:export')") //@PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysOperLog operLog) public AjaxResult export(SysOperLog operLog)
{ {
...@@ -49,7 +49,7 @@ public class SysOperlogController extends BaseController ...@@ -49,7 +49,7 @@ public class SysOperlogController extends BaseController
} }
@Log(title = "操作日志", businessType = BusinessType.DELETE) @Log(title = "操作日志", businessType = BusinessType.DELETE)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") //@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/{operIds}") @DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds) public AjaxResult remove(@PathVariable Long[] operIds)
{ {
...@@ -57,7 +57,7 @@ public class SysOperlogController extends BaseController ...@@ -57,7 +57,7 @@ public class SysOperlogController extends BaseController
} }
@Log(title = "操作日志", businessType = BusinessType.CLEAN) @Log(title = "操作日志", businessType = BusinessType.CLEAN)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") //@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() public AjaxResult clean()
{ {
......
...@@ -38,7 +38,7 @@ public class SysUserOnlineController extends BaseController ...@@ -38,7 +38,7 @@ public class SysUserOnlineController extends BaseController
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@PreAuthorize("@ss.hasPermi('monitor:online:list')") //@PreAuthorize("@ss.hasPermi('monitor:online:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(String ipaddr, String userName) public TableDataInfo list(String ipaddr, String userName)
{ {
...@@ -81,7 +81,7 @@ public class SysUserOnlineController extends BaseController ...@@ -81,7 +81,7 @@ public class SysUserOnlineController extends BaseController
/** /**
* 强退用户 * 强退用户
*/ */
@PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')") //@PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
@Log(title = "在线用户", businessType = BusinessType.FORCE) @Log(title = "在线用户", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}") @DeleteMapping("/{tokenId}")
public AjaxResult forceLogout(@PathVariable String tokenId) public AjaxResult forceLogout(@PathVariable String tokenId)
......
...@@ -44,7 +44,7 @@ public class TInspectWorkInfoController extends BaseController ...@@ -44,7 +44,7 @@ public class TInspectWorkInfoController extends BaseController
/** /**
* 查询巡检任务信息列表 * 查询巡检任务信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:workinfo:list')") //@PreAuthorize("@ss.hasPermi('system:workinfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInspectWorkInfo tInspectWorkInfo) public TableDataInfo list(TInspectWorkInfo tInspectWorkInfo)
{ {
...@@ -77,7 +77,7 @@ public class TInspectWorkInfoController extends BaseController ...@@ -77,7 +77,7 @@ public class TInspectWorkInfoController extends BaseController
/** /**
* 导出巡检任务信息列表 * 导出巡检任务信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:workinfo:export')") //@PreAuthorize("@ss.hasPermi('system:workinfo:export')")
@Log(title = "巡检任务信息", businessType = BusinessType.EXPORT) @Log(title = "巡检任务信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInspectWorkInfo tInspectWorkInfo) public AjaxResult export(TInspectWorkInfo tInspectWorkInfo)
...@@ -90,7 +90,7 @@ public class TInspectWorkInfoController extends BaseController ...@@ -90,7 +90,7 @@ public class TInspectWorkInfoController extends BaseController
/** /**
* 获取巡检任务信息详细信息 * 获取巡检任务信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:workinfo:query')") //@PreAuthorize("@ss.hasPermi('system:workinfo:query')")
@GetMapping(value = "/{workId}") @GetMapping(value = "/{workId}")
public AjaxResult getInfo(@PathVariable("workId") Long workId) public AjaxResult getInfo(@PathVariable("workId") Long workId)
{ {
...@@ -100,7 +100,7 @@ public class TInspectWorkInfoController extends BaseController ...@@ -100,7 +100,7 @@ public class TInspectWorkInfoController extends BaseController
/** /**
* 新增巡检任务信息 * 新增巡检任务信息
*/ */
@PreAuthorize("@ss.hasPermi('system:workinfo:add')") //@PreAuthorize("@ss.hasPermi('system:workinfo:add')")
@Log(title = "巡检任务信息", businessType = BusinessType.INSERT) @Log(title = "巡检任务信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInspectWorkInfo tInspectWorkInfo) public AjaxResult add(@RequestBody TInspectWorkInfo tInspectWorkInfo)
...@@ -113,7 +113,7 @@ public class TInspectWorkInfoController extends BaseController ...@@ -113,7 +113,7 @@ public class TInspectWorkInfoController extends BaseController
/** /**
* 修改巡检任务信息 * 修改巡检任务信息
*/ */
@PreAuthorize("@ss.hasPermi('system:workinfo:edit')") //@PreAuthorize("@ss.hasPermi('system:workinfo:edit')")
@Log(title = "巡检任务信息", businessType = BusinessType.UPDATE) @Log(title = "巡检任务信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInspectWorkInfo tInspectWorkInfo) public AjaxResult edit(@RequestBody TInspectWorkInfo tInspectWorkInfo)
...@@ -124,7 +124,7 @@ public class TInspectWorkInfoController extends BaseController ...@@ -124,7 +124,7 @@ public class TInspectWorkInfoController extends BaseController
/** /**
* 删除巡检任务信息 * 删除巡检任务信息
*/ */
@PreAuthorize("@ss.hasPermi('system:workinfo:remove')") //@PreAuthorize("@ss.hasPermi('system:workinfo:remove')")
@Log(title = "巡检任务信息", businessType = BusinessType.DELETE) @Log(title = "巡检任务信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{workIds}") @DeleteMapping("/{workIds}")
public AjaxResult remove(@PathVariable Long[] workIds) public AjaxResult remove(@PathVariable Long[] workIds)
......
...@@ -36,7 +36,7 @@ public class TPatrolPositionController extends BaseController ...@@ -36,7 +36,7 @@ public class TPatrolPositionController extends BaseController
/** /**
* 查询巡检点列表 * 查询巡检点列表
*/ */
@PreAuthorize("@ss.hasPermi('system:position:list')") //@PreAuthorize("@ss.hasPermi('system:position:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPatrolPosition tPatrolPosition) public TableDataInfo list(TPatrolPosition tPatrolPosition)
{ {
...@@ -48,7 +48,7 @@ public class TPatrolPositionController extends BaseController ...@@ -48,7 +48,7 @@ public class TPatrolPositionController extends BaseController
/** /**
* 导出巡检点列表 * 导出巡检点列表
*/ */
@PreAuthorize("@ss.hasPermi('system:position:export')") //@PreAuthorize("@ss.hasPermi('system:position:export')")
@Log(title = "巡检点", businessType = BusinessType.EXPORT) @Log(title = "巡检点", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TPatrolPosition tPatrolPosition) public AjaxResult export(TPatrolPosition tPatrolPosition)
...@@ -61,7 +61,7 @@ public class TPatrolPositionController extends BaseController ...@@ -61,7 +61,7 @@ public class TPatrolPositionController extends BaseController
/** /**
* 获取巡检点详细信息 * 获取巡检点详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:position:query')") //@PreAuthorize("@ss.hasPermi('system:position:query')")
@GetMapping(value = "/{patrolId}") @GetMapping(value = "/{patrolId}")
public AjaxResult getInfo(@PathVariable("patrolId") Long patrolId) public AjaxResult getInfo(@PathVariable("patrolId") Long patrolId)
{ {
...@@ -79,7 +79,7 @@ public class TPatrolPositionController extends BaseController ...@@ -79,7 +79,7 @@ public class TPatrolPositionController extends BaseController
/** /**
* 新增巡检点 * 新增巡检点
*/ */
@PreAuthorize("@ss.hasPermi('system:position:add')") //@PreAuthorize("@ss.hasPermi('system:position:add')")
@Log(title = "巡检点", businessType = BusinessType.INSERT) @Log(title = "巡检点", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TPatrolPosition tPatrolPosition) public AjaxResult add(@RequestBody TPatrolPosition tPatrolPosition)
...@@ -90,7 +90,7 @@ public class TPatrolPositionController extends BaseController ...@@ -90,7 +90,7 @@ public class TPatrolPositionController extends BaseController
/** /**
* 修改巡检点 * 修改巡检点
*/ */
@PreAuthorize("@ss.hasPermi('system:position:edit')") //@PreAuthorize("@ss.hasPermi('system:position:edit')")
@Log(title = "巡检点", businessType = BusinessType.UPDATE) @Log(title = "巡检点", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TPatrolPosition tPatrolPosition) public AjaxResult edit(@RequestBody TPatrolPosition tPatrolPosition)
...@@ -101,7 +101,7 @@ public class TPatrolPositionController extends BaseController ...@@ -101,7 +101,7 @@ public class TPatrolPositionController extends BaseController
/** /**
* 删除巡检点 * 删除巡检点
*/ */
@PreAuthorize("@ss.hasPermi('system:position:remove')") //@PreAuthorize("@ss.hasPermi('system:position:remove')")
@Log(title = "巡检点", businessType = BusinessType.DELETE) @Log(title = "巡检点", businessType = BusinessType.DELETE)
@DeleteMapping("/{patrolIds}") @DeleteMapping("/{patrolIds}")
public AjaxResult remove(@PathVariable Long[] patrolIds) public AjaxResult remove(@PathVariable Long[] patrolIds)
......
...@@ -36,7 +36,7 @@ public class TEmergencyDrillController extends BaseController ...@@ -36,7 +36,7 @@ public class TEmergencyDrillController extends BaseController
/** /**
* 查询应急演练列表 * 查询应急演练列表
*/ */
@PreAuthorize("@ss.hasPermi('system:drill:list')") //@PreAuthorize("@ss.hasPermi('system:drill:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEmergencyDrill tEmergencyDrill) public TableDataInfo list(TEmergencyDrill tEmergencyDrill)
{ {
...@@ -48,7 +48,7 @@ public class TEmergencyDrillController extends BaseController ...@@ -48,7 +48,7 @@ public class TEmergencyDrillController extends BaseController
/** /**
* 导出应急演练列表 * 导出应急演练列表
*/ */
@PreAuthorize("@ss.hasPermi('system:drill:export')") //@PreAuthorize("@ss.hasPermi('system:drill:export')")
@Log(title = "应急演练", businessType = BusinessType.EXPORT) @Log(title = "应急演练", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TEmergencyDrill tEmergencyDrill) public AjaxResult export(TEmergencyDrill tEmergencyDrill)
...@@ -61,7 +61,7 @@ public class TEmergencyDrillController extends BaseController ...@@ -61,7 +61,7 @@ public class TEmergencyDrillController extends BaseController
/** /**
* 获取应急演练详细信息 * 获取应急演练详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:drill:query')") //@PreAuthorize("@ss.hasPermi('system:drill:query')")
@GetMapping(value = "/{drillId}") @GetMapping(value = "/{drillId}")
public AjaxResult getInfo(@PathVariable("drillId") Long drillId) public AjaxResult getInfo(@PathVariable("drillId") Long drillId)
{ {
...@@ -71,7 +71,7 @@ public class TEmergencyDrillController extends BaseController ...@@ -71,7 +71,7 @@ public class TEmergencyDrillController extends BaseController
/** /**
* 新增应急演练 * 新增应急演练
*/ */
@PreAuthorize("@ss.hasPermi('system:drill:add')") //@PreAuthorize("@ss.hasPermi('system:drill:add')")
@Log(title = "应急演练", businessType = BusinessType.INSERT) @Log(title = "应急演练", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TEmergencyDrill tEmergencyDrill) public AjaxResult add(@RequestBody TEmergencyDrill tEmergencyDrill)
...@@ -82,7 +82,7 @@ public class TEmergencyDrillController extends BaseController ...@@ -82,7 +82,7 @@ public class TEmergencyDrillController extends BaseController
/** /**
* 修改应急演练 * 修改应急演练
*/ */
@PreAuthorize("@ss.hasPermi('system:drill:edit')") //@PreAuthorize("@ss.hasPermi('system:drill:edit')")
@Log(title = "应急演练", businessType = BusinessType.UPDATE) @Log(title = "应急演练", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TEmergencyDrill tEmergencyDrill) public AjaxResult edit(@RequestBody TEmergencyDrill tEmergencyDrill)
...@@ -93,7 +93,7 @@ public class TEmergencyDrillController extends BaseController ...@@ -93,7 +93,7 @@ public class TEmergencyDrillController extends BaseController
/** /**
* 删除应急演练 * 删除应急演练
*/ */
@PreAuthorize("@ss.hasPermi('system:drill:remove')") //@PreAuthorize("@ss.hasPermi('system:drill:remove')")
@Log(title = "应急演练", businessType = BusinessType.DELETE) @Log(title = "应急演练", businessType = BusinessType.DELETE)
@DeleteMapping("/{drillIds}") @DeleteMapping("/{drillIds}")
public AjaxResult remove(@PathVariable Long[] drillIds) public AjaxResult remove(@PathVariable Long[] drillIds)
......
...@@ -36,7 +36,7 @@ public class TMaterialInfoController extends BaseController ...@@ -36,7 +36,7 @@ public class TMaterialInfoController extends BaseController
/** /**
* 查询应急物资管理列表 * 查询应急物资管理列表
*/ */
@PreAuthorize("@ss.hasPermi('system:info:list')") //@PreAuthorize("@ss.hasPermi('system:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TMaterialInfo tMaterialInfo) public TableDataInfo list(TMaterialInfo tMaterialInfo)
{ {
...@@ -48,7 +48,7 @@ public class TMaterialInfoController extends BaseController ...@@ -48,7 +48,7 @@ public class TMaterialInfoController extends BaseController
/** /**
* 导出应急物资管理列表 * 导出应急物资管理列表
*/ */
@PreAuthorize("@ss.hasPermi('system:info:export')") //@PreAuthorize("@ss.hasPermi('system:info:export')")
@Log(title = "应急物资管理", businessType = BusinessType.EXPORT) @Log(title = "应急物资管理", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TMaterialInfo tMaterialInfo) public AjaxResult export(TMaterialInfo tMaterialInfo)
...@@ -61,7 +61,7 @@ public class TMaterialInfoController extends BaseController ...@@ -61,7 +61,7 @@ public class TMaterialInfoController extends BaseController
/** /**
* 获取应急物资管理详细信息 * 获取应急物资管理详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:info:query')") //@PreAuthorize("@ss.hasPermi('system:info:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -71,7 +71,7 @@ public class TMaterialInfoController extends BaseController ...@@ -71,7 +71,7 @@ public class TMaterialInfoController extends BaseController
/** /**
* 新增应急物资管理 * 新增应急物资管理
*/ */
@PreAuthorize("@ss.hasPermi('system:info:add')") //@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "应急物资管理", businessType = BusinessType.INSERT) @Log(title = "应急物资管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TMaterialInfo tMaterialInfo) public AjaxResult add(@RequestBody TMaterialInfo tMaterialInfo)
...@@ -82,7 +82,7 @@ public class TMaterialInfoController extends BaseController ...@@ -82,7 +82,7 @@ public class TMaterialInfoController extends BaseController
/** /**
* 修改应急物资管理 * 修改应急物资管理
*/ */
@PreAuthorize("@ss.hasPermi('system:info:edit')") //@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "应急物资管理", businessType = BusinessType.UPDATE) @Log(title = "应急物资管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TMaterialInfo tMaterialInfo) public AjaxResult edit(@RequestBody TMaterialInfo tMaterialInfo)
...@@ -93,7 +93,7 @@ public class TMaterialInfoController extends BaseController ...@@ -93,7 +93,7 @@ public class TMaterialInfoController extends BaseController
/** /**
* 删除应急物资管理 * 删除应急物资管理
*/ */
@PreAuthorize("@ss.hasPermi('system:info:remove')") //@PreAuthorize("@ss.hasPermi('system:info:remove')")
@Log(title = "应急物资管理", businessType = BusinessType.DELETE) @Log(title = "应急物资管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
......
...@@ -35,7 +35,7 @@ public class TPlanInfoController extends BaseController ...@@ -35,7 +35,7 @@ public class TPlanInfoController extends BaseController
/** /**
* 查询预案管理列表 * 查询预案管理列表
*/ */
@PreAuthorize("@ss.hasPermi('plan:reservePlan:list')") //@PreAuthorize("@ss.hasPermi('plan:reservePlan:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPlanInfo tPlanInfo) public TableDataInfo list(TPlanInfo tPlanInfo)
{ {
...@@ -47,7 +47,7 @@ public class TPlanInfoController extends BaseController ...@@ -47,7 +47,7 @@ public class TPlanInfoController extends BaseController
/** /**
* 导出预案管理列表 * 导出预案管理列表
*/ */
@PreAuthorize("@ss.hasPermi('plan:reservePlan:export')") //@PreAuthorize("@ss.hasPermi('plan:reservePlan:export')")
@Log(title = "应急处置方案", businessType = BusinessType.EXPORT) @Log(title = "应急处置方案", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TPlanInfo tPlanInfo) public AjaxResult export(TPlanInfo tPlanInfo)
...@@ -60,7 +60,7 @@ public class TPlanInfoController extends BaseController ...@@ -60,7 +60,7 @@ public class TPlanInfoController extends BaseController
/** /**
* 获取预案管理详细信息 * 获取预案管理详细信息
*/ */
@PreAuthorize("@ss.hasPermi('plan:reservePlan:query')") //@PreAuthorize("@ss.hasPermi('plan:reservePlan:query')")
@GetMapping(value = "/{planId}") @GetMapping(value = "/{planId}")
public AjaxResult getInfo(@PathVariable("planId") Long planId) public AjaxResult getInfo(@PathVariable("planId") Long planId)
{ {
...@@ -70,7 +70,7 @@ public class TPlanInfoController extends BaseController ...@@ -70,7 +70,7 @@ public class TPlanInfoController extends BaseController
/** /**
* 新增预案管理 * 新增预案管理
*/ */
@PreAuthorize("@ss.hasPermi('plan:reservePlan:add')") //@PreAuthorize("@ss.hasPermi('plan:reservePlan:add')")
@Log(title = "应急处置方案", businessType = BusinessType.INSERT) @Log(title = "应急处置方案", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TPlanInfo tPlanInfo) public AjaxResult add(@RequestBody TPlanInfo tPlanInfo)
...@@ -83,7 +83,7 @@ public class TPlanInfoController extends BaseController ...@@ -83,7 +83,7 @@ public class TPlanInfoController extends BaseController
/** /**
* 修改预案管理 * 修改预案管理
*/ */
@PreAuthorize("@ss.hasPermi('plan:reservePlan:edit')") //@PreAuthorize("@ss.hasPermi('plan:reservePlan:edit')")
@Log(title = "应急处置方案", businessType = BusinessType.UPDATE) @Log(title = "应急处置方案", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TPlanInfo tPlanInfo) public AjaxResult edit(@RequestBody TPlanInfo tPlanInfo)
...@@ -96,7 +96,7 @@ public class TPlanInfoController extends BaseController ...@@ -96,7 +96,7 @@ public class TPlanInfoController extends BaseController
/** /**
* 删除预案管理 * 删除预案管理
*/ */
@PreAuthorize("@ss.hasPermi('plan:reservePlan:remove')") //@PreAuthorize("@ss.hasPermi('plan:reservePlan:remove')")
@Log(title = "应急处置方案", businessType = BusinessType.DELETE) @Log(title = "应急处置方案", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}") @DeleteMapping("/{planIds}")
public AjaxResult remove(@PathVariable Long[] planIds) public AjaxResult remove(@PathVariable Long[] planIds)
......
...@@ -35,7 +35,7 @@ public class TRiskManagerController extends BaseController ...@@ -35,7 +35,7 @@ public class TRiskManagerController extends BaseController
/** /**
* 查询【请填写功能名称】列表 * 查询【请填写功能名称】列表
*/ */
// @PreAuthorize("@ss.hasPermi('system:manager:list')") // //@PreAuthorize("@ss.hasPermi('system:manager:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TRiskManager tRiskManager) public TableDataInfo list(TRiskManager tRiskManager)
{ {
...@@ -47,7 +47,7 @@ public class TRiskManagerController extends BaseController ...@@ -47,7 +47,7 @@ public class TRiskManagerController extends BaseController
/** /**
* 导出【请填写功能名称】列表 * 导出【请填写功能名称】列表
*/ */
// @PreAuthorize("@ss.hasPermi('system:manager:export')") // //@PreAuthorize("@ss.hasPermi('system:manager:export')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TRiskManager tRiskManager) public AjaxResult export(TRiskManager tRiskManager)
...@@ -60,7 +60,7 @@ public class TRiskManagerController extends BaseController ...@@ -60,7 +60,7 @@ public class TRiskManagerController extends BaseController
/** /**
* 获取【请填写功能名称】详细信息 * 获取【请填写功能名称】详细信息
*/ */
// @PreAuthorize("@ss.hasPermi('system:manager:query')") // //@PreAuthorize("@ss.hasPermi('system:manager:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -70,7 +70,7 @@ public class TRiskManagerController extends BaseController ...@@ -70,7 +70,7 @@ public class TRiskManagerController extends BaseController
/** /**
* 新增【请填写功能名称】 * 新增【请填写功能名称】
*/ */
// @PreAuthorize("@ss.hasPermi('system:manager:add')") // //@PreAuthorize("@ss.hasPermi('system:manager:add')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TRiskManager tRiskManager) public AjaxResult add(@RequestBody TRiskManager tRiskManager)
...@@ -81,7 +81,7 @@ public class TRiskManagerController extends BaseController ...@@ -81,7 +81,7 @@ public class TRiskManagerController extends BaseController
/** /**
* 修改【请填写功能名称】 * 修改【请填写功能名称】
*/ */
// @PreAuthorize("@ss.hasPermi('system:manager:edit')") // //@PreAuthorize("@ss.hasPermi('system:manager:edit')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TRiskManager tRiskManager) public AjaxResult edit(@RequestBody TRiskManager tRiskManager)
...@@ -92,7 +92,7 @@ public class TRiskManagerController extends BaseController ...@@ -92,7 +92,7 @@ public class TRiskManagerController extends BaseController
/** /**
* 删除【请填写功能名称】 * 删除【请填写功能名称】
*/ */
// @PreAuthorize("@ss.hasPermi('system:manager:remove')") // //@PreAuthorize("@ss.hasPermi('system:manager:remove')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
......
...@@ -36,7 +36,7 @@ public class TEnterpriseCertificateController extends BaseController ...@@ -36,7 +36,7 @@ public class TEnterpriseCertificateController extends BaseController
/** /**
* 查询企业资质证照管理列表 * 查询企业资质证照管理列表
*/ */
@PreAuthorize("@ss.hasPermi('safetyManagement:enterpriseCertificate:list')") //@PreAuthorize("@ss.hasPermi('safetyManagement:enterpriseCertificate:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEnterpriseCertificate tEnterpriseCertificate) public TableDataInfo list(TEnterpriseCertificate tEnterpriseCertificate)
{ {
......
...@@ -36,7 +36,7 @@ public class TEnterpriseInfoController extends BaseController ...@@ -36,7 +36,7 @@ public class TEnterpriseInfoController extends BaseController
/** /**
* 查询企业基础信息管理列表 * 查询企业基础信息管理列表
*/ */
@PreAuthorize("@ss.hasPermi('safetyManagement:enterpriseInfo:list')") //@PreAuthorize("@ss.hasPermi('safetyManagement:enterpriseInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEnterpriseInfo tEnterpriseInfo) public TableDataInfo list(TEnterpriseInfo tEnterpriseInfo)
{ {
......
...@@ -36,7 +36,7 @@ public class TEnterpriseSystemController extends BaseController ...@@ -36,7 +36,7 @@ public class TEnterpriseSystemController extends BaseController
/** /**
* 查询企业制度管理列表 * 查询企业制度管理列表
*/ */
@PreAuthorize("@ss.hasPermi('safetyManagement:enterpriseSystem:list')") //@PreAuthorize("@ss.hasPermi('safetyManagement:enterpriseSystem:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEnterpriseSystem tEnterpriseSystem) public TableDataInfo list(TEnterpriseSystem tEnterpriseSystem)
{ {
......
...@@ -36,7 +36,7 @@ public class TInvestmentController extends BaseController ...@@ -36,7 +36,7 @@ public class TInvestmentController extends BaseController
/** /**
* 查询投入台账列表 * 查询投入台账列表
*/ */
@PreAuthorize("@ss.hasPermi('safetyManagement:investment:list')") //@PreAuthorize("@ss.hasPermi('safetyManagement:investment:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInvestment tInvestment) public TableDataInfo list(TInvestment tInvestment)
{ {
......
...@@ -50,7 +50,7 @@ public class TStaffController extends BaseController ...@@ -50,7 +50,7 @@ public class TStaffController extends BaseController
/** /**
* 查询员工信息管理列表 * 查询员工信息管理列表
*/ */
@PreAuthorize("@ss.hasPermi('safetyManagement:staff:list')") //@PreAuthorize("@ss.hasPermi('safetyManagement:staff:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TStaffForm tStaff) public TableDataInfo list(TStaffForm tStaff)
{ {
......
...@@ -39,7 +39,7 @@ public class SysConfigController extends BaseController ...@@ -39,7 +39,7 @@ public class SysConfigController extends BaseController
/** /**
* 获取参数配置列表 * 获取参数配置列表
*/ */
@PreAuthorize("@ss.hasPermi('system:config:list')") //@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysConfig config) public TableDataInfo list(SysConfig config)
{ {
...@@ -49,7 +49,7 @@ public class SysConfigController extends BaseController ...@@ -49,7 +49,7 @@ public class SysConfigController extends BaseController
} }
@Log(title = "参数管理", businessType = BusinessType.EXPORT) @Log(title = "参数管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:config:export')") //@PreAuthorize("@ss.hasPermi('system:config:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysConfig config) public AjaxResult export(SysConfig config)
{ {
...@@ -61,7 +61,7 @@ public class SysConfigController extends BaseController ...@@ -61,7 +61,7 @@ public class SysConfigController extends BaseController
/** /**
* 根据参数编号获取详细信息 * 根据参数编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:config:query')") //@PreAuthorize("@ss.hasPermi('system:config:query')")
@GetMapping(value = "/{configId}") @GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long configId) public AjaxResult getInfo(@PathVariable Long configId)
{ {
...@@ -80,7 +80,7 @@ public class SysConfigController extends BaseController ...@@ -80,7 +80,7 @@ public class SysConfigController extends BaseController
/** /**
* 新增参数配置 * 新增参数配置
*/ */
@PreAuthorize("@ss.hasPermi('system:config:add')") //@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "参数管理", businessType = BusinessType.INSERT) @Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@RepeatSubmit @RepeatSubmit
...@@ -97,7 +97,7 @@ public class SysConfigController extends BaseController ...@@ -97,7 +97,7 @@ public class SysConfigController extends BaseController
/** /**
* 修改参数配置 * 修改参数配置
*/ */
@PreAuthorize("@ss.hasPermi('system:config:edit')") //@PreAuthorize("@ss.hasPermi('system:config:edit')")
@Log(title = "参数管理", businessType = BusinessType.UPDATE) @Log(title = "参数管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysConfig config) public AjaxResult edit(@Validated @RequestBody SysConfig config)
...@@ -113,7 +113,7 @@ public class SysConfigController extends BaseController ...@@ -113,7 +113,7 @@ public class SysConfigController extends BaseController
/** /**
* 删除参数配置 * 删除参数配置
*/ */
@PreAuthorize("@ss.hasPermi('system:config:remove')") //@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "参数管理", businessType = BusinessType.DELETE) @Log(title = "参数管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}") @DeleteMapping("/{configIds}")
public AjaxResult remove(@PathVariable Long[] configIds) public AjaxResult remove(@PathVariable Long[] configIds)
...@@ -125,7 +125,7 @@ public class SysConfigController extends BaseController ...@@ -125,7 +125,7 @@ public class SysConfigController extends BaseController
/** /**
* 刷新参数缓存 * 刷新参数缓存
*/ */
@PreAuthorize("@ss.hasPermi('system:config:remove')") //@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "参数管理", businessType = BusinessType.CLEAN) @Log(title = "参数管理", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache") @DeleteMapping("/refreshCache")
public AjaxResult refreshCache() public AjaxResult refreshCache()
......
...@@ -39,7 +39,7 @@ public class SysDeptController extends BaseController ...@@ -39,7 +39,7 @@ public class SysDeptController extends BaseController
/** /**
* 获取部门列表 * 获取部门列表
*/ */
@PreAuthorize("@ss.hasPermi('system:dept:list')") //@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysDept dept) public AjaxResult list(SysDept dept)
{ {
...@@ -50,7 +50,7 @@ public class SysDeptController extends BaseController ...@@ -50,7 +50,7 @@ public class SysDeptController extends BaseController
/** /**
* 查询部门列表(排除节点) * 查询部门列表(排除节点)
*/ */
@PreAuthorize("@ss.hasPermi('system:dept:list')") //@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list/exclude/{deptId}") @GetMapping("/list/exclude/{deptId}")
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{ {
...@@ -71,7 +71,7 @@ public class SysDeptController extends BaseController ...@@ -71,7 +71,7 @@ public class SysDeptController extends BaseController
/** /**
* 根据部门编号获取详细信息 * 根据部门编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:dept:query')") //@PreAuthorize("@ss.hasPermi('system:dept:query')")
@GetMapping(value = "/{deptId}") @GetMapping(value = "/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId) public AjaxResult getInfo(@PathVariable Long deptId)
{ {
...@@ -104,7 +104,7 @@ public class SysDeptController extends BaseController ...@@ -104,7 +104,7 @@ public class SysDeptController extends BaseController
/** /**
* 新增部门 * 新增部门
*/ */
@PreAuthorize("@ss.hasPermi('system:dept:add')") //@PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "部门管理", businessType = BusinessType.INSERT) @Log(title = "部门管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept) public AjaxResult add(@Validated @RequestBody SysDept dept)
...@@ -120,7 +120,7 @@ public class SysDeptController extends BaseController ...@@ -120,7 +120,7 @@ public class SysDeptController extends BaseController
/** /**
* 修改部门 * 修改部门
*/ */
@PreAuthorize("@ss.hasPermi('system:dept:edit')") //@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "部门管理", businessType = BusinessType.UPDATE) @Log(title = "部门管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysDept dept) public AjaxResult edit(@Validated @RequestBody SysDept dept)
...@@ -145,7 +145,7 @@ public class SysDeptController extends BaseController ...@@ -145,7 +145,7 @@ public class SysDeptController extends BaseController
/** /**
* 删除部门 * 删除部门
*/ */
@PreAuthorize("@ss.hasPermi('system:dept:remove')") //@PreAuthorize("@ss.hasPermi('system:dept:remove')")
@Log(title = "部门管理", businessType = BusinessType.DELETE) @Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}") @DeleteMapping("/{deptId}")
public AjaxResult remove(@PathVariable Long deptId) public AjaxResult remove(@PathVariable Long deptId)
......
...@@ -40,7 +40,7 @@ public class SysDictDataController extends BaseController ...@@ -40,7 +40,7 @@ public class SysDictDataController extends BaseController
@Autowired @Autowired
private ISysDictTypeService dictTypeService; private ISysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')") //@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysDictData dictData) public TableDataInfo list(SysDictData dictData)
{ {
...@@ -50,7 +50,7 @@ public class SysDictDataController extends BaseController ...@@ -50,7 +50,7 @@ public class SysDictDataController extends BaseController
} }
@Log(title = "字典数据", businessType = BusinessType.EXPORT) @Log(title = "字典数据", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')") //@PreAuthorize("@ss.hasPermi('system:dict:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysDictData dictData) public AjaxResult export(SysDictData dictData)
{ {
...@@ -62,7 +62,7 @@ public class SysDictDataController extends BaseController ...@@ -62,7 +62,7 @@ public class SysDictDataController extends BaseController
/** /**
* 查询字典数据详细 * 查询字典数据详细
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:query')") //@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictCode}") @GetMapping(value = "/{dictCode}")
public AjaxResult getInfo(@PathVariable Long dictCode) public AjaxResult getInfo(@PathVariable Long dictCode)
{ {
...@@ -86,7 +86,7 @@ public class SysDictDataController extends BaseController ...@@ -86,7 +86,7 @@ public class SysDictDataController extends BaseController
/** /**
* 新增字典类型 * 新增字典类型
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:add')") //@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "字典数据", businessType = BusinessType.INSERT) @Log(title = "字典数据", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysDictData dict) public AjaxResult add(@Validated @RequestBody SysDictData dict)
...@@ -98,7 +98,7 @@ public class SysDictDataController extends BaseController ...@@ -98,7 +98,7 @@ public class SysDictDataController extends BaseController
/** /**
* 修改保存字典类型 * 修改保存字典类型
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:edit')") //@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "字典数据", businessType = BusinessType.UPDATE) @Log(title = "字典数据", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictData dict) public AjaxResult edit(@Validated @RequestBody SysDictData dict)
...@@ -110,7 +110,7 @@ public class SysDictDataController extends BaseController ...@@ -110,7 +110,7 @@ public class SysDictDataController extends BaseController
/** /**
* 删除字典类型 * 删除字典类型
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:remove')") //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}") @DeleteMapping("/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes) public AjaxResult remove(@PathVariable Long[] dictCodes)
......
...@@ -35,7 +35,7 @@ public class SysDictTypeController extends BaseController ...@@ -35,7 +35,7 @@ public class SysDictTypeController extends BaseController
@Autowired @Autowired
private ISysDictTypeService dictTypeService; private ISysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')") //@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysDictType dictType) public TableDataInfo list(SysDictType dictType)
{ {
...@@ -45,7 +45,7 @@ public class SysDictTypeController extends BaseController ...@@ -45,7 +45,7 @@ public class SysDictTypeController extends BaseController
} }
@Log(title = "字典类型", businessType = BusinessType.EXPORT) @Log(title = "字典类型", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')") //@PreAuthorize("@ss.hasPermi('system:dict:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysDictType dictType) public AjaxResult export(SysDictType dictType)
{ {
...@@ -57,7 +57,7 @@ public class SysDictTypeController extends BaseController ...@@ -57,7 +57,7 @@ public class SysDictTypeController extends BaseController
/** /**
* 查询字典类型详细 * 查询字典类型详细
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:query')") //@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictId}") @GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId) public AjaxResult getInfo(@PathVariable Long dictId)
{ {
...@@ -67,7 +67,7 @@ public class SysDictTypeController extends BaseController ...@@ -67,7 +67,7 @@ public class SysDictTypeController extends BaseController
/** /**
* 新增字典类型 * 新增字典类型
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:add')") //@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "字典类型", businessType = BusinessType.INSERT) @Log(title = "字典类型", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysDictType dict) public AjaxResult add(@Validated @RequestBody SysDictType dict)
...@@ -83,7 +83,7 @@ public class SysDictTypeController extends BaseController ...@@ -83,7 +83,7 @@ public class SysDictTypeController extends BaseController
/** /**
* 修改字典类型 * 修改字典类型
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:edit')") //@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "字典类型", businessType = BusinessType.UPDATE) @Log(title = "字典类型", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictType dict) public AjaxResult edit(@Validated @RequestBody SysDictType dict)
...@@ -99,7 +99,7 @@ public class SysDictTypeController extends BaseController ...@@ -99,7 +99,7 @@ public class SysDictTypeController extends BaseController
/** /**
* 删除字典类型 * 删除字典类型
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:remove')") //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}") @DeleteMapping("/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds) public AjaxResult remove(@PathVariable Long[] dictIds)
...@@ -111,7 +111,7 @@ public class SysDictTypeController extends BaseController ...@@ -111,7 +111,7 @@ public class SysDictTypeController extends BaseController
/** /**
* 刷新字典缓存 * 刷新字典缓存
*/ */
@PreAuthorize("@ss.hasPermi('system:dict:remove')") //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "字典类型", businessType = BusinessType.CLEAN) @Log(title = "字典类型", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache") @DeleteMapping("/refreshCache")
public AjaxResult refreshCache() public AjaxResult refreshCache()
......
...@@ -44,7 +44,7 @@ public class SysMenuController extends BaseController ...@@ -44,7 +44,7 @@ public class SysMenuController extends BaseController
/** /**
* 获取菜单列表 * 获取菜单列表
*/ */
@PreAuthorize("@ss.hasPermi('system:menu:list')") //@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysMenu menu) public AjaxResult list(SysMenu menu)
{ {
...@@ -57,7 +57,7 @@ public class SysMenuController extends BaseController ...@@ -57,7 +57,7 @@ public class SysMenuController extends BaseController
/** /**
* 根据菜单编号获取详细信息 * 根据菜单编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:menu:query')") //@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}") @GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId) public AjaxResult getInfo(@PathVariable Long menuId)
{ {
...@@ -93,7 +93,7 @@ public class SysMenuController extends BaseController ...@@ -93,7 +93,7 @@ public class SysMenuController extends BaseController
/** /**
* 新增菜单 * 新增菜单
*/ */
@PreAuthorize("@ss.hasPermi('system:menu:add')") //@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "菜单管理", businessType = BusinessType.INSERT) @Log(title = "菜单管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysMenu menu) public AjaxResult add(@Validated @RequestBody SysMenu menu)
...@@ -114,7 +114,7 @@ public class SysMenuController extends BaseController ...@@ -114,7 +114,7 @@ public class SysMenuController extends BaseController
/** /**
* 修改菜单 * 修改菜单
*/ */
@PreAuthorize("@ss.hasPermi('system:menu:edit')") //@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "菜单管理", businessType = BusinessType.UPDATE) @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysMenu menu) public AjaxResult edit(@Validated @RequestBody SysMenu menu)
...@@ -139,7 +139,7 @@ public class SysMenuController extends BaseController ...@@ -139,7 +139,7 @@ public class SysMenuController extends BaseController
/** /**
* 删除菜单 * 删除菜单
*/ */
@PreAuthorize("@ss.hasPermi('system:menu:remove')") //@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "菜单管理", businessType = BusinessType.DELETE) @Log(title = "菜单管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}") @DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId) public AjaxResult remove(@PathVariable("menuId") Long menuId)
......
...@@ -36,7 +36,7 @@ public class SysNoticeController extends BaseController ...@@ -36,7 +36,7 @@ public class SysNoticeController extends BaseController
/** /**
* 获取通知公告列表 * 获取通知公告列表
*/ */
@PreAuthorize("@ss.hasPermi('system:notice:list')") //@PreAuthorize("@ss.hasPermi('system:notice:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysNotice notice) public TableDataInfo list(SysNotice notice)
{ {
...@@ -48,7 +48,7 @@ public class SysNoticeController extends BaseController ...@@ -48,7 +48,7 @@ public class SysNoticeController extends BaseController
/** /**
* 根据通知公告编号获取详细信息 * 根据通知公告编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:notice:query')") //@PreAuthorize("@ss.hasPermi('system:notice:query')")
@GetMapping(value = "/{noticeId}") @GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId) public AjaxResult getInfo(@PathVariable Long noticeId)
{ {
...@@ -58,7 +58,7 @@ public class SysNoticeController extends BaseController ...@@ -58,7 +58,7 @@ public class SysNoticeController extends BaseController
/** /**
* 新增通知公告 * 新增通知公告
*/ */
@PreAuthorize("@ss.hasPermi('system:notice:add')") //@PreAuthorize("@ss.hasPermi('system:notice:add')")
@Log(title = "通知公告", businessType = BusinessType.INSERT) @Log(title = "通知公告", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysNotice notice) public AjaxResult add(@Validated @RequestBody SysNotice notice)
...@@ -70,7 +70,7 @@ public class SysNoticeController extends BaseController ...@@ -70,7 +70,7 @@ public class SysNoticeController extends BaseController
/** /**
* 修改通知公告 * 修改通知公告
*/ */
@PreAuthorize("@ss.hasPermi('system:notice:edit')") //@PreAuthorize("@ss.hasPermi('system:notice:edit')")
@Log(title = "通知公告", businessType = BusinessType.UPDATE) @Log(title = "通知公告", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysNotice notice) public AjaxResult edit(@Validated @RequestBody SysNotice notice)
...@@ -82,7 +82,7 @@ public class SysNoticeController extends BaseController ...@@ -82,7 +82,7 @@ public class SysNoticeController extends BaseController
/** /**
* 删除通知公告 * 删除通知公告
*/ */
@PreAuthorize("@ss.hasPermi('system:notice:remove')") //@PreAuthorize("@ss.hasPermi('system:notice:remove')")
@Log(title = "通知公告", businessType = BusinessType.DELETE) @Log(title = "通知公告", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}") @DeleteMapping("/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds) public AjaxResult remove(@PathVariable Long[] noticeIds)
......
...@@ -38,7 +38,7 @@ public class SysPostController extends BaseController ...@@ -38,7 +38,7 @@ public class SysPostController extends BaseController
/** /**
* 获取岗位列表 * 获取岗位列表
*/ */
@PreAuthorize("@ss.hasPermi('system:post:list')") //@PreAuthorize("@ss.hasPermi('system:post:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysPost post) public TableDataInfo list(SysPost post)
{ {
...@@ -48,7 +48,7 @@ public class SysPostController extends BaseController ...@@ -48,7 +48,7 @@ public class SysPostController extends BaseController
} }
@Log(title = "岗位管理", businessType = BusinessType.EXPORT) @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:post:export')") //@PreAuthorize("@ss.hasPermi('system:post:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysPost post) public AjaxResult export(SysPost post)
{ {
...@@ -60,7 +60,7 @@ public class SysPostController extends BaseController ...@@ -60,7 +60,7 @@ public class SysPostController extends BaseController
/** /**
* 根据岗位编号获取详细信息 * 根据岗位编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:post:query')") //@PreAuthorize("@ss.hasPermi('system:post:query')")
@GetMapping(value = "/{postId}") @GetMapping(value = "/{postId}")
public AjaxResult getInfo(@PathVariable Long postId) public AjaxResult getInfo(@PathVariable Long postId)
{ {
...@@ -70,7 +70,7 @@ public class SysPostController extends BaseController ...@@ -70,7 +70,7 @@ public class SysPostController extends BaseController
/** /**
* 新增岗位 * 新增岗位
*/ */
@PreAuthorize("@ss.hasPermi('system:post:add')") //@PreAuthorize("@ss.hasPermi('system:post:add')")
@Log(title = "岗位管理", businessType = BusinessType.INSERT) @Log(title = "岗位管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysPost post) public AjaxResult add(@Validated @RequestBody SysPost post)
...@@ -90,7 +90,7 @@ public class SysPostController extends BaseController ...@@ -90,7 +90,7 @@ public class SysPostController extends BaseController
/** /**
* 修改岗位 * 修改岗位
*/ */
@PreAuthorize("@ss.hasPermi('system:post:edit')") //@PreAuthorize("@ss.hasPermi('system:post:edit')")
@Log(title = "岗位管理", businessType = BusinessType.UPDATE) @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysPost post) public AjaxResult edit(@Validated @RequestBody SysPost post)
...@@ -110,7 +110,7 @@ public class SysPostController extends BaseController ...@@ -110,7 +110,7 @@ public class SysPostController extends BaseController
/** /**
* 删除岗位 * 删除岗位
*/ */
@PreAuthorize("@ss.hasPermi('system:post:remove')") //@PreAuthorize("@ss.hasPermi('system:post:remove')")
@Log(title = "岗位管理", businessType = BusinessType.DELETE) @Log(title = "岗位管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}") @DeleteMapping("/{postIds}")
public AjaxResult remove(@PathVariable Long[] postIds) public AjaxResult remove(@PathVariable Long[] postIds)
......
...@@ -50,7 +50,7 @@ public class SysRoleController extends BaseController ...@@ -50,7 +50,7 @@ public class SysRoleController extends BaseController
@Autowired @Autowired
private ISysUserService userService; private ISysUserService userService;
@PreAuthorize("@ss.hasPermi('system:role:list')") //@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysRole role) public TableDataInfo list(SysRole role)
{ {
...@@ -60,7 +60,7 @@ public class SysRoleController extends BaseController ...@@ -60,7 +60,7 @@ public class SysRoleController extends BaseController
} }
@Log(title = "角色管理", businessType = BusinessType.EXPORT) @Log(title = "角色管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:role:export')") //@PreAuthorize("@ss.hasPermi('system:role:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysRole role) public AjaxResult export(SysRole role)
{ {
...@@ -72,7 +72,7 @@ public class SysRoleController extends BaseController ...@@ -72,7 +72,7 @@ public class SysRoleController extends BaseController
/** /**
* 根据角色编号获取详细信息 * 根据角色编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:role:query')") //@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/{roleId}") @GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId) public AjaxResult getInfo(@PathVariable Long roleId)
{ {
...@@ -82,7 +82,7 @@ public class SysRoleController extends BaseController ...@@ -82,7 +82,7 @@ public class SysRoleController extends BaseController
/** /**
* 新增角色 * 新增角色
*/ */
@PreAuthorize("@ss.hasPermi('system:role:add')") //@PreAuthorize("@ss.hasPermi('system:role:add')")
@Log(title = "角色管理", businessType = BusinessType.INSERT) @Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysRole role) public AjaxResult add(@Validated @RequestBody SysRole role)
...@@ -103,7 +103,7 @@ public class SysRoleController extends BaseController ...@@ -103,7 +103,7 @@ public class SysRoleController extends BaseController
/** /**
* 修改保存角色 * 修改保存角色
*/ */
@PreAuthorize("@ss.hasPermi('system:role:edit')") //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysRole role) public AjaxResult edit(@Validated @RequestBody SysRole role)
...@@ -137,7 +137,7 @@ public class SysRoleController extends BaseController ...@@ -137,7 +137,7 @@ public class SysRoleController extends BaseController
/** /**
* 修改保存数据权限 * 修改保存数据权限
*/ */
@PreAuthorize("@ss.hasPermi('system:role:edit')") //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope") @PutMapping("/dataScope")
public AjaxResult dataScope(@RequestBody SysRole role) public AjaxResult dataScope(@RequestBody SysRole role)
...@@ -149,7 +149,7 @@ public class SysRoleController extends BaseController ...@@ -149,7 +149,7 @@ public class SysRoleController extends BaseController
/** /**
* 状态修改 * 状态修改
*/ */
@PreAuthorize("@ss.hasPermi('system:role:edit')") //@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role) public AjaxResult changeStatus(@RequestBody SysRole role)
...@@ -162,7 +162,7 @@ public class SysRoleController extends BaseController ...@@ -162,7 +162,7 @@ public class SysRoleController extends BaseController
/** /**
* 删除角色 * 删除角色
*/ */
@PreAuthorize("@ss.hasPermi('system:role:remove')") //@PreAuthorize("@ss.hasPermi('system:role:remove')")
@Log(title = "角色管理", businessType = BusinessType.DELETE) @Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}") @DeleteMapping("/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds) public AjaxResult remove(@PathVariable Long[] roleIds)
...@@ -173,7 +173,7 @@ public class SysRoleController extends BaseController ...@@ -173,7 +173,7 @@ public class SysRoleController extends BaseController
/** /**
* 获取角色选择框列表 * 获取角色选择框列表
*/ */
@PreAuthorize("@ss.hasPermi('system:role:query')") //@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect() public AjaxResult optionselect()
{ {
......
...@@ -41,7 +41,7 @@ public class SysSettingController extends BaseController ...@@ -41,7 +41,7 @@ public class SysSettingController extends BaseController
/** /**
* 查询系统参数配置列表 * 查询系统参数配置列表
*/ */
@PreAuthorize("@ss.hasPermi('system:setting:list')") //@PreAuthorize("@ss.hasPermi('system:setting:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysSetting sysSetting) public TableDataInfo list(SysSetting sysSetting)
{ {
...@@ -53,7 +53,7 @@ public class SysSettingController extends BaseController ...@@ -53,7 +53,7 @@ public class SysSettingController extends BaseController
/** /**
* 导出系统参数配置列表 * 导出系统参数配置列表
*/ */
@PreAuthorize("@ss.hasPermi('system:setting:export')") //@PreAuthorize("@ss.hasPermi('system:setting:export')")
@Log(title = "系统参数配置", businessType = BusinessType.EXPORT) @Log(title = "系统参数配置", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysSetting sysSetting) public AjaxResult export(SysSetting sysSetting)
...@@ -66,7 +66,7 @@ public class SysSettingController extends BaseController ...@@ -66,7 +66,7 @@ public class SysSettingController extends BaseController
/** /**
* 获取系统参数配置详细信息 * 获取系统参数配置详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:setting:query')") //@PreAuthorize("@ss.hasPermi('system:setting:query')")
@GetMapping(value = "/{systemId}") @GetMapping(value = "/{systemId}")
public AjaxResult getInfo(@PathVariable("systemId") Integer systemId) public AjaxResult getInfo(@PathVariable("systemId") Integer systemId)
{ {
...@@ -76,7 +76,7 @@ public class SysSettingController extends BaseController ...@@ -76,7 +76,7 @@ public class SysSettingController extends BaseController
/** /**
* 新增系统参数配置 * 新增系统参数配置
*/ */
@PreAuthorize("@ss.hasPermi('system:setting:add')") //@PreAuthorize("@ss.hasPermi('system:setting:add')")
@Log(title = "系统参数配置", businessType = BusinessType.INSERT) @Log(title = "系统参数配置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SysSetting sysSetting) public AjaxResult add(@RequestBody SysSetting sysSetting)
...@@ -87,7 +87,7 @@ public class SysSettingController extends BaseController ...@@ -87,7 +87,7 @@ public class SysSettingController extends BaseController
/** /**
* 修改系统参数配置 * 修改系统参数配置
*/ */
@PreAuthorize("@ss.hasPermi('system:setting:edit')") //@PreAuthorize("@ss.hasPermi('system:setting:edit')")
@Log(title = "系统参数配置", businessType = BusinessType.UPDATE) @Log(title = "系统参数配置", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SysSetting sysSetting) public AjaxResult edit(@RequestBody SysSetting sysSetting)
...@@ -98,7 +98,7 @@ public class SysSettingController extends BaseController ...@@ -98,7 +98,7 @@ public class SysSettingController extends BaseController
/** /**
* 删除系统参数配置 * 删除系统参数配置
*/ */
@PreAuthorize("@ss.hasPermi('system:setting:remove')") //@PreAuthorize("@ss.hasPermi('system:setting:remove')")
@Log(title = "系统参数配置", businessType = BusinessType.DELETE) @Log(title = "系统参数配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{systemIds}") @DeleteMapping("/{systemIds}")
public AjaxResult remove(@PathVariable Integer[] systemIds) public AjaxResult remove(@PathVariable Integer[] systemIds)
......
...@@ -54,7 +54,7 @@ public class SysUserController extends BaseController ...@@ -54,7 +54,7 @@ public class SysUserController extends BaseController
/** /**
* 获取用户列表 * 获取用户列表
*/ */
@PreAuthorize("@ss.hasPermi('system:user:list')") //@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysUser user) public TableDataInfo list(SysUser user)
{ {
...@@ -64,7 +64,7 @@ public class SysUserController extends BaseController ...@@ -64,7 +64,7 @@ public class SysUserController extends BaseController
} }
@Log(title = "用户管理", businessType = BusinessType.EXPORT) @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')") //@PreAuthorize("@ss.hasPermi('system:user:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysUser user) public AjaxResult export(SysUser user)
{ {
...@@ -74,7 +74,7 @@ public class SysUserController extends BaseController ...@@ -74,7 +74,7 @@ public class SysUserController extends BaseController
} }
@Log(title = "用户管理", businessType = BusinessType.IMPORT) @Log(title = "用户管理", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')") //@PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{ {
...@@ -96,7 +96,7 @@ public class SysUserController extends BaseController ...@@ -96,7 +96,7 @@ public class SysUserController extends BaseController
/** /**
* 根据用户编号获取详细信息 * 根据用户编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:user:query')") //@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping(value = { "/", "/{userId}" }) @GetMapping(value = { "/", "/{userId}" })
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
{ {
...@@ -116,7 +116,7 @@ public class SysUserController extends BaseController ...@@ -116,7 +116,7 @@ public class SysUserController extends BaseController
/** /**
* 新增用户 * 新增用户
*/ */
@PreAuthorize("@ss.hasPermi('system:user:add')") //@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user) public AjaxResult add(@Validated @RequestBody SysUser user)
...@@ -143,7 +143,7 @@ public class SysUserController extends BaseController ...@@ -143,7 +143,7 @@ public class SysUserController extends BaseController
/** /**
* 修改用户 * 修改用户
*/ */
@PreAuthorize("@ss.hasPermi('system:user:edit')") //@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysUser user) public AjaxResult edit(@Validated @RequestBody SysUser user)
...@@ -166,7 +166,7 @@ public class SysUserController extends BaseController ...@@ -166,7 +166,7 @@ public class SysUserController extends BaseController
/** /**
* 删除用户 * 删除用户
*/ */
@PreAuthorize("@ss.hasPermi('system:user:remove')") //@PreAuthorize("@ss.hasPermi('system:user:remove')")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}") @DeleteMapping("/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds) public AjaxResult remove(@PathVariable Long[] userIds)
...@@ -177,7 +177,7 @@ public class SysUserController extends BaseController ...@@ -177,7 +177,7 @@ public class SysUserController extends BaseController
/** /**
* 重置密码 * 重置密码
*/ */
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')") //@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd") @PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user) public AjaxResult resetPwd(@RequestBody SysUser user)
...@@ -191,7 +191,7 @@ public class SysUserController extends BaseController ...@@ -191,7 +191,7 @@ public class SysUserController extends BaseController
/** /**
* 状态修改 * 状态修改
*/ */
@PreAuthorize("@ss.hasPermi('system:user:edit')") //@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUser user) public AjaxResult changeStatus(@RequestBody SysUser user)
......
...@@ -36,7 +36,7 @@ public class TDeviceAlarmInfoController extends BaseController ...@@ -36,7 +36,7 @@ public class TDeviceAlarmInfoController extends BaseController
/** /**
* 查询报警记录列表 * 查询报警记录列表
*/ */
@PreAuthorize("@ss.hasPermi('system:alarm:list')") //@PreAuthorize("@ss.hasPermi('system:alarm:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDeviceAlarmInfo tDeviceAlarmInfo) public TableDataInfo list(TDeviceAlarmInfo tDeviceAlarmInfo)
{ {
...@@ -59,7 +59,7 @@ public class TDeviceAlarmInfoController extends BaseController ...@@ -59,7 +59,7 @@ public class TDeviceAlarmInfoController extends BaseController
/** /**
* 导出报警记录列表 * 导出报警记录列表
*/ */
@PreAuthorize("@ss.hasPermi('system:alarm:export')") //@PreAuthorize("@ss.hasPermi('system:alarm:export')")
@Log(title = "报警记录", businessType = BusinessType.EXPORT) @Log(title = "报警记录", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDeviceAlarmInfo tDeviceAlarmInfo) public AjaxResult export(TDeviceAlarmInfo tDeviceAlarmInfo)
...@@ -72,7 +72,7 @@ public class TDeviceAlarmInfoController extends BaseController ...@@ -72,7 +72,7 @@ public class TDeviceAlarmInfoController extends BaseController
/** /**
* 获取报警记录详细信息 * 获取报警记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:alarm:query')") //@PreAuthorize("@ss.hasPermi('system:alarm:query')")
@GetMapping(value = "/{alarmId}") @GetMapping(value = "/{alarmId}")
public AjaxResult getInfo(@PathVariable("alarmId") Long alarmId) public AjaxResult getInfo(@PathVariable("alarmId") Long alarmId)
{ {
...@@ -82,7 +82,7 @@ public class TDeviceAlarmInfoController extends BaseController ...@@ -82,7 +82,7 @@ public class TDeviceAlarmInfoController extends BaseController
/** /**
* 新增报警记录 * 新增报警记录
*/ */
@PreAuthorize("@ss.hasPermi('system:alarm:add')") //@PreAuthorize("@ss.hasPermi('system:alarm:add')")
@Log(title = "报警记录", businessType = BusinessType.INSERT) @Log(title = "报警记录", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TDeviceAlarmInfo tDeviceAlarmInfo) public AjaxResult add(@RequestBody TDeviceAlarmInfo tDeviceAlarmInfo)
...@@ -93,7 +93,7 @@ public class TDeviceAlarmInfoController extends BaseController ...@@ -93,7 +93,7 @@ public class TDeviceAlarmInfoController extends BaseController
/** /**
* 修改报警记录 * 修改报警记录
*/ */
@PreAuthorize("@ss.hasPermi('system:alarm:edit')") //@PreAuthorize("@ss.hasPermi('system:alarm:edit')")
@Log(title = "报警记录", businessType = BusinessType.UPDATE) @Log(title = "报警记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDeviceAlarmInfo tDeviceAlarmInfo) public AjaxResult edit(@RequestBody TDeviceAlarmInfo tDeviceAlarmInfo)
...@@ -104,7 +104,7 @@ public class TDeviceAlarmInfoController extends BaseController ...@@ -104,7 +104,7 @@ public class TDeviceAlarmInfoController extends BaseController
/** /**
* 删除报警记录 * 删除报警记录
*/ */
@PreAuthorize("@ss.hasPermi('system:alarm:remove')") //@PreAuthorize("@ss.hasPermi('system:alarm:remove')")
@Log(title = "报警记录", businessType = BusinessType.DELETE) @Log(title = "报警记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{alarmIds}") @DeleteMapping("/{alarmIds}")
public AjaxResult remove(@PathVariable Long[] alarmIds) public AjaxResult remove(@PathVariable Long[] alarmIds)
......
...@@ -15,7 +15,7 @@ import com.zehong.common.core.controller.BaseController; ...@@ -15,7 +15,7 @@ import com.zehong.common.core.controller.BaseController;
@RequestMapping("/tool/swagger") @RequestMapping("/tool/swagger")
public class SwaggerController extends BaseController public class SwaggerController extends BaseController
{ {
@PreAuthorize("@ss.hasPermi('tool:swagger:view')") //@PreAuthorize("@ss.hasPermi('tool:swagger:view')")
@GetMapping() @GetMapping()
public String index() public String index()
{ {
......
...@@ -72,7 +72,7 @@ public class TTrainCourseController extends BaseController ...@@ -72,7 +72,7 @@ public class TTrainCourseController extends BaseController
/** /**
* 导出培训课程列表 * 导出培训课程列表
*/ */
@PreAuthorize("@ss.hasPermi('system:course:export')") //@PreAuthorize("@ss.hasPermi('system:course:export')")
@Log(title = "培训课程", businessType = BusinessType.EXPORT) @Log(title = "培训课程", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TTrainCourse tTrainCourse) public AjaxResult export(TTrainCourse tTrainCourse)
......
...@@ -31,7 +31,7 @@ public class TSpecialWorkPermitController extends BaseController ...@@ -31,7 +31,7 @@ public class TSpecialWorkPermitController extends BaseController
/** /**
* 查询特殊作业许可证列表 * 查询特殊作业许可证列表
*/ */
@PreAuthorize("@ss.hasPermi('special:permit:list')") //@PreAuthorize("@ss.hasPermi('special:permit:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSpecialWorkPermit tSpecialWorkPermit) public TableDataInfo list(TSpecialWorkPermit tSpecialWorkPermit)
{ {
...@@ -43,7 +43,7 @@ public class TSpecialWorkPermitController extends BaseController ...@@ -43,7 +43,7 @@ public class TSpecialWorkPermitController extends BaseController
/** /**
* 导出特殊作业许可证列表 * 导出特殊作业许可证列表
*/ */
@PreAuthorize("@ss.hasPermi('special:permit:export')") //@PreAuthorize("@ss.hasPermi('special:permit:export')")
@Log(title = "特殊作业许可证", businessType = BusinessType.EXPORT) @Log(title = "特殊作业许可证", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TSpecialWorkPermit tSpecialWorkPermit) public AjaxResult export(TSpecialWorkPermit tSpecialWorkPermit)
...@@ -56,7 +56,7 @@ public class TSpecialWorkPermitController extends BaseController ...@@ -56,7 +56,7 @@ public class TSpecialWorkPermitController extends BaseController
/** /**
* 获取特殊作业许可证详细信息 * 获取特殊作业许可证详细信息
*/ */
@PreAuthorize("@ss.hasPermi('special:permit:query')") //@PreAuthorize("@ss.hasPermi('special:permit:query')")
@GetMapping(value = "/{specialWorkPermitId}") @GetMapping(value = "/{specialWorkPermitId}")
public AjaxResult getInfo(@PathVariable("specialWorkPermitId") Long specialWorkPermitId) public AjaxResult getInfo(@PathVariable("specialWorkPermitId") Long specialWorkPermitId)
{ {
...@@ -66,7 +66,7 @@ public class TSpecialWorkPermitController extends BaseController ...@@ -66,7 +66,7 @@ public class TSpecialWorkPermitController extends BaseController
/** /**
* 新增特殊作业许可证 * 新增特殊作业许可证
*/ */
@PreAuthorize("@ss.hasPermi('special:permit:add')") //@PreAuthorize("@ss.hasPermi('special:permit:add')")
@Log(title = "特殊作业许可证", businessType = BusinessType.INSERT) @Log(title = "特殊作业许可证", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TSpecialWorkPermit tSpecialWorkPermit) public AjaxResult add(@RequestBody TSpecialWorkPermit tSpecialWorkPermit)
...@@ -77,7 +77,7 @@ public class TSpecialWorkPermitController extends BaseController ...@@ -77,7 +77,7 @@ public class TSpecialWorkPermitController extends BaseController
/** /**
* 修改特殊作业许可证 * 修改特殊作业许可证
*/ */
@PreAuthorize("@ss.hasPermi('special:permit:edit')") //@PreAuthorize("@ss.hasPermi('special:permit:edit')")
@Log(title = "特殊作业许可证", businessType = BusinessType.UPDATE) @Log(title = "特殊作业许可证", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TSpecialWorkPermit tSpecialWorkPermit) public AjaxResult edit(@RequestBody TSpecialWorkPermit tSpecialWorkPermit)
...@@ -88,7 +88,7 @@ public class TSpecialWorkPermitController extends BaseController ...@@ -88,7 +88,7 @@ public class TSpecialWorkPermitController extends BaseController
/** /**
* 删除特殊作业许可证 * 删除特殊作业许可证
*/ */
@PreAuthorize("@ss.hasPermi('special:permit:remove')") //@PreAuthorize("@ss.hasPermi('special:permit:remove')")
@Log(title = "特殊作业许可证", businessType = BusinessType.DELETE) @Log(title = "特殊作业许可证", businessType = BusinessType.DELETE)
@DeleteMapping("/{specialWorkPermitIds}") @DeleteMapping("/{specialWorkPermitIds}")
public AjaxResult remove(@PathVariable Long[] specialWorkPermitIds) public AjaxResult remove(@PathVariable Long[] specialWorkPermitIds)
......
...@@ -46,7 +46,7 @@ public class GenController extends BaseController ...@@ -46,7 +46,7 @@ public class GenController extends BaseController
/** /**
* 查询代码生成列表 * 查询代码生成列表
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:list')") //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo genList(GenTable genTable) public TableDataInfo genList(GenTable genTable)
{ {
...@@ -58,7 +58,7 @@ public class GenController extends BaseController ...@@ -58,7 +58,7 @@ public class GenController extends BaseController
/** /**
* 修改代码生成业务 * 修改代码生成业务
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:query')") //@PreAuthorize("@ss.hasPermi('tool:gen:query')")
@GetMapping(value = "/{talbleId}") @GetMapping(value = "/{talbleId}")
public AjaxResult getInfo(@PathVariable Long talbleId) public AjaxResult getInfo(@PathVariable Long talbleId)
{ {
...@@ -75,7 +75,7 @@ public class GenController extends BaseController ...@@ -75,7 +75,7 @@ public class GenController extends BaseController
/** /**
* 查询数据库列表 * 查询数据库列表
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:list')") //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/db/list") @GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable) public TableDataInfo dataList(GenTable genTable)
{ {
...@@ -87,7 +87,7 @@ public class GenController extends BaseController ...@@ -87,7 +87,7 @@ public class GenController extends BaseController
/** /**
* 查询数据表字段列表 * 查询数据表字段列表
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:list')") //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping(value = "/column/{talbleId}") @GetMapping(value = "/column/{talbleId}")
public TableDataInfo columnList(Long tableId) public TableDataInfo columnList(Long tableId)
{ {
...@@ -101,7 +101,7 @@ public class GenController extends BaseController ...@@ -101,7 +101,7 @@ public class GenController extends BaseController
/** /**
* 导入表结构(保存) * 导入表结构(保存)
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:import')") //@PreAuthorize("@ss.hasPermi('tool:gen:import')")
@Log(title = "代码生成", businessType = BusinessType.IMPORT) @Log(title = "代码生成", businessType = BusinessType.IMPORT)
@PostMapping("/importTable") @PostMapping("/importTable")
public AjaxResult importTableSave(String tables) public AjaxResult importTableSave(String tables)
...@@ -116,7 +116,7 @@ public class GenController extends BaseController ...@@ -116,7 +116,7 @@ public class GenController extends BaseController
/** /**
* 修改保存代码生成业务 * 修改保存代码生成业务
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:edit')") //@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "代码生成", businessType = BusinessType.UPDATE) @Log(title = "代码生成", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult editSave(@Validated @RequestBody GenTable genTable) public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
...@@ -129,7 +129,7 @@ public class GenController extends BaseController ...@@ -129,7 +129,7 @@ public class GenController extends BaseController
/** /**
* 删除代码生成 * 删除代码生成
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:remove')") //@PreAuthorize("@ss.hasPermi('tool:gen:remove')")
@Log(title = "代码生成", businessType = BusinessType.DELETE) @Log(title = "代码生成", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}") @DeleteMapping("/{tableIds}")
public AjaxResult remove(@PathVariable Long[] tableIds) public AjaxResult remove(@PathVariable Long[] tableIds)
...@@ -141,7 +141,7 @@ public class GenController extends BaseController ...@@ -141,7 +141,7 @@ public class GenController extends BaseController
/** /**
* 预览代码 * 预览代码
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:preview')") //@PreAuthorize("@ss.hasPermi('tool:gen:preview')")
@GetMapping("/preview/{tableId}") @GetMapping("/preview/{tableId}")
public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
{ {
...@@ -152,7 +152,7 @@ public class GenController extends BaseController ...@@ -152,7 +152,7 @@ public class GenController extends BaseController
/** /**
* 生成代码(下载方式) * 生成代码(下载方式)
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:code')") //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}") @GetMapping("/download/{tableName}")
public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
...@@ -164,7 +164,7 @@ public class GenController extends BaseController ...@@ -164,7 +164,7 @@ public class GenController extends BaseController
/** /**
* 生成代码(自定义路径) * 生成代码(自定义路径)
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:code')") //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}") @GetMapping("/genCode/{tableName}")
public AjaxResult genCode(@PathVariable("tableName") String tableName) public AjaxResult genCode(@PathVariable("tableName") String tableName)
...@@ -176,7 +176,7 @@ public class GenController extends BaseController ...@@ -176,7 +176,7 @@ public class GenController extends BaseController
/** /**
* 同步数据库 * 同步数据库
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:edit')") //@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
@Log(title = "代码生成", businessType = BusinessType.UPDATE) @Log(title = "代码生成", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}") @GetMapping("/synchDb/{tableName}")
public AjaxResult synchDb(@PathVariable("tableName") String tableName) public AjaxResult synchDb(@PathVariable("tableName") String tableName)
...@@ -188,7 +188,7 @@ public class GenController extends BaseController ...@@ -188,7 +188,7 @@ public class GenController extends BaseController
/** /**
* 批量生成代码 * 批量生成代码
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:code')") //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode") @GetMapping("/batchGenCode")
public void batchGenCode(HttpServletResponse response, String tables) throws IOException public void batchGenCode(HttpServletResponse response, String tables) throws IOException
......
...@@ -39,7 +39,7 @@ public class ${ClassName}Controller extends BaseController ...@@ -39,7 +39,7 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
*/ */
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
@GetMapping("/list") @GetMapping("/list")
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
public TableDataInfo list(${ClassName} ${className}) public TableDataInfo list(${ClassName} ${className})
...@@ -59,7 +59,7 @@ public class ${ClassName}Controller extends BaseController ...@@ -59,7 +59,7 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 导出${functionName}列表 * 导出${functionName}列表
*/ */
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT) @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(${ClassName} ${className}) public AjaxResult export(${ClassName} ${className})
...@@ -72,7 +72,7 @@ public class ${ClassName}Controller extends BaseController ...@@ -72,7 +72,7 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 获取${functionName}详细信息 * 获取${functionName}详细信息
*/ */
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
@GetMapping(value = "/{${pkColumn.javaField}}") @GetMapping(value = "/{${pkColumn.javaField}}")
public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{ {
...@@ -82,7 +82,7 @@ public class ${ClassName}Controller extends BaseController ...@@ -82,7 +82,7 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 新增${functionName} * 新增${functionName}
*/ */
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
@Log(title = "${functionName}", businessType = BusinessType.INSERT) @Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ${ClassName} ${className}) public AjaxResult add(@RequestBody ${ClassName} ${className})
...@@ -93,7 +93,7 @@ public class ${ClassName}Controller extends BaseController ...@@ -93,7 +93,7 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 修改${functionName} * 修改${functionName}
*/ */
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE) @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ${ClassName} ${className}) public AjaxResult edit(@RequestBody ${ClassName} ${className})
...@@ -104,7 +104,7 @@ public class ${ClassName}Controller extends BaseController ...@@ -104,7 +104,7 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 删除${functionName} * 删除${functionName}
*/ */
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}", businessType = BusinessType.DELETE) @Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}") @DeleteMapping("/{${pkColumn.javaField}s}")
public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
......
...@@ -39,7 +39,7 @@ public class SysJobController extends BaseController ...@@ -39,7 +39,7 @@ public class SysJobController extends BaseController
/** /**
* 查询定时任务列表 * 查询定时任务列表
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:list')") //@PreAuthorize("@ss.hasPermi('monitor:job:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysJob sysJob) public TableDataInfo list(SysJob sysJob)
{ {
...@@ -51,7 +51,7 @@ public class SysJobController extends BaseController ...@@ -51,7 +51,7 @@ public class SysJobController extends BaseController
/** /**
* 导出定时任务列表 * 导出定时任务列表
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:export')") //@PreAuthorize("@ss.hasPermi('monitor:job:export')")
@Log(title = "定时任务", businessType = BusinessType.EXPORT) @Log(title = "定时任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysJob sysJob) public AjaxResult export(SysJob sysJob)
...@@ -64,7 +64,7 @@ public class SysJobController extends BaseController ...@@ -64,7 +64,7 @@ public class SysJobController extends BaseController
/** /**
* 获取定时任务详细信息 * 获取定时任务详细信息
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:query')") //@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobId}") @GetMapping(value = "/{jobId}")
public AjaxResult getInfo(@PathVariable("jobId") Long jobId) public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
{ {
...@@ -74,7 +74,7 @@ public class SysJobController extends BaseController ...@@ -74,7 +74,7 @@ public class SysJobController extends BaseController
/** /**
* 新增定时任务 * 新增定时任务
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:add')") //@PreAuthorize("@ss.hasPermi('monitor:job:add')")
@Log(title = "定时任务", businessType = BusinessType.INSERT) @Log(title = "定时任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException
...@@ -90,7 +90,7 @@ public class SysJobController extends BaseController ...@@ -90,7 +90,7 @@ public class SysJobController extends BaseController
/** /**
* 修改定时任务 * 修改定时任务
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:edit')") //@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
@Log(title = "定时任务", businessType = BusinessType.UPDATE) @Log(title = "定时任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException
...@@ -106,7 +106,7 @@ public class SysJobController extends BaseController ...@@ -106,7 +106,7 @@ public class SysJobController extends BaseController
/** /**
* 定时任务状态修改 * 定时任务状态修改
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") //@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "定时任务", businessType = BusinessType.UPDATE) @Log(title = "定时任务", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
...@@ -119,7 +119,7 @@ public class SysJobController extends BaseController ...@@ -119,7 +119,7 @@ public class SysJobController extends BaseController
/** /**
* 定时任务立即执行一次 * 定时任务立即执行一次
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") //@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "定时任务", businessType = BusinessType.UPDATE) @Log(title = "定时任务", businessType = BusinessType.UPDATE)
@PutMapping("/run") @PutMapping("/run")
public AjaxResult run(@RequestBody SysJob job) throws SchedulerException public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
...@@ -131,7 +131,7 @@ public class SysJobController extends BaseController ...@@ -131,7 +131,7 @@ public class SysJobController extends BaseController
/** /**
* 删除定时任务 * 删除定时任务
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:remove')") //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "定时任务", businessType = BusinessType.DELETE) @Log(title = "定时任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}") @DeleteMapping("/{jobIds}")
public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
......
...@@ -32,7 +32,7 @@ public class SysJobLogController extends BaseController ...@@ -32,7 +32,7 @@ public class SysJobLogController extends BaseController
/** /**
* 查询定时任务调度日志列表 * 查询定时任务调度日志列表
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:list')") //@PreAuthorize("@ss.hasPermi('monitor:job:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog) public TableDataInfo list(SysJobLog sysJobLog)
{ {
...@@ -44,7 +44,7 @@ public class SysJobLogController extends BaseController ...@@ -44,7 +44,7 @@ public class SysJobLogController extends BaseController
/** /**
* 导出定时任务调度日志列表 * 导出定时任务调度日志列表
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:export')") //@PreAuthorize("@ss.hasPermi('monitor:job:export')")
@Log(title = "任务调度日志", businessType = BusinessType.EXPORT) @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysJobLog sysJobLog) public AjaxResult export(SysJobLog sysJobLog)
...@@ -57,7 +57,7 @@ public class SysJobLogController extends BaseController ...@@ -57,7 +57,7 @@ public class SysJobLogController extends BaseController
/** /**
* 根据调度编号获取详细信息 * 根据调度编号获取详细信息
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:query')") //@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{configId}") @GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long jobLogId) public AjaxResult getInfo(@PathVariable Long jobLogId)
{ {
...@@ -68,7 +68,7 @@ public class SysJobLogController extends BaseController ...@@ -68,7 +68,7 @@ public class SysJobLogController extends BaseController
/** /**
* 删除定时任务调度日志 * 删除定时任务调度日志
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:remove')") //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "定时任务调度日志", businessType = BusinessType.DELETE) @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}") @DeleteMapping("/{jobLogIds}")
public AjaxResult remove(@PathVariable Long[] jobLogIds) public AjaxResult remove(@PathVariable Long[] jobLogIds)
...@@ -79,7 +79,7 @@ public class SysJobLogController extends BaseController ...@@ -79,7 +79,7 @@ public class SysJobLogController extends BaseController
/** /**
* 清空定时任务调度日志 * 清空定时任务调度日志
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:remove')") //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "调度日志", businessType = BusinessType.CLEAN) @Log(title = "调度日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() public AjaxResult clean()
......
...@@ -92,8 +92,10 @@ export default { ...@@ -92,8 +92,10 @@ export default {
codeUrl: "", codeUrl: "",
cookiePassword: "", cookiePassword: "",
loginForm: { loginForm: {
username: "admin", /* username: "admin",
password: "admin123", password: "admin123",*/
username: "",
password: "",
rememberMe: false, rememberMe: false,
code: "", code: "",
uuid: "", uuid: "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment