Skip to content

Z
zh-baseversion-project
Commit 1c05698b authored by 军师中郎将's avatar 军师中郎将
Browse files
Options

按钮权限控制清理

parent 7d6bc8fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1047 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/common/TSuperviseController.java
View file @ 1c05698b
package com.zehong.web.controller.common; package com.zehong.web.controller.common;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TSuperviseController extends BaseController ...@@ -36,7 +35,6 @@ public class TSuperviseController extends BaseController
/** /**
* 查询监督检查列表 * 查询监督检查列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:supervise:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSupervise tSupervise) public TableDataInfo list(TSupervise tSupervise)
{ {
...@@ -48,7 +46,6 @@ public class TSuperviseController extends BaseController ...@@ -48,7 +46,6 @@ public class TSuperviseController extends BaseController
/** /**
* 导出监督检查列表 * 导出监督检查列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:supervise:export')")
@Log(title = "监督检查", businessType = BusinessType.EXPORT) @Log(title = "监督检查", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TSupervise tSupervise) public AjaxResult export(TSupervise tSupervise)
...@@ -61,7 +58,6 @@ public class TSuperviseController extends BaseController ...@@ -61,7 +58,6 @@ public class TSuperviseController extends BaseController
/** /**
* 获取监督检查详细信息 * 获取监督检查详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:supervise:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -71,7 +67,6 @@ public class TSuperviseController extends BaseController ...@@ -71,7 +67,6 @@ public class TSuperviseController extends BaseController
/** /**
* 新增监督检查 * 新增监督检查
*/ */
//@PreAuthorize("@ss.hasPermi('system:supervise:add')")
@Log(title = "监督检查", businessType = BusinessType.INSERT) @Log(title = "监督检查", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TSupervise tSupervise) public AjaxResult add(@RequestBody TSupervise tSupervise)
...@@ -82,7 +77,6 @@ public class TSuperviseController extends BaseController ...@@ -82,7 +77,6 @@ public class TSuperviseController extends BaseController
/** /**
* 修改监督检查 * 修改监督检查
*/ */
//@PreAuthorize("@ss.hasPermi('system:supervise:edit')")
@Log(title = "监督检查", businessType = BusinessType.UPDATE) @Log(title = "监督检查", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TSupervise tSupervise) public AjaxResult edit(@RequestBody TSupervise tSupervise)
...@@ -93,7 +87,6 @@ public class TSuperviseController extends BaseController ...@@ -93,7 +87,6 @@ public class TSuperviseController extends BaseController
/** /**
* 删除监督检查 * 删除监督检查
*/ */
//@PreAuthorize("@ss.hasPermi('system:supervise: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java
View file @ 1c05698b
...@@ -5,7 +5,6 @@ import java.util.List; ...@@ -5,7 +5,6 @@ import java.util.List;
import com.zehong.common.core.domain.model.LoginUser; import com.zehong.common.core.domain.model.LoginUser;
import com.zehong.framework.web.service.TokenService; import com.zehong.framework.web.service.TokenService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -44,7 +43,6 @@ public class TComplainDealController extends BaseController ...@@ -44,7 +43,6 @@ public class TComplainDealController extends BaseController
/** /**
* 查询投诉处置列表 * 查询投诉处置列表
*/ */
//@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TComplainDeal tComplainDeal, HttpServletRequest request) public TableDataInfo list(TComplainDeal tComplainDeal, HttpServletRequest request)
{ {
...@@ -60,7 +58,6 @@ public class TComplainDealController extends BaseController ...@@ -60,7 +58,6 @@ public class TComplainDealController extends BaseController
/** /**
* 导出投诉处置列表 * 导出投诉处置列表
*/ */
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:export')")
@Log(title = "投诉处置", businessType = BusinessType.EXPORT) @Log(title = "投诉处置", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TComplainDeal tComplainDeal) public AjaxResult export(TComplainDeal tComplainDeal)
...@@ -73,7 +70,6 @@ public class TComplainDealController extends BaseController ...@@ -73,7 +70,6 @@ public class TComplainDealController extends BaseController
/** /**
* 获取投诉处置详细信息 * 获取投诉处置详细信息
*/ */
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:query')")
@GetMapping(value = "/{complainDealId}") @GetMapping(value = "/{complainDealId}")
public AjaxResult getInfo(@PathVariable("complainDealId") Long complainDealId) public AjaxResult getInfo(@PathVariable("complainDealId") Long complainDealId)
{ {
...@@ -83,7 +79,6 @@ public class TComplainDealController extends BaseController ...@@ -83,7 +79,6 @@ public class TComplainDealController extends BaseController
/** /**
* 新增投诉处置 * 新增投诉处置
*/ */
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:add')")
@Log(title = "投诉处置", businessType = BusinessType.INSERT) @Log(title = "投诉处置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TComplainDeal tComplainDeal) public AjaxResult add(@RequestBody TComplainDeal tComplainDeal)
...@@ -94,7 +89,6 @@ public class TComplainDealController extends BaseController ...@@ -94,7 +89,6 @@ public class TComplainDealController extends BaseController
/** /**
* 修改投诉处置 * 修改投诉处置
*/ */
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:edit')")
@Log(title = "投诉处置", businessType = BusinessType.UPDATE) @Log(title = "投诉处置", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TComplainDeal tComplainDeal) public AjaxResult edit(@RequestBody TComplainDeal tComplainDeal)
...@@ -108,7 +102,6 @@ public class TComplainDealController extends BaseController ...@@ -108,7 +102,6 @@ public class TComplainDealController extends BaseController
/** /**
* 删除投诉处置 * 删除投诉处置
*/ */
@PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:remove')")
@Log(title = "投诉处置", businessType = BusinessType.DELETE) @Log(title = "投诉处置", businessType = BusinessType.DELETE)
@DeleteMapping("/{complainDealIds}") @DeleteMapping("/{complainDealIds}")
public AjaxResult remove(@PathVariable Long[] complainDealIds) public AjaxResult remove(@PathVariable Long[] complainDealIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/energency/TEmergencyDrillsController.java
View file @ 1c05698b
package com.zehong.web.controller.energency; package com.zehong.web.controller.energency;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TEmergencyDrillsController extends BaseController ...@@ -36,7 +35,6 @@ public class TEmergencyDrillsController extends BaseController
/** /**
* 查询应急演练列表 * 查询应急演练列表
*/ */
@PreAuthorize("@ss.hasPermi('emergencydrills:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEmergencyDrills tEmergencyDrills) public TableDataInfo list(TEmergencyDrills tEmergencyDrills)
{ {
...@@ -48,7 +46,6 @@ public class TEmergencyDrillsController extends BaseController ...@@ -48,7 +46,6 @@ public class TEmergencyDrillsController extends BaseController
/** /**
* 导出应急演练列表 * 导出应急演练列表
*/ */
@PreAuthorize("@ss.hasPermi('emergencydrills:record:export')")
@Log(title = "应急演练", businessType = BusinessType.EXPORT) @Log(title = "应急演练", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TEmergencyDrills tEmergencyDrills) public AjaxResult export(TEmergencyDrills tEmergencyDrills)
...@@ -61,7 +58,6 @@ public class TEmergencyDrillsController extends BaseController ...@@ -61,7 +58,6 @@ public class TEmergencyDrillsController extends BaseController
/** /**
* 获取应急演练详细信息 * 获取应急演练详细信息
*/ */
@PreAuthorize("@ss.hasPermi('emergencydrills:record:query')")
@GetMapping(value = "/getDetail/{fDrillsId}") @GetMapping(value = "/getDetail/{fDrillsId}")
public AjaxResult getInfo(@PathVariable("fDrillsId") Long fDrillsId) public AjaxResult getInfo(@PathVariable("fDrillsId") Long fDrillsId)
{ {
...@@ -71,7 +67,6 @@ public class TEmergencyDrillsController extends BaseController ...@@ -71,7 +67,6 @@ public class TEmergencyDrillsController extends BaseController
/** /**
* 新增应急演练 * 新增应急演练
*/ */
@PreAuthorize("@ss.hasPermi('emergencydrills:record:add')")
@Log(title = "应急演练", businessType = BusinessType.INSERT) @Log(title = "应急演练", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TEmergencyDrills tEmergencyDrills) public AjaxResult add(@RequestBody TEmergencyDrills tEmergencyDrills)
...@@ -82,7 +77,6 @@ public class TEmergencyDrillsController extends BaseController ...@@ -82,7 +77,6 @@ public class TEmergencyDrillsController extends BaseController
/** /**
* 修改应急演练 * 修改应急演练
*/ */
@PreAuthorize("@ss.hasPermi('emergencydrills:record:edit')")
@Log(title = "应急演练", businessType = BusinessType.UPDATE) @Log(title = "应急演练", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TEmergencyDrills tEmergencyDrills) public AjaxResult edit(@RequestBody TEmergencyDrills tEmergencyDrills)
...@@ -93,7 +87,6 @@ public class TEmergencyDrillsController extends BaseController ...@@ -93,7 +87,6 @@ public class TEmergencyDrillsController extends BaseController
/** /**
* 删除应急演练 * 删除应急演练
*/ */
@PreAuthorize("@ss.hasPermi('emergencydrills:record:remove')")
@Log(title = "应急演练", businessType = BusinessType.DELETE) @Log(title = "应急演练", businessType = BusinessType.DELETE)
@DeleteMapping("/{fDrillsIds}") @DeleteMapping("/{fDrillsIds}")
public AjaxResult remove(@PathVariable Long[] fDrillsIds) public AjaxResult remove(@PathVariable Long[] fDrillsIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/energency/TSupMajorHazardController.java
View file @ 1c05698b
package com.zehong.web.controller.energency; package com.zehong.web.controller.energency;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TSupMajorHazardController extends BaseController ...@@ -36,7 +35,6 @@ public class TSupMajorHazardController extends BaseController
/** /**
* 查询重大危险源监管列表 * 查询重大危险源监管列表
*/ */
@PreAuthorize("@ss.hasPermi('majorpollsourcelevel:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSupMajorHazard tSupMajorHazard) public TableDataInfo list(TSupMajorHazard tSupMajorHazard)
{ {
...@@ -48,7 +46,6 @@ public class TSupMajorHazardController extends BaseController ...@@ -48,7 +46,6 @@ public class TSupMajorHazardController extends BaseController
/** /**
* 导出重大危险源监管列表 * 导出重大危险源监管列表
*/ */
@PreAuthorize("@ss.hasPermi('majorpollsourcelevel:record:export')")
@Log(title = "重大危险源监管", businessType = BusinessType.EXPORT) @Log(title = "重大危险源监管", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TSupMajorHazard tSupMajorHazard) public AjaxResult export(TSupMajorHazard tSupMajorHazard)
...@@ -62,7 +59,6 @@ public class TSupMajorHazardController extends BaseController ...@@ -62,7 +59,6 @@ public class TSupMajorHazardController extends BaseController
/** /**
* 获取重大危险源监管详细信息 * 获取重大危险源监管详细信息
*/ */
@PreAuthorize("@ss.hasPermi('majorpollsourcelevel:record:query')")
@GetMapping(value = "/{fHazardId}") @GetMapping(value = "/{fHazardId}")
public AjaxResult getInfo(@PathVariable("fHazardId") Long fHazardId) public AjaxResult getInfo(@PathVariable("fHazardId") Long fHazardId)
{ {
...@@ -72,7 +68,6 @@ public class TSupMajorHazardController extends BaseController ...@@ -72,7 +68,6 @@ public class TSupMajorHazardController extends BaseController
/** /**
* 新增重大危险源监管 * 新增重大危险源监管
*/ */
@PreAuthorize("@ss.hasPermi('majorpollsourcelevel:record:add')")
@Log(title = "重大危险源监管", businessType = BusinessType.INSERT) @Log(title = "重大危险源监管", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TSupMajorHazard tSupMajorHazard) public AjaxResult add(@RequestBody TSupMajorHazard tSupMajorHazard)
...@@ -83,7 +78,6 @@ public class TSupMajorHazardController extends BaseController ...@@ -83,7 +78,6 @@ public class TSupMajorHazardController extends BaseController
/** /**
* 修改重大危险源监管 * 修改重大危险源监管
*/ */
@PreAuthorize("@ss.hasPermi('majorpollsourcelevel:record:edit')")
@Log(title = "重大危险源监管", businessType = BusinessType.UPDATE) @Log(title = "重大危险源监管", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TSupMajorHazard tSupMajorHazard) public AjaxResult edit(@RequestBody TSupMajorHazard tSupMajorHazard)
...@@ -94,7 +88,6 @@ public class TSupMajorHazardController extends BaseController ...@@ -94,7 +88,6 @@ public class TSupMajorHazardController extends BaseController
/** /**
* 删除重大危险源监管 * 删除重大危险源监管
*/ */
@PreAuthorize("@ss.hasPermi('majorpollsourcelevel:record:remove')")
@Log(title = "重大危险源监管", businessType = BusinessType.DELETE) @Log(title = "重大危险源监管", businessType = BusinessType.DELETE)
@DeleteMapping("/{fHazardIds}") @DeleteMapping("/{fHazardIds}")
public AjaxResult remove(@PathVariable Long[] fHazardIds) public AjaxResult remove(@PathVariable Long[] fHazardIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TAirChargeRecordController.java
View file @ 1c05698b
...@@ -47,7 +47,6 @@ public class TAirChargeRecordController extends BaseController ...@@ -47,7 +47,6 @@ public class TAirChargeRecordController extends BaseController
/** /**
* 查询充装记录列表 * 查询充装记录列表
*/ */
// @PreAuthorize("@ss.hasPermi('charge:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TAirChargeRecord tAirChargeRecord) public TableDataInfo list(TAirChargeRecord tAirChargeRecord)
{ {
...@@ -59,7 +58,6 @@ public class TAirChargeRecordController extends BaseController ...@@ -59,7 +58,6 @@ public class TAirChargeRecordController extends BaseController
/** /**
* 导出充装记录列表 * 导出充装记录列表
*/ */
@PreAuthorize("@ss.hasPermi('charge:record:export')")
@Log(title = "充装记录", businessType = BusinessType.EXPORT) @Log(title = "充装记录", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TAirChargeRecord tAirChargeRecord) public AjaxResult export(TAirChargeRecord tAirChargeRecord)
...@@ -72,7 +70,6 @@ public class TAirChargeRecordController extends BaseController ...@@ -72,7 +70,6 @@ public class TAirChargeRecordController extends BaseController
/** /**
* 获取充装记录详细信息 * 获取充装记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('charge:record:query')")
@GetMapping(value = "/{chargeRecordId}") @GetMapping(value = "/{chargeRecordId}")
public AjaxResult getInfo(@PathVariable("chargeRecordId") Long chargeRecordId) public AjaxResult getInfo(@PathVariable("chargeRecordId") Long chargeRecordId)
{ {
...@@ -95,7 +92,6 @@ public class TAirChargeRecordController extends BaseController ...@@ -95,7 +92,6 @@ public class TAirChargeRecordController extends BaseController
/** /**
* 新增充装记录 * 新增充装记录
*/ */
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "充装记录", businessType = BusinessType.INSERT) @Log(title = "充装记录", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TAirChargeRecord tAirChargeRecord) public AjaxResult add(@RequestBody TAirChargeRecord tAirChargeRecord)
...@@ -155,7 +151,6 @@ public class TAirChargeRecordController extends BaseController ...@@ -155,7 +151,6 @@ public class TAirChargeRecordController extends BaseController
/** /**
* 修改充装记录 * 修改充装记录
*/ */
@PreAuthorize("@ss.hasPermi('charge:record:edit')")
@Log(title = "充装记录", businessType = BusinessType.UPDATE) @Log(title = "充装记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TAirChargeRecord tAirChargeRecord) public AjaxResult edit(@RequestBody TAirChargeRecord tAirChargeRecord)
...@@ -166,7 +161,6 @@ public class TAirChargeRecordController extends BaseController ...@@ -166,7 +161,6 @@ public class TAirChargeRecordController extends BaseController
/** /**
* 删除充装记录 * 删除充装记录
*/ */
@PreAuthorize("@ss.hasPermi('charge:record:remove')")
@Log(title = "充装记录", businessType = BusinessType.DELETE) @Log(title = "充装记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{chargeRecordIds}") @DeleteMapping("/{chargeRecordIds}")
public AjaxResult remove(@PathVariable Long[] chargeRecordIds) public AjaxResult remove(@PathVariable Long[] chargeRecordIds)
...@@ -181,7 +175,6 @@ public class TAirChargeRecordController extends BaseController ...@@ -181,7 +175,6 @@ public class TAirChargeRecordController extends BaseController
* @return * @return
* @throws Exception * @throws Exception
*/ */
@PreAuthorize("@ss.hasPermi('charge:record:import')")
@Log(title = "充装记录导入", businessType = BusinessType.IMPORT) @Log(title = "充装记录导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleInfoController.java
View file @ 1c05698b
...@@ -10,7 +10,6 @@ import com.zehong.system.domain.BottleStatistics; ...@@ -10,7 +10,6 @@ import com.zehong.system.domain.BottleStatistics;
import com.zehong.system.domain.TGasBottleInfo; import com.zehong.system.domain.TGasBottleInfo;
import com.zehong.system.service.ITGasBottleInfoService; import com.zehong.system.service.ITGasBottleInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -32,7 +31,6 @@ public class TGasBottleInfoController extends BaseController ...@@ -32,7 +31,6 @@ public class TGasBottleInfoController extends BaseController
/** /**
* 查询气瓶信息列表 * 查询气瓶信息列表
*/ */
// @PreAuthorize("@ss.hasPermi('gasBottle:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TGasBottleInfo tGasBottleInfo) public TableDataInfo list(TGasBottleInfo tGasBottleInfo)
{ {
...@@ -51,7 +49,6 @@ public class TGasBottleInfoController extends BaseController ...@@ -51,7 +49,6 @@ public class TGasBottleInfoController extends BaseController
/** /**
* 导出气瓶信息列表 * 导出气瓶信息列表
*/ */
@PreAuthorize("@ss.hasPermi('gasBottle:info:export')")
@Log(title = "气瓶信息", businessType = BusinessType.EXPORT) @Log(title = "气瓶信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TGasBottleInfo tGasBottleInfo) public AjaxResult export(TGasBottleInfo tGasBottleInfo)
...@@ -64,7 +61,6 @@ public class TGasBottleInfoController extends BaseController ...@@ -64,7 +61,6 @@ public class TGasBottleInfoController extends BaseController
/** /**
* 获取气瓶信息详细信息 * 获取气瓶信息详细信息
*/ */
// @PreAuthorize("@ss.hasPermi('gasBottle:info:query')")
@GetMapping(value = "/{bottleId}") @GetMapping(value = "/{bottleId}")
public AjaxResult getInfo(@PathVariable("bottleId") Long bottleId) public AjaxResult getInfo(@PathVariable("bottleId") Long bottleId)
{ {
...@@ -99,7 +95,6 @@ public class TGasBottleInfoController extends BaseController ...@@ -99,7 +95,6 @@ public class TGasBottleInfoController extends BaseController
/** /**
* 新增气瓶信息 * 新增气瓶信息
*/ */
// @PreAuthorize("@ss.hasPermi('gasBottle:info:add')")
@Log(title = "气瓶信息", businessType = BusinessType.INSERT) @Log(title = "气瓶信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TGasBottleInfo tGasBottleInfo) public AjaxResult add(@RequestBody TGasBottleInfo tGasBottleInfo)
...@@ -119,7 +114,6 @@ public class TGasBottleInfoController extends BaseController ...@@ -119,7 +114,6 @@ public class TGasBottleInfoController extends BaseController
/** /**
* 修改气瓶信息 * 修改气瓶信息
*/ */
// @PreAuthorize("@ss.hasPermi('gasBottle:info:edit')")
@Log(title = "气瓶信息", businessType = BusinessType.UPDATE) @Log(title = "气瓶信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TGasBottleInfo tGasBottleInfo) public AjaxResult edit(@RequestBody TGasBottleInfo tGasBottleInfo)
...@@ -130,7 +124,6 @@ public class TGasBottleInfoController extends BaseController ...@@ -130,7 +124,6 @@ public class TGasBottleInfoController extends BaseController
/** /**
* 删除气瓶信息 * 删除气瓶信息
*/ */
// @PreAuthorize("@ss.hasPermi('gasBottle:info:remove')")
@Log(title = "气瓶信息", businessType = BusinessType.DELETE) @Log(title = "气瓶信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{bottleIds}") @DeleteMapping("/{bottleIds}")
public AjaxResult remove(@PathVariable Long[] bottleIds) public AjaxResult remove(@PathVariable Long[] bottleIds)
...@@ -145,7 +138,6 @@ public class TGasBottleInfoController extends BaseController ...@@ -145,7 +138,6 @@ public class TGasBottleInfoController extends BaseController
* @return * @return
* @throws Exception * @throws Exception
*/ */
@PreAuthorize("@ss.hasPermi('gasBottle:info:import')")
@Log(title = "气瓶导入", businessType = BusinessType.IMPORT) @Log(title = "气瓶导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleTrackRecordController.java
View file @ 1c05698b
...@@ -13,7 +13,6 @@ import com.zehong.system.service.ITGasBottleInfoService; ...@@ -13,7 +13,6 @@ import com.zehong.system.service.ITGasBottleInfoService;
import com.zehong.system.service.ITGasBottleTrackRecordService; import com.zehong.system.service.ITGasBottleTrackRecordService;
import com.zehong.system.service.ITTaskRecordService; import com.zehong.system.service.ITTaskRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.ParseException; import java.text.ParseException;
...@@ -87,7 +86,6 @@ public class TGasBottleTrackRecordController extends BaseController ...@@ -87,7 +86,6 @@ public class TGasBottleTrackRecordController extends BaseController
/** /**
* 导出气瓶追溯列表 * 导出气瓶追溯列表
*/ */
@PreAuthorize("@ss.hasPermi('track:record:export')")
@Log(title = "气瓶追溯", businessType = BusinessType.EXPORT) @Log(title = "气瓶追溯", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public AjaxResult export(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord) public AjaxResult export(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
...@@ -100,7 +98,6 @@ public class TGasBottleTrackRecordController extends BaseController ...@@ -100,7 +98,6 @@ public class TGasBottleTrackRecordController extends BaseController
/** /**
* 获取气瓶追溯详细信息 * 获取气瓶追溯详细信息
*/ */
@PreAuthorize("@ss.hasPermi('track:record:query')")
@GetMapping(value = "/{trackRecordId}") @GetMapping(value = "/{trackRecordId}")
public AjaxResult getInfo(@PathVariable("trackRecordId") Long trackRecordId) public AjaxResult getInfo(@PathVariable("trackRecordId") Long trackRecordId)
{ {
...@@ -110,7 +107,6 @@ public class TGasBottleTrackRecordController extends BaseController ...@@ -110,7 +107,6 @@ public class TGasBottleTrackRecordController extends BaseController
/** /**
* 新增气瓶追溯 * 新增气瓶追溯
*/ */
@PreAuthorize("@ss.hasPermi('track:record:add')")
@Log(title = "气瓶追溯", businessType = BusinessType.INSERT) @Log(title = "气瓶追溯", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord) public AjaxResult add(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
...@@ -162,7 +158,6 @@ public class TGasBottleTrackRecordController extends BaseController ...@@ -162,7 +158,6 @@ public class TGasBottleTrackRecordController extends BaseController
/** /**
* 修改气瓶追溯 * 修改气瓶追溯
*/ */
@PreAuthorize("@ss.hasPermi('track:record:edit')")
@Log(title = "气瓶追溯", businessType = BusinessType.UPDATE) @Log(title = "气瓶追溯", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord) public AjaxResult edit(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
...@@ -173,7 +168,6 @@ public class TGasBottleTrackRecordController extends BaseController ...@@ -173,7 +168,6 @@ public class TGasBottleTrackRecordController extends BaseController
/** /**
* 删除气瓶追溯 * 删除气瓶追溯
*/ */
@PreAuthorize("@ss.hasPermi('track:record:remove')")
@Log(title = "气瓶追溯", businessType = BusinessType.DELETE) @Log(title = "气瓶追溯", businessType = BusinessType.DELETE)
@DeleteMapping("/{trackRecordIds}") @DeleteMapping("/{trackRecordIds}")
public AjaxResult remove(@PathVariable Long[] trackRecordIds) public AjaxResult remove(@PathVariable Long[] trackRecordIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasStorageStationInfoController.java
View file @ 1c05698b
...@@ -11,7 +11,6 @@ import com.zehong.system.domain.TGasStorageStationInfo; ...@@ -11,7 +11,6 @@ import com.zehong.system.domain.TGasStorageStationInfo;
import com.zehong.system.domain.TGasUserInfolins; import com.zehong.system.domain.TGasUserInfolins;
import com.zehong.system.service.ITGasStorageStationInfoService; import com.zehong.system.service.ITGasStorageStationInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -73,7 +72,6 @@ public class TGasStorageStationInfoController extends BaseController ...@@ -73,7 +72,6 @@ public class TGasStorageStationInfoController extends BaseController
/** /**
* 导出储配站信息列表 * 导出储配站信息列表
*/ */
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage::export')")
@Log(title = "储配站信息", businessType = BusinessType.EXPORT) @Log(title = "储配站信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TGasStorageStationInfo tGasStorageStationInfo) public AjaxResult export(TGasStorageStationInfo tGasStorageStationInfo)
...@@ -86,7 +84,6 @@ public class TGasStorageStationInfoController extends BaseController ...@@ -86,7 +84,6 @@ public class TGasStorageStationInfoController extends BaseController
/** /**
* 获取储配站信息详细信息 * 获取储配站信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:query')")
@GetMapping(value = "/{stationId}") @GetMapping(value = "/{stationId}")
public AjaxResult getInfo(@PathVariable("stationId") Long stationId) public AjaxResult getInfo(@PathVariable("stationId") Long stationId)
{ {
...@@ -96,7 +93,6 @@ public class TGasStorageStationInfoController extends BaseController ...@@ -96,7 +93,6 @@ public class TGasStorageStationInfoController extends BaseController
/** /**
* 新增储配站信息 * 新增储配站信息
*/ */
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:add')")
@Log(title = "储配站信息", businessType = BusinessType.INSERT) @Log(title = "储配站信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TGasStorageStationInfo tGasStorageStationInfo) public AjaxResult add(@RequestBody TGasStorageStationInfo tGasStorageStationInfo)
...@@ -107,7 +103,6 @@ public class TGasStorageStationInfoController extends BaseController ...@@ -107,7 +103,6 @@ public class TGasStorageStationInfoController extends BaseController
/** /**
* 修改储配站信息 * 修改储配站信息
*/ */
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:edit')")
@Log(title = "储配站信息", businessType = BusinessType.UPDATE) @Log(title = "储配站信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TGasStorageStationInfo tGasStorageStationInfo) public AjaxResult edit(@RequestBody TGasStorageStationInfo tGasStorageStationInfo)
...@@ -118,7 +113,6 @@ public class TGasStorageStationInfoController extends BaseController ...@@ -118,7 +113,6 @@ public class TGasStorageStationInfoController extends BaseController
/** /**
* 删除储配站信息 * 删除储配站信息
*/ */
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:remove')")
@Log(title = "储配站信息", businessType = BusinessType.DELETE) @Log(title = "储配站信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{stationIds}") @DeleteMapping("/{stationIds}")
public AjaxResult remove(@PathVariable Long[] stationIds) public AjaxResult remove(@PathVariable Long[] stationIds)
...@@ -133,7 +127,6 @@ public class TGasStorageStationInfoController extends BaseController ...@@ -133,7 +127,6 @@ public class TGasStorageStationInfoController extends BaseController
* @return * @return
* @throws Exception * @throws Exception
*/ */
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:import')")
@Log(title = "储配站维护", businessType = BusinessType.IMPORT) @Log(title = "储配站维护", businessType = BusinessType.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasUserInfoController.java
View file @ 1c05698b
...@@ -12,7 +12,6 @@ import com.zehong.system.domain.TTaskRecord; ...@@ -12,7 +12,6 @@ import com.zehong.system.domain.TTaskRecord;
import com.zehong.system.service.ITGasUserInfoService; import com.zehong.system.service.ITGasUserInfoService;
import com.zehong.system.service.ITTaskRecordService; import com.zehong.system.service.ITTaskRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -38,7 +37,6 @@ public class TGasUserInfoController extends BaseController ...@@ -38,7 +37,6 @@ public class TGasUserInfoController extends BaseController
/** /**
* 查询燃气用户列表 * 查询燃气用户列表
*/ */
@PreAuthorize("@ss.hasPermi('gasUser:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TGasUserInfo tGasUserInfo) public TableDataInfo list(TGasUserInfo tGasUserInfo)
{ {
...@@ -69,7 +67,6 @@ public class TGasUserInfoController extends BaseController ...@@ -69,7 +67,6 @@ public class TGasUserInfoController extends BaseController
/** /**
* 导出燃气用户列表 * 导出燃气用户列表
*/ */
@PreAuthorize("@ss.hasPermi('gasUser:info:export')")
@Log(title = "燃气用户", businessType = BusinessType.EXPORT) @Log(title = "燃气用户", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TGasUserInfo tGasUserInfo) public AjaxResult export(TGasUserInfo tGasUserInfo)
...@@ -82,7 +79,6 @@ public class TGasUserInfoController extends BaseController ...@@ -82,7 +79,6 @@ public class TGasUserInfoController extends BaseController
/** /**
* 获取燃气用户详细信息 * 获取燃气用户详细信息
*/ */
@PreAuthorize("@ss.hasPermi('gasUser:info:query')")
@GetMapping(value = "/{gasUserId}") @GetMapping(value = "/{gasUserId}")
public AjaxResult getInfo(@PathVariable("gasUserId") Long gasUserId) public AjaxResult getInfo(@PathVariable("gasUserId") Long gasUserId)
{ {
...@@ -136,7 +132,6 @@ public class TGasUserInfoController extends BaseController ...@@ -136,7 +132,6 @@ public class TGasUserInfoController extends BaseController
/** /**
* 新增燃气用户 * 新增燃气用户
*/ */
@PreAuthorize("@ss.hasPermi('gasUser:info:add')")
@Log(title = "燃气用户", businessType = BusinessType.INSERT) @Log(title = "燃气用户", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TGasUserInfo tGasUserInfo) public AjaxResult add(@RequestBody TGasUserInfo tGasUserInfo)
...@@ -180,7 +175,6 @@ public class TGasUserInfoController extends BaseController ...@@ -180,7 +175,6 @@ public class TGasUserInfoController extends BaseController
/** /**
* 修改燃气用户 * 修改燃气用户
*/ */
@PreAuthorize("@ss.hasPermi('gasUser:info:edit')")
@Log(title = "燃气用户", businessType = BusinessType.UPDATE) @Log(title = "燃气用户", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TGasUserInfo tGasUserInfo) public AjaxResult edit(@RequestBody TGasUserInfo tGasUserInfo)
...@@ -192,7 +186,6 @@ public class TGasUserInfoController extends BaseController ...@@ -192,7 +186,6 @@ public class TGasUserInfoController extends BaseController
/** /**
* 删除燃气用户 * 删除燃气用户
*/ */
@PreAuthorize("@ss.hasPermi('gasUser:info:remove')")
@Log(title = "燃气用户", businessType = BusinessType.DELETE) @Log(title = "燃气用户", businessType = BusinessType.DELETE)
@DeleteMapping("/{gasUserIds}") @DeleteMapping("/{gasUserIds}")
public AjaxResult remove(@PathVariable Long[] gasUserIds) public AjaxResult remove(@PathVariable Long[] gasUserIds)
...@@ -207,7 +200,6 @@ public class TGasUserInfoController extends BaseController ...@@ -207,7 +200,6 @@ public class TGasUserInfoController extends BaseController
* @return * @return
* @throws Exception * @throws Exception
*/ */
@PreAuthorize("@ss.hasPermi('gasUser:info:import')")
@Log(title = "燃气用户导入", businessType = BusinessType.IMPORT) @Log(title = "燃气用户导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TPractitionerInfoController.java
View file @ 1c05698b
...@@ -10,7 +10,6 @@ import com.zehong.common.utils.poi.ExcelUtil; ...@@ -10,7 +10,6 @@ import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.TPractitionerInfo; import com.zehong.system.domain.TPractitionerInfo;
import com.zehong.system.service.ITPractitionerInfoService; import com.zehong.system.service.ITPractitionerInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -32,7 +31,6 @@ public class TPractitionerInfoController extends BaseController ...@@ -32,7 +31,6 @@ public class TPractitionerInfoController extends BaseController
/** /**
* 查询从业人员信息列表 * 查询从业人员信息列表
*/ */
@PreAuthorize("@ss.hasPermi('practitioner:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPractitionerInfo tPractitionerInfo) public TableDataInfo list(TPractitionerInfo tPractitionerInfo)
{ {
...@@ -51,7 +49,6 @@ public class TPractitionerInfoController extends BaseController ...@@ -51,7 +49,6 @@ public class TPractitionerInfoController extends BaseController
/** /**
* 导出从业人员信息列表 * 导出从业人员信息列表
*/ */
@PreAuthorize("@ss.hasPermi('practitioner:info:export')")
@Log(title = "从业人员信息", businessType = BusinessType.EXPORT) @Log(title = "从业人员信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TPractitionerInfo tPractitionerInfo) public AjaxResult export(TPractitionerInfo tPractitionerInfo)
...@@ -79,7 +76,6 @@ public class TPractitionerInfoController extends BaseController ...@@ -79,7 +76,6 @@ public class TPractitionerInfoController extends BaseController
/** /**
* 新增从业人员信息 * 新增从业人员信息
*/ */
@PreAuthorize("@ss.hasPermi('practitioner:info:add')")
@Log(title = "从业人员信息", businessType = BusinessType.INSERT) @Log(title = "从业人员信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TPractitionerInfo tPractitionerInfo) public AjaxResult add(@RequestBody TPractitionerInfo tPractitionerInfo)
...@@ -92,7 +88,6 @@ public class TPractitionerInfoController extends BaseController ...@@ -92,7 +88,6 @@ public class TPractitionerInfoController extends BaseController
/** /**
* 修改从业人员信息 * 修改从业人员信息
*/ */
@PreAuthorize("@ss.hasPermi('practitioner:info:edit')")
@Log(title = "从业人员信息", businessType = BusinessType.UPDATE) @Log(title = "从业人员信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TPractitionerInfo tPractitionerInfo) public AjaxResult edit(@RequestBody TPractitionerInfo tPractitionerInfo)
...@@ -114,7 +109,6 @@ public class TPractitionerInfoController extends BaseController ...@@ -114,7 +109,6 @@ public class TPractitionerInfoController extends BaseController
/** /**
* 删除从业人员信息 * 删除从业人员信息
*/ */
@PreAuthorize("@ss.hasPermi('practitioner:info:remove')")
@Log(title = "从业人员信息", businessType = BusinessType.DELETE) @Log(title = "从业人员信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{practitionerIds}") @DeleteMapping("/{practitionerIds}")
public AjaxResult remove(@PathVariable Long[] practitionerIds) public AjaxResult remove(@PathVariable Long[] practitionerIds)
...@@ -129,7 +123,6 @@ public class TPractitionerInfoController extends BaseController ...@@ -129,7 +123,6 @@ public class TPractitionerInfoController extends BaseController
* @return * @return
* @throws Exception * @throws Exception
*/ */
@PreAuthorize("@ss.hasPermi('practitioner:info:import')")
@Log(title = "从业人员导入", businessType = BusinessType.IMPORT) @Log(title = "从业人员导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TSafeCheckRecordController.java
View file @ 1c05698b
...@@ -13,7 +13,6 @@ import com.zehong.system.service.ITGasUserInfoService; ...@@ -13,7 +13,6 @@ import com.zehong.system.service.ITGasUserInfoService;
import com.zehong.system.service.ITSafeCheckRecordService; import com.zehong.system.service.ITSafeCheckRecordService;
import com.zehong.system.service.ITTaskRecordService; import com.zehong.system.service.ITTaskRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.ParseException; import java.text.ParseException;
...@@ -40,7 +39,6 @@ public class TSafeCheckRecordController extends BaseController ...@@ -40,7 +39,6 @@ public class TSafeCheckRecordController extends BaseController
/** /**
* 查询安检记录列表 * 查询安检记录列表
*/ */
@PreAuthorize("@ss.hasPermi('safe:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSafeCheckRecord tSafeCheckRecord) public TableDataInfo list(TSafeCheckRecord tSafeCheckRecord)
{ {
...@@ -52,7 +50,6 @@ public class TSafeCheckRecordController extends BaseController ...@@ -52,7 +50,6 @@ public class TSafeCheckRecordController extends BaseController
/** /**
* 导出安检记录列表 * 导出安检记录列表
*/ */
@PreAuthorize("@ss.hasPermi('safe:record:export')")
@Log(title = "安检记录", businessType = BusinessType.EXPORT) @Log(title = "安检记录", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TSafeCheckRecord tSafeCheckRecord) public AjaxResult export(TSafeCheckRecord tSafeCheckRecord)
...@@ -65,7 +62,6 @@ public class TSafeCheckRecordController extends BaseController ...@@ -65,7 +62,6 @@ public class TSafeCheckRecordController extends BaseController
/** /**
* 获取安检记录详细信息 * 获取安检记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('safe:record:query')")
@GetMapping(value = "/{safeCheckId}") @GetMapping(value = "/{safeCheckId}")
public AjaxResult getInfo(@PathVariable("safeCheckId") Long safeCheckId) public AjaxResult getInfo(@PathVariable("safeCheckId") Long safeCheckId)
{ {
...@@ -136,7 +132,6 @@ public class TSafeCheckRecordController extends BaseController ...@@ -136,7 +132,6 @@ public class TSafeCheckRecordController extends BaseController
/** /**
* 修改安检记录 * 修改安检记录
*/ */
@PreAuthorize("@ss.hasPermi('safe:record:edit')")
@Log(title = "安检记录", businessType = BusinessType.UPDATE) @Log(title = "安检记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TSafeCheckRecord tSafeCheckRecord) public AjaxResult edit(@RequestBody TSafeCheckRecord tSafeCheckRecord)
...@@ -147,7 +142,6 @@ public class TSafeCheckRecordController extends BaseController ...@@ -147,7 +142,6 @@ public class TSafeCheckRecordController extends BaseController
/** /**
* 删除安检记录 * 删除安检记录
*/ */
@PreAuthorize("@ss.hasPermi('safe:record:remove')")
@Log(title = "安检记录", businessType = BusinessType.DELETE) @Log(title = "安检记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{safeCheckIds}") @DeleteMapping("/{safeCheckIds}")
public AjaxResult remove(@PathVariable Long[] safeCheckIds) public AjaxResult remove(@PathVariable Long[] safeCheckIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/message/TMessageDetailInfoController.java
View file @ 1c05698b
package com.zehong.web.controller.message; package com.zehong.web.controller.message;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TMessageDetailInfoController extends BaseController ...@@ -36,7 +35,6 @@ public class TMessageDetailInfoController extends BaseController
/** /**
* 查询消息详情列表 * 查询消息详情列表
*/ */
//@PreAuthorize("@ss.hasPermi('message:detail:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TMessageDetailInfo tMessageDetailInfo) public TableDataInfo list(TMessageDetailInfo tMessageDetailInfo)
{ {
...@@ -48,7 +46,6 @@ public class TMessageDetailInfoController extends BaseController ...@@ -48,7 +46,6 @@ public class TMessageDetailInfoController extends BaseController
/** /**
* 导出消息详情列表 * 导出消息详情列表
*/ */
//@PreAuthorize("@ss.hasPermi('message:detail:export')")
@Log(title = "消息详情", businessType = BusinessType.EXPORT) @Log(title = "消息详情", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TMessageDetailInfo tMessageDetailInfo) public AjaxResult export(TMessageDetailInfo tMessageDetailInfo)
...@@ -61,7 +58,6 @@ public class TMessageDetailInfoController extends BaseController ...@@ -61,7 +58,6 @@ public class TMessageDetailInfoController extends BaseController
/** /**
* 获取消息详情详细信息 * 获取消息详情详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('message:detail:query')")
@GetMapping(value = "/{messageDetailId}") @GetMapping(value = "/{messageDetailId}")
public AjaxResult getInfo(@PathVariable("messageDetailId") Long messageDetailId) public AjaxResult getInfo(@PathVariable("messageDetailId") Long messageDetailId)
{ {
...@@ -71,7 +67,6 @@ public class TMessageDetailInfoController extends BaseController ...@@ -71,7 +67,6 @@ public class TMessageDetailInfoController extends BaseController
/** /**
* 新增消息详情 * 新增消息详情
*/ */
//@PreAuthorize("@ss.hasPermi('message:detail:add')")
@Log(title = "消息详情", businessType = BusinessType.INSERT) @Log(title = "消息详情", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TMessageDetailInfo tMessageDetailInfo) public AjaxResult add(@RequestBody TMessageDetailInfo tMessageDetailInfo)
...@@ -82,7 +77,6 @@ public class TMessageDetailInfoController extends BaseController ...@@ -82,7 +77,6 @@ public class TMessageDetailInfoController extends BaseController
/** /**
* 修改消息详情 * 修改消息详情
*/ */
//@PreAuthorize("@ss.hasPermi('message:detail:edit')")
@Log(title = "消息详情", businessType = BusinessType.UPDATE) @Log(title = "消息详情", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TMessageDetailInfo tMessageDetailInfo) public AjaxResult edit(@RequestBody TMessageDetailInfo tMessageDetailInfo)
...@@ -93,7 +87,6 @@ public class TMessageDetailInfoController extends BaseController ...@@ -93,7 +87,6 @@ public class TMessageDetailInfoController extends BaseController
/** /**
* 删除消息详情 * 删除消息详情
*/ */
//@PreAuthorize("@ss.hasPermi('message:detail:remove')")
@Log(title = "消息详情", businessType = BusinessType.DELETE) @Log(title = "消息详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{messageDetailIds}") @DeleteMapping("/{messageDetailIds}")
public AjaxResult remove(@PathVariable Long[] messageDetailIds) public AjaxResult remove(@PathVariable Long[] messageDetailIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/message/TMessageInfoController.java
View file @ 1c05698b
...@@ -4,7 +4,6 @@ import java.util.List; ...@@ -4,7 +4,6 @@ import java.util.List;
import com.zehong.system.domain.TMessageDetailInfo; import com.zehong.system.domain.TMessageDetailInfo;
import com.zehong.system.service.ITMessageDetailInfoService; import com.zehong.system.service.ITMessageDetailInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -42,7 +41,6 @@ public class TMessageInfoController extends BaseController ...@@ -42,7 +41,6 @@ public class TMessageInfoController extends BaseController
/** /**
* 查询消息列表 * 查询消息列表
*/ */
//@PreAuthorize("@ss.hasPermi('message:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TMessageInfo tMessageInfo) public TableDataInfo list(TMessageInfo tMessageInfo)
{ {
...@@ -72,7 +70,6 @@ public class TMessageInfoController extends BaseController ...@@ -72,7 +70,6 @@ public class TMessageInfoController extends BaseController
/** /**
* 导出消息列表 * 导出消息列表
*/ */
//@PreAuthorize("@ss.hasPermi('message:info:export')")
@Log(title = "消息", businessType = BusinessType.EXPORT) @Log(title = "消息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TMessageInfo tMessageInfo) public AjaxResult export(TMessageInfo tMessageInfo)
...@@ -85,7 +82,6 @@ public class TMessageInfoController extends BaseController ...@@ -85,7 +82,6 @@ public class TMessageInfoController extends BaseController
/** /**
* 获取消息详细信息 * 获取消息详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('message:info:query')")
@GetMapping(value = "/{messageId}") @GetMapping(value = "/{messageId}")
public AjaxResult getInfo(@PathVariable("messageId") Long messageId) public AjaxResult getInfo(@PathVariable("messageId") Long messageId)
{ {
...@@ -100,7 +96,6 @@ public class TMessageInfoController extends BaseController ...@@ -100,7 +96,6 @@ public class TMessageInfoController extends BaseController
/** /**
* 新增消息 * 新增消息
*/ */
//@PreAuthorize("@ss.hasPermi('message:info:add')")
@Log(title = "消息", businessType = BusinessType.INSERT) @Log(title = "消息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TMessageInfo tMessageInfo) public AjaxResult add(@RequestBody TMessageInfo tMessageInfo)
...@@ -111,7 +106,6 @@ public class TMessageInfoController extends BaseController ...@@ -111,7 +106,6 @@ public class TMessageInfoController extends BaseController
/** /**
* 修改消息 * 修改消息
*/ */
//@PreAuthorize("@ss.hasPermi('message:info:edit')")
@Log(title = "消息", businessType = BusinessType.UPDATE) @Log(title = "消息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TMessageInfo tMessageInfo) public AjaxResult edit(@RequestBody TMessageInfo tMessageInfo)
...@@ -122,7 +116,6 @@ public class TMessageInfoController extends BaseController ...@@ -122,7 +116,6 @@ public class TMessageInfoController extends BaseController
/** /**
* 删除消息 * 删除消息
*/ */
//@PreAuthorize("@ss.hasPermi('message:info:remove')")
@Log(title = "消息", businessType = BusinessType.DELETE) @Log(title = "消息", businessType = BusinessType.DELETE)
@DeleteMapping("/{messageIds}") @DeleteMapping("/{messageIds}")
public AjaxResult remove(@PathVariable Long[] messageIds) public AjaxResult remove(@PathVariable Long[] messageIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/monitor/CacheController.java
View file @ 1c05698b
...@@ -27,7 +27,6 @@ public class CacheController ...@@ -27,7 +27,6 @@ public class CacheController
@Autowired @Autowired
private RedisTemplate<String, String> redisTemplate; private RedisTemplate<String, String> redisTemplate;
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping() @GetMapping()
public AjaxResult getInfo() throws Exception public AjaxResult getInfo() throws Exception
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/monitor/ServerController.java
View file @ 1c05698b
...@@ -16,7 +16,6 @@ import com.zehong.framework.web.domain.Server; ...@@ -16,7 +16,6 @@ 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')")
@GetMapping() @GetMapping()
public AjaxResult getInfo() throws Exception public AjaxResult getInfo() throws Exception
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/monitor/SysLogininforController.java
View file @ 1c05698b
...@@ -29,7 +29,6 @@ public class SysLogininforController extends BaseController ...@@ -29,7 +29,6 @@ public class SysLogininforController extends BaseController
@Autowired @Autowired
private ISysLogininforService logininforService; private ISysLogininforService logininforService;
@PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor) public TableDataInfo list(SysLogininfor logininfor)
{ {
...@@ -39,7 +38,6 @@ public class SysLogininforController extends BaseController ...@@ -39,7 +38,6 @@ public class SysLogininforController extends BaseController
} }
@Log(title = "登录日志", businessType = BusinessType.EXPORT) @Log(title = "登录日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysLogininfor logininfor) public AjaxResult export(SysLogininfor logininfor)
{ {
...@@ -48,7 +46,6 @@ public class SysLogininforController extends BaseController ...@@ -48,7 +46,6 @@ public class SysLogininforController extends BaseController
return util.exportExcel(list, "登录日志"); return util.exportExcel(list, "登录日志");
} }
@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 +53,6 @@ public class SysLogininforController extends BaseController ...@@ -56,7 +53,6 @@ public class SysLogininforController extends BaseController
return toAjax(logininforService.deleteLogininforByIds(infoIds)); return toAjax(logininforService.deleteLogininforByIds(infoIds));
} }
@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()
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/monitor/SysOperlogController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.web.controller.monitor; ...@@ -2,7 +2,6 @@ package com.zehong.web.controller.monitor;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -29,7 +28,6 @@ public class SysOperlogController extends BaseController ...@@ -29,7 +28,6 @@ public class SysOperlogController extends BaseController
@Autowired @Autowired
private ISysOperLogService operLogService; private ISysOperLogService operLogService;
@PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysOperLog operLog) public TableDataInfo list(SysOperLog operLog)
{ {
...@@ -39,7 +37,6 @@ public class SysOperlogController extends BaseController ...@@ -39,7 +37,6 @@ public class SysOperlogController extends BaseController
} }
@Log(title = "操作日志", businessType = BusinessType.EXPORT) @Log(title = "操作日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysOperLog operLog) public AjaxResult export(SysOperLog operLog)
{ {
...@@ -49,7 +46,6 @@ public class SysOperlogController extends BaseController ...@@ -49,7 +46,6 @@ public class SysOperlogController extends BaseController
} }
@Log(title = "操作日志", businessType = BusinessType.DELETE) @Log(title = "操作日志", businessType = BusinessType.DELETE)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/{operIds}") @DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds) public AjaxResult remove(@PathVariable Long[] operIds)
{ {
...@@ -57,7 +53,6 @@ public class SysOperlogController extends BaseController ...@@ -57,7 +53,6 @@ public class SysOperlogController extends BaseController
} }
@Log(title = "操作日志", businessType = BusinessType.CLEAN) @Log(title = "操作日志", businessType = BusinessType.CLEAN)
@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() public AjaxResult clean()
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/monitor/SysUserOnlineController.java
View file @ 1c05698b
...@@ -5,7 +5,6 @@ import java.util.Collection; ...@@ -5,7 +5,6 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -38,7 +37,6 @@ public class SysUserOnlineController extends BaseController ...@@ -38,7 +37,6 @@ public class SysUserOnlineController extends BaseController
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@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 +79,6 @@ public class SysUserOnlineController extends BaseController ...@@ -81,7 +79,6 @@ public class SysUserOnlineController extends BaseController
/** /**
* 强退用户 * 强退用户
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TDetectorReportDataController.java
View file @ 1c05698b
...@@ -3,7 +3,6 @@ package com.zehong.web.controller.operationMonitor; ...@@ -3,7 +3,6 @@ package com.zehong.web.controller.operationMonitor;
import java.util.List; import java.util.List;
import com.zehong.system.domain.form.TDetectorReportDataQueryForm; import com.zehong.system.domain.form.TDetectorReportDataQueryForm;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -38,7 +37,6 @@ public class TDetectorReportDataController extends BaseController ...@@ -38,7 +37,6 @@ public class TDetectorReportDataController extends BaseController
/** /**
* 查询燃气用户设备上报的数据列表 * 查询燃气用户设备上报的数据列表
*/ */
@PreAuthorize("@ss.hasPermi('detector:detectorReportData:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDetectorReportDataQueryForm tDetectorReportDataQueryForm) public TableDataInfo list(TDetectorReportDataQueryForm tDetectorReportDataQueryForm)
{ {
...@@ -50,7 +48,6 @@ public class TDetectorReportDataController extends BaseController ...@@ -50,7 +48,6 @@ public class TDetectorReportDataController extends BaseController
/** /**
* 导出燃气用户设备上报的数据列表 * 导出燃气用户设备上报的数据列表
*/ */
@PreAuthorize("@ss.hasPermi('detector:detectorReportData:export')")
@Log(title = "燃气用户设备上报的数据", businessType = BusinessType.EXPORT) @Log(title = "燃气用户设备上报的数据", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDetectorReportDataQueryForm tDetectorReportDataQueryForm) public AjaxResult export(TDetectorReportDataQueryForm tDetectorReportDataQueryForm)
...@@ -63,7 +60,6 @@ public class TDetectorReportDataController extends BaseController ...@@ -63,7 +60,6 @@ public class TDetectorReportDataController extends BaseController
/** /**
* 获取燃气用户设备上报的数据详细信息 * 获取燃气用户设备上报的数据详细信息
*/ */
@PreAuthorize("@ss.hasPermi('detector:detectorReportData:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -73,7 +69,6 @@ public class TDetectorReportDataController extends BaseController ...@@ -73,7 +69,6 @@ public class TDetectorReportDataController extends BaseController
/** /**
* 新增燃气用户设备上报的数据 * 新增燃气用户设备上报的数据
*/ */
@PreAuthorize("@ss.hasPermi('detector:detectorReportData:add')")
@Log(title = "燃气用户设备上报的数据", businessType = BusinessType.INSERT) @Log(title = "燃气用户设备上报的数据", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TDetectorReportData tDetectorReportData) public AjaxResult add(@RequestBody TDetectorReportData tDetectorReportData)
...@@ -84,7 +79,6 @@ public class TDetectorReportDataController extends BaseController ...@@ -84,7 +79,6 @@ public class TDetectorReportDataController extends BaseController
/** /**
* 修改燃气用户设备上报的数据 * 修改燃气用户设备上报的数据
*/ */
@PreAuthorize("@ss.hasPermi('detector:detectorReportData:edit')")
@Log(title = "燃气用户设备上报的数据", businessType = BusinessType.UPDATE) @Log(title = "燃气用户设备上报的数据", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDetectorReportData tDetectorReportData) public AjaxResult edit(@RequestBody TDetectorReportData tDetectorReportData)
...@@ -95,7 +89,6 @@ public class TDetectorReportDataController extends BaseController ...@@ -95,7 +89,6 @@ public class TDetectorReportDataController extends BaseController
/** /**
* 删除燃气用户设备上报的数据 * 删除燃气用户设备上报的数据
*/ */
@PreAuthorize("@ss.hasPermi('detector:detectorReportData: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TDeviceReportDataController.java
View file @ 1c05698b
package com.zehong.web.controller.operationMonitor; package com.zehong.web.controller.operationMonitor;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TDeviceReportDataController extends BaseController ...@@ -36,7 +35,6 @@ public class TDeviceReportDataController extends BaseController
/** /**
* 查询设备监控列表 * 查询设备监控列表
*/ */
@PreAuthorize("@ss.hasPermi('system:data:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDeviceReportData tDeviceReportData) public TableDataInfo list(TDeviceReportData tDeviceReportData)
{ {
...@@ -48,7 +46,6 @@ public class TDeviceReportDataController extends BaseController ...@@ -48,7 +46,6 @@ public class TDeviceReportDataController extends BaseController
/** /**
* 导出设备监控列表 * 导出设备监控列表
*/ */
@PreAuthorize("@ss.hasPermi('system:data:export')")
@Log(title = "设备监控", businessType = BusinessType.EXPORT) @Log(title = "设备监控", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDeviceReportData tDeviceReportData) public AjaxResult export(TDeviceReportData tDeviceReportData)
...@@ -61,7 +58,6 @@ public class TDeviceReportDataController extends BaseController ...@@ -61,7 +58,6 @@ public class TDeviceReportDataController extends BaseController
/** /**
* 获取设备监控详细信息 * 获取设备监控详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:data:query')")
@GetMapping(value = "/{deviceReportDataId}") @GetMapping(value = "/{deviceReportDataId}")
public AjaxResult getInfo(@PathVariable("deviceReportDataId") Long deviceReportDataId) public AjaxResult getInfo(@PathVariable("deviceReportDataId") Long deviceReportDataId)
{ {
...@@ -71,7 +67,6 @@ public class TDeviceReportDataController extends BaseController ...@@ -71,7 +67,6 @@ public class TDeviceReportDataController extends BaseController
/** /**
* 新增设备监控 * 新增设备监控
*/ */
@PreAuthorize("@ss.hasPermi('system:data:add')")
@Log(title = "设备监控", businessType = BusinessType.INSERT) @Log(title = "设备监控", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TDeviceReportData tDeviceReportData) public AjaxResult add(@RequestBody TDeviceReportData tDeviceReportData)
...@@ -82,7 +77,6 @@ public class TDeviceReportDataController extends BaseController ...@@ -82,7 +77,6 @@ public class TDeviceReportDataController extends BaseController
/** /**
* 修改设备监控 * 修改设备监控
*/ */
@PreAuthorize("@ss.hasPermi('system:data:edit')")
@Log(title = "设备监控", businessType = BusinessType.UPDATE) @Log(title = "设备监控", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDeviceReportData tDeviceReportData) public AjaxResult edit(@RequestBody TDeviceReportData tDeviceReportData)
...@@ -93,7 +87,6 @@ public class TDeviceReportDataController extends BaseController ...@@ -93,7 +87,6 @@ public class TDeviceReportDataController extends BaseController
/** /**
* 删除设备监控 * 删除设备监控
*/ */
@PreAuthorize("@ss.hasPermi('system:data:remove')")
@Log(title = "设备监控", businessType = BusinessType.DELETE) @Log(title = "设备监控", businessType = BusinessType.DELETE)
@DeleteMapping("/{deviceReportDataIds}") @DeleteMapping("/{deviceReportDataIds}")
public AjaxResult remove(@PathVariable Long[] deviceReportDataIds) public AjaxResult remove(@PathVariable Long[] deviceReportDataIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/THiddenTroubleInfoController.java
View file @ 1c05698b
package com.zehong.web.controller.operationMonitor; package com.zehong.web.controller.operationMonitor;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class THiddenTroubleInfoController extends BaseController ...@@ -36,7 +35,6 @@ public class THiddenTroubleInfoController extends BaseController
/** /**
* 查询燃气隐患列表 * 查询燃气隐患列表
*/ */
@PreAuthorize("@ss.hasPermi('system:hidden:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(THiddenTroubleInfo tHiddenTroubleInfo) public TableDataInfo list(THiddenTroubleInfo tHiddenTroubleInfo)
{ {
...@@ -53,7 +51,6 @@ public class THiddenTroubleInfoController extends BaseController ...@@ -53,7 +51,6 @@ public class THiddenTroubleInfoController extends BaseController
/** /**
* 导出燃气隐患列表 * 导出燃气隐患列表
*/ */
@PreAuthorize("@ss.hasPermi('system:hidden:export')")
@Log(title = "燃气隐患", businessType = BusinessType.EXPORT) @Log(title = "燃气隐患", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(THiddenTroubleInfo tHiddenTroubleInfo) public AjaxResult export(THiddenTroubleInfo tHiddenTroubleInfo)
...@@ -66,7 +63,6 @@ public class THiddenTroubleInfoController extends BaseController ...@@ -66,7 +63,6 @@ public class THiddenTroubleInfoController extends BaseController
/** /**
* 获取燃气隐患详细信息 * 获取燃气隐患详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:hidden:query')")
@GetMapping(value = "/{hiddenTroubleId}") @GetMapping(value = "/{hiddenTroubleId}")
public AjaxResult getInfo(@PathVariable("hiddenTroubleId") Long hiddenTroubleId) public AjaxResult getInfo(@PathVariable("hiddenTroubleId") Long hiddenTroubleId)
{ {
...@@ -76,7 +72,6 @@ public class THiddenTroubleInfoController extends BaseController ...@@ -76,7 +72,6 @@ public class THiddenTroubleInfoController extends BaseController
/** /**
* 新增燃气隐患 * 新增燃气隐患
*/ */
@PreAuthorize("@ss.hasPermi('system:hidden:add')")
@Log(title = "燃气隐患", businessType = BusinessType.INSERT) @Log(title = "燃气隐患", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo) public AjaxResult add(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo)
...@@ -87,7 +82,6 @@ public class THiddenTroubleInfoController extends BaseController ...@@ -87,7 +82,6 @@ public class THiddenTroubleInfoController extends BaseController
/** /**
* 修改燃气隐患 * 修改燃气隐患
*/ */
@PreAuthorize("@ss.hasPermi('system:hidden:edit')")
@Log(title = "燃气隐患", businessType = BusinessType.UPDATE) @Log(title = "燃气隐患", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo) public AjaxResult edit(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo)
...@@ -98,7 +92,6 @@ public class THiddenTroubleInfoController extends BaseController ...@@ -98,7 +92,6 @@ public class THiddenTroubleInfoController extends BaseController
/** /**
* 删除燃气隐患 * 删除燃气隐患
*/ */
@PreAuthorize("@ss.hasPermi('system:hidden:remove')")
@Log(title = "燃气隐患", businessType = BusinessType.DELETE) @Log(title = "燃气隐患", businessType = BusinessType.DELETE)
@DeleteMapping("/{hiddenTroubleIds}") @DeleteMapping("/{hiddenTroubleIds}")
public AjaxResult remove(@PathVariable Long[] hiddenTroubleIds) public AjaxResult remove(@PathVariable Long[] hiddenTroubleIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TSupervisorInfoController.java
View file @ 1c05698b
package com.zehong.web.controller.operationMonitor; package com.zehong.web.controller.operationMonitor;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TSupervisorInfoController extends BaseController ...@@ -36,7 +35,6 @@ public class TSupervisorInfoController extends BaseController
/** /**
* 查询燃气督办列表 * 查询燃气督办列表
*/ */
@PreAuthorize("@ss.hasPermi('supervisor:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSupervisorInfo tSupervisorInfo) public TableDataInfo list(TSupervisorInfo tSupervisorInfo)
{ {
...@@ -59,7 +57,6 @@ public class TSupervisorInfoController extends BaseController ...@@ -59,7 +57,6 @@ public class TSupervisorInfoController extends BaseController
/** /**
* 导出燃气督办列表 * 导出燃气督办列表
*/ */
@PreAuthorize("@ss.hasPermi('supervisor:info:export')")
@Log(title = "燃气督办", businessType = BusinessType.EXPORT) @Log(title = "燃气督办", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TSupervisorInfo tSupervisorInfo) public AjaxResult export(TSupervisorInfo tSupervisorInfo)
...@@ -72,7 +69,6 @@ public class TSupervisorInfoController extends BaseController ...@@ -72,7 +69,6 @@ public class TSupervisorInfoController extends BaseController
/** /**
* 获取燃气督办详细信息 * 获取燃气督办详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervisor:info:query')")
@GetMapping(value = "/{supervisorId}") @GetMapping(value = "/{supervisorId}")
public AjaxResult getInfo(@PathVariable("supervisorId") Long supervisorId) public AjaxResult getInfo(@PathVariable("supervisorId") Long supervisorId)
{ {
...@@ -82,7 +78,6 @@ public class TSupervisorInfoController extends BaseController ...@@ -82,7 +78,6 @@ public class TSupervisorInfoController extends BaseController
/** /**
* 新增燃气督办 * 新增燃气督办
*/ */
@PreAuthorize("@ss.hasPermi('supervisor:info:add')")
@Log(title = "燃气督办", businessType = BusinessType.INSERT) @Log(title = "燃气督办", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TSupervisorInfo tSupervisorInfo) public AjaxResult add(@RequestBody TSupervisorInfo tSupervisorInfo)
...@@ -93,7 +88,6 @@ public class TSupervisorInfoController extends BaseController ...@@ -93,7 +88,6 @@ public class TSupervisorInfoController extends BaseController
/** /**
* 修改燃气督办 * 修改燃气督办
*/ */
@PreAuthorize("@ss.hasPermi('supervisor:info:edit')")
@Log(title = "燃气督办", businessType = BusinessType.UPDATE) @Log(title = "燃气督办", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TSupervisorInfo tSupervisorInfo) public AjaxResult edit(@RequestBody TSupervisorInfo tSupervisorInfo)
...@@ -104,7 +98,6 @@ public class TSupervisorInfoController extends BaseController ...@@ -104,7 +98,6 @@ public class TSupervisorInfoController extends BaseController
/** /**
* 删除燃气督办 * 删除燃气督办
*/ */
@PreAuthorize("@ss.hasPermi('supervisor:info:remove')")
@Log(title = "燃气督办", businessType = BusinessType.DELETE) @Log(title = "燃气督办", businessType = BusinessType.DELETE)
@DeleteMapping("/{supervisorIds}") @DeleteMapping("/{supervisorIds}")
public AjaxResult remove(@PathVariable Long[] supervisorIds) public AjaxResult remove(@PathVariable Long[] supervisorIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TVehicleInfoController.java
View file @ 1c05698b
...@@ -5,7 +5,6 @@ import java.util.List; ...@@ -5,7 +5,6 @@ import java.util.List;
import com.zehong.system.domain.TVehicleLocationInfo; import com.zehong.system.domain.TVehicleLocationInfo;
import com.zehong.system.service.ITVehicleLocationInfoService; import com.zehong.system.service.ITVehicleLocationInfoService;
import io.jsonwebtoken.lang.Collections; import io.jsonwebtoken.lang.Collections;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.zehong.common.annotation.Log; import com.zehong.common.annotation.Log;
...@@ -39,7 +38,6 @@ public class TVehicleInfoController extends BaseController ...@@ -39,7 +38,6 @@ public class TVehicleInfoController extends BaseController
/** /**
* 查询燃气车辆信息列表 * 查询燃气车辆信息列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:vehicleInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TVehicleInfo tVehicleInfo) public TableDataInfo list(TVehicleInfo tVehicleInfo)
{ {
...@@ -73,7 +71,6 @@ public class TVehicleInfoController extends BaseController ...@@ -73,7 +71,6 @@ public class TVehicleInfoController extends BaseController
/** /**
* 导出燃气车辆信息列表 * 导出燃气车辆信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:export')")
@Log(title = "燃气车辆信息", businessType = BusinessType.EXPORT) @Log(title = "燃气车辆信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TVehicleInfo tVehicleInfo) public AjaxResult export(TVehicleInfo tVehicleInfo)
...@@ -88,7 +85,6 @@ public class TVehicleInfoController extends BaseController ...@@ -88,7 +85,6 @@ public class TVehicleInfoController extends BaseController
/** /**
* 获取燃气车辆信息详细信息 * 获取燃气车辆信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:query')")
@GetMapping(value = "/{vehicleId}") @GetMapping(value = "/{vehicleId}")
public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId) public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId)
{ {
...@@ -98,7 +94,6 @@ public class TVehicleInfoController extends BaseController ...@@ -98,7 +94,6 @@ public class TVehicleInfoController extends BaseController
/** /**
* 新增燃气车辆信息 * 新增燃气车辆信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:add')")
@Log(title = "燃气车辆信息", businessType = BusinessType.INSERT) @Log(title = "燃气车辆信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo) public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo)
...@@ -109,7 +104,6 @@ public class TVehicleInfoController extends BaseController ...@@ -109,7 +104,6 @@ public class TVehicleInfoController extends BaseController
/** /**
* 修改燃气车辆信息 * 修改燃气车辆信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:edit')")
@Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE) @Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo) public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo)
...@@ -120,7 +114,6 @@ public class TVehicleInfoController extends BaseController ...@@ -120,7 +114,6 @@ public class TVehicleInfoController extends BaseController
/** /**
* 删除燃气车辆信息 * 删除燃气车辆信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:remove')")
@Log(title = "燃气车辆信息", businessType = BusinessType.DELETE) @Log(title = "燃气车辆信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleIds}") @DeleteMapping("/{vehicleIds}")
public AjaxResult remove(@PathVariable Long[] vehicleIds) public AjaxResult remove(@PathVariable Long[] vehicleIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TVehicleLocationInfoController.java
View file @ 1c05698b
...@@ -9,7 +9,6 @@ import com.zehong.common.utils.poi.ExcelUtil; ...@@ -9,7 +9,6 @@ import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.TVehicleLocationInfo; import com.zehong.system.domain.TVehicleLocationInfo;
import com.zehong.system.service.ITVehicleLocationInfoService; import com.zehong.system.service.ITVehicleLocationInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
...@@ -30,7 +29,6 @@ public class TVehicleLocationInfoController extends BaseController ...@@ -30,7 +29,6 @@ public class TVehicleLocationInfoController extends BaseController
/** /**
* 查询燃气车辆位置信息列表 * 查询燃气车辆位置信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TVehicleLocationInfo tVehicleLocationInfo) public TableDataInfo list(TVehicleLocationInfo tVehicleLocationInfo)
{ {
...@@ -52,7 +50,6 @@ public class TVehicleLocationInfoController extends BaseController ...@@ -52,7 +50,6 @@ public class TVehicleLocationInfoController extends BaseController
/** /**
* 导出燃气车辆位置信息列表 * 导出燃气车辆位置信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:export')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.EXPORT) @Log(title = "燃气车辆位置信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TVehicleLocationInfo tVehicleLocationInfo) public AjaxResult export(TVehicleLocationInfo tVehicleLocationInfo)
...@@ -65,7 +62,6 @@ public class TVehicleLocationInfoController extends BaseController ...@@ -65,7 +62,6 @@ public class TVehicleLocationInfoController extends BaseController
/** /**
* 获取燃气车辆位置信息详细信息 * 获取燃气车辆位置信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:query')")
@GetMapping(value = "/{vehicleLocationId}") @GetMapping(value = "/{vehicleLocationId}")
public AjaxResult getInfo(@PathVariable("vehicleLocationId") Long vehicleLocationId) public AjaxResult getInfo(@PathVariable("vehicleLocationId") Long vehicleLocationId)
{ {
...@@ -75,7 +71,6 @@ public class TVehicleLocationInfoController extends BaseController ...@@ -75,7 +71,6 @@ public class TVehicleLocationInfoController extends BaseController
/** /**
* 新增燃气车辆位置信息 * 新增燃气车辆位置信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:add')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.INSERT) @Log(title = "燃气车辆位置信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TVehicleLocationInfo tVehicleLocationInfo) public AjaxResult add(@RequestBody TVehicleLocationInfo tVehicleLocationInfo)
...@@ -86,7 +81,6 @@ public class TVehicleLocationInfoController extends BaseController ...@@ -86,7 +81,6 @@ public class TVehicleLocationInfoController extends BaseController
/** /**
* 修改燃气车辆位置信息 * 修改燃气车辆位置信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:edit')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.UPDATE) @Log(title = "燃气车辆位置信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TVehicleLocationInfo tVehicleLocationInfo) public AjaxResult edit(@RequestBody TVehicleLocationInfo tVehicleLocationInfo)
...@@ -97,7 +91,6 @@ public class TVehicleLocationInfoController extends BaseController ...@@ -97,7 +91,6 @@ public class TVehicleLocationInfoController extends BaseController
/** /**
* 删除燃气车辆位置信息 * 删除燃气车辆位置信息
*/ */
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:remove')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.DELETE) @Log(title = "燃气车辆位置信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleLocationIds}") @DeleteMapping("/{vehicleLocationIds}")
public AjaxResult remove(@PathVariable Long[] vehicleLocationIds) public AjaxResult remove(@PathVariable Long[] vehicleLocationIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TWorkOrderController.java
View file @ 1c05698b
...@@ -9,7 +9,6 @@ import com.zehong.common.core.page.TableDataInfo; ...@@ -9,7 +9,6 @@ import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType; import com.zehong.common.enums.BusinessType;
import com.zehong.common.utils.SecurityUtils; import com.zehong.common.utils.SecurityUtils;
import com.zehong.common.utils.ServletUtils; import com.zehong.common.utils.ServletUtils;
import com.zehong.common.utils.StringUtils;
import com.zehong.common.utils.poi.ExcelUtil; import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.framework.web.service.TokenService; import com.zehong.framework.web.service.TokenService;
import com.zehong.system.domain.*; import com.zehong.system.domain.*;
...@@ -17,13 +16,8 @@ import com.zehong.system.service.ISysPostService; ...@@ -17,13 +16,8 @@ import com.zehong.system.service.ISysPostService;
import com.zehong.system.service.ITHiddenTroubleInfoService; import com.zehong.system.service.ITHiddenTroubleInfoService;
import com.zehong.system.service.ITSupervisorInfoService; import com.zehong.system.service.ITSupervisorInfoService;
import com.zehong.system.service.ITWorkOrderService; import com.zehong.system.service.ITWorkOrderService;
import com.zehong.system.service.impl.TSupervisorInfoServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.xml.stream.Location;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -55,7 +49,6 @@ public class TWorkOrderController extends BaseController ...@@ -55,7 +49,6 @@ public class TWorkOrderController extends BaseController
/** /**
* 查询燃气任务列表 * 查询燃气任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:order:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TWorkOrder tWorkOrder) public TableDataInfo list(TWorkOrder tWorkOrder)
{ {
...@@ -84,7 +77,6 @@ public class TWorkOrderController extends BaseController ...@@ -84,7 +77,6 @@ public class TWorkOrderController extends BaseController
/** /**
* 导出燃气任务列表 * 导出燃气任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:order:export')")
@Log(title = "燃气任务", businessType = BusinessType.EXPORT) @Log(title = "燃气任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TWorkOrder tWorkOrder) public AjaxResult export(TWorkOrder tWorkOrder)
...@@ -120,7 +112,6 @@ public class TWorkOrderController extends BaseController ...@@ -120,7 +112,6 @@ public class TWorkOrderController extends BaseController
/** /**
* 获取燃气任务详细信息 * 获取燃气任务详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:order:query')")
@GetMapping(value = "/{workId}") @GetMapping(value = "/{workId}")
public AjaxResult getInfo(@PathVariable("workId") Long workId) public AjaxResult getInfo(@PathVariable("workId") Long workId)
{ {
...@@ -130,7 +121,6 @@ public class TWorkOrderController extends BaseController ...@@ -130,7 +121,6 @@ public class TWorkOrderController extends BaseController
/** /**
* 新增燃气任务 * 新增燃气任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:order:add')")
@Log(title = "燃气任务", businessType = BusinessType.INSERT) @Log(title = "燃气任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TWorkOrder tWorkOrder) public AjaxResult add(@RequestBody TWorkOrder tWorkOrder)
...@@ -153,7 +143,6 @@ public class TWorkOrderController extends BaseController ...@@ -153,7 +143,6 @@ public class TWorkOrderController extends BaseController
/** /**
* 修改燃气任务 * 修改燃气任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:order:edit')")
@Log(title = "燃气任务", businessType = BusinessType.UPDATE) @Log(title = "燃气任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TWorkOrder tWorkOrder) public AjaxResult edit(@RequestBody TWorkOrder tWorkOrder)
...@@ -170,7 +159,6 @@ public class TWorkOrderController extends BaseController ...@@ -170,7 +159,6 @@ public class TWorkOrderController extends BaseController
/** /**
* 删除燃气任务 * 删除燃气任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:order: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/specialist/FProBehInforBrowseController.java
View file @ 1c05698b
package com.zehong.web.controller.specialist; package com.zehong.web.controller.specialist;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class FProBehInforBrowseController extends BaseController ...@@ -36,7 +35,6 @@ public class FProBehInforBrowseController extends BaseController
/** /**
* 查询行业专家库-专家行为浏览列表 * 查询行业专家库-专家行为浏览列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behBrowse:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(FProBehInforBrowse fProBehInforBrowse) public TableDataInfo list(FProBehInforBrowse fProBehInforBrowse)
{ {
...@@ -48,7 +46,6 @@ public class FProBehInforBrowseController extends BaseController ...@@ -48,7 +46,6 @@ public class FProBehInforBrowseController extends BaseController
/** /**
* 导出行业专家库-专家行为浏览列表 * 导出行业专家库-专家行为浏览列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behBrowse:export')")
@Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.EXPORT) @Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(FProBehInforBrowse fProBehInforBrowse) public AjaxResult export(FProBehInforBrowse fProBehInforBrowse)
...@@ -61,7 +58,6 @@ public class FProBehInforBrowseController extends BaseController ...@@ -61,7 +58,6 @@ public class FProBehInforBrowseController extends BaseController
/** /**
* 获取行业专家库-专家行为浏览详细信息 * 获取行业专家库-专家行为浏览详细信息
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behBrowse:query')")
@GetMapping(value = "/{fProBehInforId}") @GetMapping(value = "/{fProBehInforId}")
public AjaxResult getInfo(@PathVariable("fProBehInforId") Long fProBehInforId) public AjaxResult getInfo(@PathVariable("fProBehInforId") Long fProBehInforId)
{ {
...@@ -71,7 +67,6 @@ public class FProBehInforBrowseController extends BaseController ...@@ -71,7 +67,6 @@ public class FProBehInforBrowseController extends BaseController
/** /**
* 新增行业专家库-专家行为浏览 * 新增行业专家库-专家行为浏览
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behBrowse:add')")
@Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.INSERT) @Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody FProBehInforBrowse fProBehInforBrowse) public AjaxResult add(@RequestBody FProBehInforBrowse fProBehInforBrowse)
...@@ -82,7 +77,6 @@ public class FProBehInforBrowseController extends BaseController ...@@ -82,7 +77,6 @@ public class FProBehInforBrowseController extends BaseController
/** /**
* 修改行业专家库-专家行为浏览 * 修改行业专家库-专家行为浏览
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behBrowse:edit')")
@Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.UPDATE) @Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody FProBehInforBrowse fProBehInforBrowse) public AjaxResult edit(@RequestBody FProBehInforBrowse fProBehInforBrowse)
...@@ -93,7 +87,6 @@ public class FProBehInforBrowseController extends BaseController ...@@ -93,7 +87,6 @@ public class FProBehInforBrowseController extends BaseController
/** /**
* 删除行业专家库-专家行为浏览 * 删除行业专家库-专家行为浏览
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behBrowse:remove')")
@Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.DELETE) @Log(title = "行业专家库-专家行为浏览", businessType = BusinessType.DELETE)
@DeleteMapping("/{fProBehInforIds}") @DeleteMapping("/{fProBehInforIds}")
public AjaxResult remove(@PathVariable Long[] fProBehInforIds) public AjaxResult remove(@PathVariable Long[] fProBehInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/specialist/FProBehInforController.java
View file @ 1c05698b
package com.zehong.web.controller.specialist; package com.zehong.web.controller.specialist;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class FProBehInforController extends BaseController ...@@ -36,7 +35,6 @@ public class FProBehInforController extends BaseController
/** /**
* 查询行业专家库-专家行为申报列表 * 查询行业专家库-专家行为申报列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(FProBehInfor fProBehInfor) public TableDataInfo list(FProBehInfor fProBehInfor)
{ {
...@@ -48,7 +46,6 @@ public class FProBehInforController extends BaseController ...@@ -48,7 +46,6 @@ public class FProBehInforController extends BaseController
/** /**
* 导出行业专家库-专家行为申报列表 * 导出行业专家库-专家行为申报列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behInfo:export')")
@Log(title = "行业专家库-专家行为申报", businessType = BusinessType.EXPORT) @Log(title = "行业专家库-专家行为申报", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(FProBehInfor fProBehInfor) public AjaxResult export(FProBehInfor fProBehInfor)
...@@ -61,7 +58,6 @@ public class FProBehInforController extends BaseController ...@@ -61,7 +58,6 @@ public class FProBehInforController extends BaseController
/** /**
* 获取行业专家库-专家行为申报详细信息 * 获取行业专家库-专家行为申报详细信息
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behInfo:query')")
@GetMapping(value = "/{fProBehInforId}") @GetMapping(value = "/{fProBehInforId}")
public AjaxResult getInfo(@PathVariable("fProBehInforId") Long fProBehInforId) public AjaxResult getInfo(@PathVariable("fProBehInforId") Long fProBehInforId)
{ {
...@@ -71,7 +67,6 @@ public class FProBehInforController extends BaseController ...@@ -71,7 +67,6 @@ public class FProBehInforController extends BaseController
/** /**
* 新增行业专家库-专家行为申报 * 新增行业专家库-专家行为申报
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behInfo:add')")
@Log(title = "行业专家库-专家行为申报", businessType = BusinessType.INSERT) @Log(title = "行业专家库-专家行为申报", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody FProBehInfor fProBehInfor) public AjaxResult add(@RequestBody FProBehInfor fProBehInfor)
...@@ -82,7 +77,6 @@ public class FProBehInforController extends BaseController ...@@ -82,7 +77,6 @@ public class FProBehInforController extends BaseController
/** /**
* 修改行业专家库-专家行为申报 * 修改行业专家库-专家行为申报
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behInfo:edit')")
@Log(title = "行业专家库-专家行为申报", businessType = BusinessType.UPDATE) @Log(title = "行业专家库-专家行为申报", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody FProBehInfor fProBehInfor) public AjaxResult edit(@RequestBody FProBehInfor fProBehInfor)
...@@ -93,7 +87,6 @@ public class FProBehInforController extends BaseController ...@@ -93,7 +87,6 @@ public class FProBehInforController extends BaseController
/** /**
* 删除行业专家库-专家行为申报 * 删除行业专家库-专家行为申报
*/ */
@PreAuthorize("@ss.hasPermi('specialist:behInfo:remove')")
@Log(title = "行业专家库-专家行为申报", businessType = BusinessType.DELETE) @Log(title = "行业专家库-专家行为申报", businessType = BusinessType.DELETE)
@DeleteMapping("/{fProBehInforIds}") @DeleteMapping("/{fProBehInforIds}")
public AjaxResult remove(@PathVariable Long[] fProBehInforIds) public AjaxResult remove(@PathVariable Long[] fProBehInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/specialist/TProAppInforBrowseController.java
View file @ 1c05698b
package com.zehong.web.controller.specialist; package com.zehong.web.controller.specialist;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TProAppInforBrowseController extends BaseController ...@@ -36,7 +35,6 @@ public class TProAppInforBrowseController extends BaseController
/** /**
* 查询行业专家库-专家库浏览列表 * 查询行业专家库-专家库浏览列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:browse:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TProAppInforBrowse tProAppInforBrowse) public TableDataInfo list(TProAppInforBrowse tProAppInforBrowse)
{ {
...@@ -48,7 +46,6 @@ public class TProAppInforBrowseController extends BaseController ...@@ -48,7 +46,6 @@ public class TProAppInforBrowseController extends BaseController
/** /**
* 导出行业专家库-专家库浏览列表 * 导出行业专家库-专家库浏览列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:browse:export')")
@Log(title = "行业专家库-专家库浏览", businessType = BusinessType.EXPORT) @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TProAppInforBrowse tProAppInforBrowse) public AjaxResult export(TProAppInforBrowse tProAppInforBrowse)
...@@ -61,7 +58,6 @@ public class TProAppInforBrowseController extends BaseController ...@@ -61,7 +58,6 @@ public class TProAppInforBrowseController extends BaseController
/** /**
* 获取行业专家库-专家库浏览详细信息 * 获取行业专家库-专家库浏览详细信息
*/ */
@PreAuthorize("@ss.hasPermi('specialist:browse:query')")
@GetMapping(value = "/{fProAppInforId}") @GetMapping(value = "/{fProAppInforId}")
public AjaxResult getInfo(@PathVariable("fProAppInforId") Long fProAppInforId) public AjaxResult getInfo(@PathVariable("fProAppInforId") Long fProAppInforId)
{ {
...@@ -71,7 +67,6 @@ public class TProAppInforBrowseController extends BaseController ...@@ -71,7 +67,6 @@ public class TProAppInforBrowseController extends BaseController
/** /**
* 新增行业专家库-专家库浏览 * 新增行业专家库-专家库浏览
*/ */
@PreAuthorize("@ss.hasPermi('specialist:browse:add')")
@Log(title = "行业专家库-专家库浏览", businessType = BusinessType.INSERT) @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TProAppInforBrowse tProAppInforBrowse) public AjaxResult add(@RequestBody TProAppInforBrowse tProAppInforBrowse)
...@@ -82,7 +77,6 @@ public class TProAppInforBrowseController extends BaseController ...@@ -82,7 +77,6 @@ public class TProAppInforBrowseController extends BaseController
/** /**
* 修改行业专家库-专家库浏览 * 修改行业专家库-专家库浏览
*/ */
@PreAuthorize("@ss.hasPermi('specialist:browse:edit')")
@Log(title = "行业专家库-专家库浏览", businessType = BusinessType.UPDATE) @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TProAppInforBrowse tProAppInforBrowse) public AjaxResult edit(@RequestBody TProAppInforBrowse tProAppInforBrowse)
...@@ -93,7 +87,6 @@ public class TProAppInforBrowseController extends BaseController ...@@ -93,7 +87,6 @@ public class TProAppInforBrowseController extends BaseController
/** /**
* 删除行业专家库-专家库浏览 * 删除行业专家库-专家库浏览
*/ */
@PreAuthorize("@ss.hasPermi('specialist:browse:remove')")
@Log(title = "行业专家库-专家库浏览", businessType = BusinessType.DELETE) @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.DELETE)
@DeleteMapping("/{fProAppInforIds}") @DeleteMapping("/{fProAppInforIds}")
public AjaxResult remove(@PathVariable Long[] fProAppInforIds) public AjaxResult remove(@PathVariable Long[] fProAppInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/specialist/TProAppInforController.java
View file @ 1c05698b
package com.zehong.web.controller.specialist; package com.zehong.web.controller.specialist;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TProAppInforController extends BaseController ...@@ -36,7 +35,6 @@ public class TProAppInforController extends BaseController
/** /**
* 查询行业专家库-专家申报列表 * 查询行业专家库-专家申报列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TProAppInfor tProAppInfor) public TableDataInfo list(TProAppInfor tProAppInfor)
{ {
...@@ -48,7 +46,6 @@ public class TProAppInforController extends BaseController ...@@ -48,7 +46,6 @@ public class TProAppInforController extends BaseController
/** /**
* 导出行业专家库-专家申报列表 * 导出行业专家库-专家申报列表
*/ */
@PreAuthorize("@ss.hasPermi('specialist:info:export')")
@Log(title = "行业专家库-专家申报", businessType = BusinessType.EXPORT) @Log(title = "行业专家库-专家申报", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TProAppInfor tProAppInfor) public AjaxResult export(TProAppInfor tProAppInfor)
...@@ -61,7 +58,6 @@ public class TProAppInforController extends BaseController ...@@ -61,7 +58,6 @@ public class TProAppInforController extends BaseController
/** /**
* 获取行业专家库-专家申报详细信息 * 获取行业专家库-专家申报详细信息
*/ */
@PreAuthorize("@ss.hasPermi('specialist:info:query')")
@GetMapping(value = "/{fProAppInforId}") @GetMapping(value = "/{fProAppInforId}")
public AjaxResult getInfo(@PathVariable("fProAppInforId") Long fProAppInforId) public AjaxResult getInfo(@PathVariable("fProAppInforId") Long fProAppInforId)
{ {
...@@ -71,7 +67,6 @@ public class TProAppInforController extends BaseController ...@@ -71,7 +67,6 @@ public class TProAppInforController extends BaseController
/** /**
* 新增行业专家库-专家申报 * 新增行业专家库-专家申报
*/ */
@PreAuthorize("@ss.hasPermi('specialist:info:add')")
@Log(title = "行业专家库-专家申报", businessType = BusinessType.INSERT) @Log(title = "行业专家库-专家申报", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TProAppInfor tProAppInfor) public AjaxResult add(@RequestBody TProAppInfor tProAppInfor)
...@@ -82,7 +77,6 @@ public class TProAppInforController extends BaseController ...@@ -82,7 +77,6 @@ public class TProAppInforController extends BaseController
/** /**
* 修改行业专家库-专家申报 * 修改行业专家库-专家申报
*/ */
@PreAuthorize("@ss.hasPermi('specialist:info:edit')")
@Log(title = "行业专家库-专家申报", businessType = BusinessType.UPDATE) @Log(title = "行业专家库-专家申报", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TProAppInfor tProAppInfor) public AjaxResult edit(@RequestBody TProAppInfor tProAppInfor)
...@@ -93,7 +87,6 @@ public class TProAppInforController extends BaseController ...@@ -93,7 +87,6 @@ public class TProAppInforController extends BaseController
/** /**
* 删除行业专家库-专家申报 * 删除行业专家库-专家申报
*/ */
@PreAuthorize("@ss.hasPermi('specialist:info:remove')")
@Log(title = "行业专家库-专家申报", businessType = BusinessType.DELETE) @Log(title = "行业专家库-专家申报", businessType = BusinessType.DELETE)
@DeleteMapping("/{fProAppInforIds}") @DeleteMapping("/{fProAppInforIds}")
public AjaxResult remove(@PathVariable Long[] fProAppInforIds) public AjaxResult remove(@PathVariable Long[] fProAppInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/standingBook/THiddenDangerStandingBookController.java
View file @ 1c05698b
...@@ -7,7 +7,6 @@ import java.util.Map; ...@@ -7,7 +7,6 @@ import java.util.Map;
import com.zehong.system.domain.Statistics; import com.zehong.system.domain.Statistics;
import com.zehong.system.domain.form.THiddenDangerStandingBookForm; import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
import com.zehong.web.controller.tool.TimeConfig; import com.zehong.web.controller.tool.TimeConfig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -42,7 +41,6 @@ public class THiddenDangerStandingBookController extends BaseController ...@@ -42,7 +41,6 @@ public class THiddenDangerStandingBookController extends BaseController
/** /**
* 查询隐患整治台账列表 * 查询隐患整治台账列表
*/ */
@PreAuthorize("@ss.hasPermi('standingBook:hidden:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(THiddenDangerStandingBookForm tHiddenDangerStandingBook) public TableDataInfo list(THiddenDangerStandingBookForm tHiddenDangerStandingBook)
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/standingBook/TSafeEquipmentStandingBookController.java
View file @ 1c05698b
...@@ -3,7 +3,6 @@ package com.zehong.web.controller.standingBook; ...@@ -3,7 +3,6 @@ package com.zehong.web.controller.standingBook;
import java.util.List; import java.util.List;
import com.zehong.system.domain.form.TSafeEquipmentStandingBookForm; import com.zehong.system.domain.form.TSafeEquipmentStandingBookForm;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -38,7 +37,6 @@ public class TSafeEquipmentStandingBookController extends BaseController ...@@ -38,7 +37,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
/** /**
* 查询用户加装安全装置台账列表 * 查询用户加装安全装置台账列表
*/ */
@PreAuthorize("@ss.hasPermi('standingBook:equipment:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook) public TableDataInfo list(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook)
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/standingBook/TTroubleStandingBookController.java
View file @ 1c05698b
...@@ -6,8 +6,6 @@ import java.util.List; ...@@ -6,8 +6,6 @@ import java.util.List;
import com.zehong.system.domain.Statistics; import com.zehong.system.domain.Statistics;
import com.zehong.system.domain.form.TTroubleStandingBookForm; import com.zehong.system.domain.form.TTroubleStandingBookForm;
import com.zehong.web.controller.tool.TimeConfig; import com.zehong.web.controller.tool.TimeConfig;
import com.zehong.web.timeconfig.TimeConFig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -42,7 +40,6 @@ public class TTroubleStandingBookController extends BaseController ...@@ -42,7 +40,6 @@ public class TTroubleStandingBookController extends BaseController
/** /**
* 查询事故台账列表 * 查询事故台账列表
*/ */
@PreAuthorize("@ss.hasPermi('standingBook:trouble:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TTroubleStandingBookForm tTroubleStandingBook) public TableDataInfo list(TTroubleStandingBookForm tTroubleStandingBook)
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorUserController.java
View file @ 1c05698b
...@@ -9,7 +9,6 @@ import com.zehong.common.utils.ServletUtils; ...@@ -9,7 +9,6 @@ import com.zehong.common.utils.ServletUtils;
import com.zehong.framework.web.service.TokenService; import com.zehong.framework.web.service.TokenService;
import com.zehong.system.domain.TDetectorUserCount; import com.zehong.system.domain.TDetectorUserCount;
import com.zehong.system.domain.vo.TDetectorUserInspectVo; import com.zehong.system.domain.vo.TDetectorUserInspectVo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -45,7 +44,6 @@ public class TDetectorUserController extends BaseController ...@@ -45,7 +44,6 @@ public class TDetectorUserController extends BaseController
/** /**
* 查询燃气用户列表 * 查询燃气用户列表
*/ */
//@PreAuthorize("@ss.hasPermi('supervise:user:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDetectorUser tDetectorUser) public TableDataInfo list(TDetectorUser tDetectorUser)
{ {
...@@ -109,7 +107,6 @@ public class TDetectorUserController extends BaseController ...@@ -109,7 +107,6 @@ public class TDetectorUserController extends BaseController
/** /**
* 导出燃气用户列表 * 导出燃气用户列表
*/ */
@PreAuthorize("@ss.hasPermi('supervise:user:export')")
@Log(title = "燃气用户", businessType = BusinessType.EXPORT) @Log(title = "燃气用户", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDetectorUser tDetectorUser) public AjaxResult export(TDetectorUser tDetectorUser)
...@@ -125,7 +122,6 @@ public class TDetectorUserController extends BaseController ...@@ -125,7 +122,6 @@ public class TDetectorUserController extends BaseController
/** /**
* 获取燃气用户详细信息 * 获取燃气用户详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:user:query')")
@GetMapping(value = "/{userId}") @GetMapping(value = "/{userId}")
public AjaxResult getInfo(@PathVariable("userId") Long userId) public AjaxResult getInfo(@PathVariable("userId") Long userId)
{ {
...@@ -135,7 +131,6 @@ public class TDetectorUserController extends BaseController ...@@ -135,7 +131,6 @@ public class TDetectorUserController extends BaseController
/** /**
* 新增燃气用户 * 新增燃气用户
*/ */
@PreAuthorize("@ss.hasPermi('supervise:user:add')")
@Log(title = "燃气用户", businessType = BusinessType.INSERT) @Log(title = "燃气用户", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TDetectorUser tDetectorUser) public AjaxResult add(@RequestBody TDetectorUser tDetectorUser)
...@@ -149,7 +144,6 @@ public class TDetectorUserController extends BaseController ...@@ -149,7 +144,6 @@ public class TDetectorUserController extends BaseController
/** /**
* 修改燃气用户 * 修改燃气用户
*/ */
@PreAuthorize("@ss.hasPermi('supervise:user:edit')")
@Log(title = "燃气用户", businessType = BusinessType.UPDATE) @Log(title = "燃气用户", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDetectorUser tDetectorUser) public AjaxResult edit(@RequestBody TDetectorUser tDetectorUser)
...@@ -160,7 +154,6 @@ public class TDetectorUserController extends BaseController ...@@ -160,7 +154,6 @@ public class TDetectorUserController extends BaseController
/** /**
* 删除燃气用户 * 删除燃气用户
*/ */
@PreAuthorize("@ss.hasPermi('supervise: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)
...@@ -186,7 +179,6 @@ public class TDetectorUserController extends BaseController ...@@ -186,7 +179,6 @@ public class TDetectorUserController extends BaseController
/** /**
* 导出用户安检信息导出 * 导出用户安检信息导出
*/ */
@PreAuthorize("@ss.hasPermi('supervise:user:export')")
@Log(title = "用户安检信息导出", businessType = BusinessType.EXPORT) @Log(title = "用户安检信息导出", businessType = BusinessType.EXPORT)
@GetMapping("/detectorUserExport") @GetMapping("/detectorUserExport")
public AjaxResult detectorUserExport(TDetectorUserInspectVo inspectVo) public AjaxResult detectorUserExport(TDetectorUserInspectVo inspectVo)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java
View file @ 1c05698b
...@@ -18,7 +18,6 @@ import com.zehong.system.service.ITDetectorUserService; ...@@ -18,7 +18,6 @@ import com.zehong.system.service.ITDetectorUserService;
import com.zehong.system.service.ITEmployedPeopleInfoService; import com.zehong.system.service.ITEmployedPeopleInfoService;
import com.zehong.web.codeconfig.CodeConFig; import com.zehong.web.codeconfig.CodeConFig;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.zehong.common.annotation.Log; import com.zehong.common.annotation.Log;
...@@ -56,7 +55,6 @@ public class TDeviceInfoController extends BaseController ...@@ -56,7 +55,6 @@ public class TDeviceInfoController extends BaseController
/** /**
* 查询设备信息列表 * 查询设备信息列表
*/ */
@PreAuthorize("@ss.hasPermi('device:device:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDeviceInfo tDeviceInfo) public TableDataInfo list(TDeviceInfo tDeviceInfo)
{ {
...@@ -77,7 +75,6 @@ public class TDeviceInfoController extends BaseController ...@@ -77,7 +75,6 @@ public class TDeviceInfoController extends BaseController
/** /**
* 导出设备信息列表 * 导出设备信息列表
*/ */
@PreAuthorize("@ss.hasPermi('device:device:export')")
@Log(title = "设备信息", businessType = BusinessType.EXPORT) @Log(title = "设备信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDeviceInfo tDeviceInfo) public AjaxResult export(TDeviceInfo tDeviceInfo)
...@@ -93,7 +90,6 @@ public class TDeviceInfoController extends BaseController ...@@ -93,7 +90,6 @@ public class TDeviceInfoController extends BaseController
/** /**
* 获取设备信息详细信息 * 获取设备信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('device:device:query')")
@GetMapping(value = "/{deviceId}") @GetMapping(value = "/{deviceId}")
public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId) public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId)
{ {
...@@ -103,7 +99,6 @@ public class TDeviceInfoController extends BaseController ...@@ -103,7 +99,6 @@ public class TDeviceInfoController extends BaseController
/** /**
* 新增设备信息 * 新增设备信息
*/ */
@PreAuthorize("@ss.hasPermi('device:device:add')")
@Log(title = "设备信息", businessType = BusinessType.INSERT) @Log(title = "设备信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public void add(@RequestBody Listaw listaw) public void add(@RequestBody Listaw listaw)
...@@ -127,7 +122,6 @@ public class TDeviceInfoController extends BaseController ...@@ -127,7 +122,6 @@ public class TDeviceInfoController extends BaseController
/** /**
* 修改设备信息 * 修改设备信息
*/ */
@PreAuthorize("@ss.hasPermi('device:device:edit')")
@Log(title = "设备信息", businessType = BusinessType.UPDATE) @Log(title = "设备信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDeviceInfo tDeviceInfo) public AjaxResult edit(@RequestBody TDeviceInfo tDeviceInfo)
...@@ -154,7 +148,6 @@ public class TDeviceInfoController extends BaseController ...@@ -154,7 +148,6 @@ public class TDeviceInfoController extends BaseController
/** /**
* 删除设备信息 * 删除设备信息
*/ */
@PreAuthorize("@ss.hasPermi('device:device:remove')")
@Log(title = "设备信息", businessType = BusinessType.DELETE) @Log(title = "设备信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{deviceIds}") @DeleteMapping("/{deviceIds}")
public AjaxResult remove(@PathVariable Long[] deviceIds) public AjaxResult remove(@PathVariable Long[] deviceIds)
...@@ -166,7 +159,6 @@ public class TDeviceInfoController extends BaseController ...@@ -166,7 +159,6 @@ public class TDeviceInfoController extends BaseController
/** /**
* 获取设备详细信息列表 * 获取设备详细信息列表
*/ */
@PreAuthorize("@ss.hasPermi('device:device:deviceDetailInfo')")
@GetMapping("/getdeviceDetailInfo") @GetMapping("/getdeviceDetailInfo")
public AjaxResult getdeviceDetailInfo(Long deviceId) { public AjaxResult getdeviceDetailInfo(Long deviceId) {
List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoService.getdeviceDetailInfo(deviceId); List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoService.getdeviceDetailInfo(deviceId);
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TEmployedPeopleInfoController.java
View file @ 1c05698b
...@@ -5,7 +5,6 @@ import java.util.List; ...@@ -5,7 +5,6 @@ import java.util.List;
import com.zehong.common.config.GassafetyProgressConfig; import com.zehong.common.config.GassafetyProgressConfig;
import com.zehong.common.core.domain.entity.SysUser; import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.SecurityUtils; import com.zehong.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.zehong.common.annotation.Log; import com.zehong.common.annotation.Log;
...@@ -34,7 +33,6 @@ public class TEmployedPeopleInfoController extends BaseController ...@@ -34,7 +33,6 @@ public class TEmployedPeopleInfoController extends BaseController
/** /**
* 查询从业人员信息列表 * 查询从业人员信息列表
*/ */
@PreAuthorize("@ss.hasPermi('regulation:supervise:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEmployedPeopleInfo tEmployedPeopleInfo) public TableDataInfo list(TEmployedPeopleInfo tEmployedPeopleInfo)
{ {
...@@ -57,7 +55,6 @@ public class TEmployedPeopleInfoController extends BaseController ...@@ -57,7 +55,6 @@ public class TEmployedPeopleInfoController extends BaseController
/** /**
* 导出从业人员信息列表 * 导出从业人员信息列表
*/ */
@PreAuthorize("@ss.hasPermi('regulation:supervise:export')")
@Log(title = "从业人员信息", businessType = BusinessType.EXPORT) @Log(title = "从业人员信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TEmployedPeopleInfo tEmployedPeopleInfo) public AjaxResult export(TEmployedPeopleInfo tEmployedPeopleInfo)
...@@ -73,7 +70,6 @@ public class TEmployedPeopleInfoController extends BaseController ...@@ -73,7 +70,6 @@ public class TEmployedPeopleInfoController extends BaseController
/** /**
* 获取从业人员信息详细信息 * 获取从业人员信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:supervise:query')")
@GetMapping(value = "/{employedPeopleId}") @GetMapping(value = "/{employedPeopleId}")
public AjaxResult getInfo(@PathVariable("employedPeopleId") Long employedPeopleId) throws ParseException { public AjaxResult getInfo(@PathVariable("employedPeopleId") Long employedPeopleId) throws ParseException {
TEmployedPeopleInfo tEmployedPeopleInfo = tEmployedPeopleInfoService.selectTEmployedPeopleInfoById(employedPeopleId); TEmployedPeopleInfo tEmployedPeopleInfo = tEmployedPeopleInfoService.selectTEmployedPeopleInfoById(employedPeopleId);
...@@ -83,7 +79,6 @@ public class TEmployedPeopleInfoController extends BaseController ...@@ -83,7 +79,6 @@ public class TEmployedPeopleInfoController extends BaseController
/** /**
* 新增从业人员信息 * 新增从业人员信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:supervise:add')")
@Log(title = "从业人员信息", businessType = BusinessType.INSERT) @Log(title = "从业人员信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TEmployedPeopleInfo tEmployedPeopleInfo) throws ParseException { public AjaxResult add(@RequestBody TEmployedPeopleInfo tEmployedPeopleInfo) throws ParseException {
...@@ -96,7 +91,6 @@ public class TEmployedPeopleInfoController extends BaseController ...@@ -96,7 +91,6 @@ public class TEmployedPeopleInfoController extends BaseController
/** /**
* 修改从业人员信息 * 修改从业人员信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:supervise:edit')")
@Log(title = "从业人员信息", businessType = BusinessType.UPDATE) @Log(title = "从业人员信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TEmployedPeopleInfo tEmployedPeopleInfo) throws ParseException { public AjaxResult edit(@RequestBody TEmployedPeopleInfo tEmployedPeopleInfo) throws ParseException {
...@@ -123,7 +117,6 @@ public class TEmployedPeopleInfoController extends BaseController ...@@ -123,7 +117,6 @@ public class TEmployedPeopleInfoController extends BaseController
/** /**
* 删除从业人员信息 * 删除从业人员信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:supervise:remove')")
@Log(title = "从业人员信息", businessType = BusinessType.DELETE) @Log(title = "从业人员信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{employedPeopleIds}") @DeleteMapping("/{employedPeopleIds}")
public AjaxResult remove(@PathVariable Long[] employedPeopleIds) public AjaxResult remove(@PathVariable Long[] employedPeopleIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TEnterpriseInfoController.java
View file @ 1c05698b
...@@ -9,13 +9,11 @@ import com.zehong.common.core.page.TableDataInfo; ...@@ -9,13 +9,11 @@ import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType; import com.zehong.common.enums.BusinessType;
import com.zehong.common.utils.SecurityUtils; import com.zehong.common.utils.SecurityUtils;
import com.zehong.common.utils.poi.ExcelUtil; import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.utils.uuid.UUID;
import com.zehong.framework.config.ServerConfig; import com.zehong.framework.config.ServerConfig;
import com.zehong.system.domain.TEnterpriseInfo; import com.zehong.system.domain.TEnterpriseInfo;
import com.zehong.system.domain.vo.TEnterpriseInfoVO; import com.zehong.system.domain.vo.TEnterpriseInfoVO;
import com.zehong.system.service.ITEnterpriseInfoService; import com.zehong.system.service.ITEnterpriseInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.io.File; import java.io.File;
...@@ -38,7 +36,6 @@ public class TEnterpriseInfoController extends BaseController ...@@ -38,7 +36,6 @@ public class TEnterpriseInfoController extends BaseController
/** /**
* 查询企业信息列表 * 查询企业信息列表
*/ */
@PreAuthorize("@ss.hasPermi('regulation:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEnterpriseInfo tEnterpriseInfo) public TableDataInfo list(TEnterpriseInfo tEnterpriseInfo)
{ {
...@@ -90,7 +87,6 @@ public class TEnterpriseInfoController extends BaseController ...@@ -90,7 +87,6 @@ public class TEnterpriseInfoController extends BaseController
/** /**
* 导出企业信息列表 * 导出企业信息列表
*/ */
@PreAuthorize("@ss.hasPermi('regulation:info:export')")
@Log(title = "企业信息", businessType = BusinessType.EXPORT) @Log(title = "企业信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TEnterpriseInfo tEnterpriseInfo) public AjaxResult export(TEnterpriseInfo tEnterpriseInfo)
...@@ -106,7 +102,6 @@ public class TEnterpriseInfoController extends BaseController ...@@ -106,7 +102,6 @@ public class TEnterpriseInfoController extends BaseController
/** /**
* 获取企业信息详细信息 * 获取企业信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:info:query')")
@GetMapping(value = "/{enterpriseId}") @GetMapping(value = "/{enterpriseId}")
public AjaxResult getInfo(@PathVariable("enterpriseId") String enterpriseId) public AjaxResult getInfo(@PathVariable("enterpriseId") String enterpriseId)
{ {
...@@ -116,7 +111,6 @@ public class TEnterpriseInfoController extends BaseController ...@@ -116,7 +111,6 @@ public class TEnterpriseInfoController extends BaseController
/** /**
* 新增企业信息 * 新增企业信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:info:add')")
@Log(title = "企业信息", businessType = BusinessType.INSERT) @Log(title = "企业信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TEnterpriseInfo tEnterpriseInfo) public AjaxResult add(@RequestBody TEnterpriseInfo tEnterpriseInfo)
...@@ -130,7 +124,6 @@ public class TEnterpriseInfoController extends BaseController ...@@ -130,7 +124,6 @@ public class TEnterpriseInfoController extends BaseController
/** /**
* 修改企业信息 * 修改企业信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:info:edit')")
@Log(title = "企业信息", businessType = BusinessType.UPDATE) @Log(title = "企业信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TEnterpriseInfo tEnterpriseInfo) public AjaxResult edit(@RequestBody TEnterpriseInfo tEnterpriseInfo)
...@@ -155,7 +148,6 @@ public class TEnterpriseInfoController extends BaseController ...@@ -155,7 +148,6 @@ public class TEnterpriseInfoController extends BaseController
/** /**
* 删除企业信息 * 删除企业信息
*/ */
@PreAuthorize("@ss.hasPermi('regulation:info:remove')")
@Log(title = "企业信息", businessType = BusinessType.DELETE) @Log(title = "企业信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{enterpriseIds}") @DeleteMapping("/{enterpriseIds}")
public AjaxResult remove(@PathVariable String[] enterpriseIds) public AjaxResult remove(@PathVariable String[] enterpriseIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/THiddenTroubleInfoSController.java
View file @ 1c05698b
...@@ -15,7 +15,6 @@ import com.zehong.system.service.ITHiddenTroubleInfoService; ...@@ -15,7 +15,6 @@ import com.zehong.system.service.ITHiddenTroubleInfoService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -43,7 +42,6 @@ public class THiddenTroubleInfoSController extends BaseController ...@@ -43,7 +42,6 @@ public class THiddenTroubleInfoSController extends BaseController
/** /**
* 查询燃气隐患列表 * 查询燃气隐患列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(THiddenTroubleInfo tHiddenTroubleInfo) public TableDataInfo list(THiddenTroubleInfo tHiddenTroubleInfo)
{ {
...@@ -73,7 +71,6 @@ public class THiddenTroubleInfoSController extends BaseController ...@@ -73,7 +71,6 @@ public class THiddenTroubleInfoSController extends BaseController
/** /**
* 导出燃气隐患列表 * 导出燃气隐患列表
*/ */
@PreAuthorize("@ss.hasPermi('system:info:export')")
@Log(title = "燃气隐患", businessType = BusinessType.EXPORT) @Log(title = "燃气隐患", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(THiddenTroubleInfo tHiddenTroubleInfo) public AjaxResult export(THiddenTroubleInfo tHiddenTroubleInfo)
...@@ -86,7 +83,6 @@ public class THiddenTroubleInfoSController extends BaseController ...@@ -86,7 +83,6 @@ public class THiddenTroubleInfoSController extends BaseController
/** /**
* 获取燃气隐患详细信息 * 获取燃气隐患详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:query')")
@GetMapping(value = "/{hiddenTroubleId}") @GetMapping(value = "/{hiddenTroubleId}")
public AjaxResult getInfo(@PathVariable("hiddenTroubleId") Long hiddenTroubleId) public AjaxResult getInfo(@PathVariable("hiddenTroubleId") Long hiddenTroubleId)
{ {
...@@ -97,7 +93,6 @@ public class THiddenTroubleInfoSController extends BaseController ...@@ -97,7 +93,6 @@ public class THiddenTroubleInfoSController extends BaseController
/** /**
* 新增燃气隐患 * 新增燃气隐患
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "燃气隐患", businessType = BusinessType.INSERT) @Log(title = "燃气隐患", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo) public AjaxResult add(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo)
...@@ -136,7 +131,6 @@ public class THiddenTroubleInfoSController extends BaseController ...@@ -136,7 +131,6 @@ public class THiddenTroubleInfoSController extends BaseController
/** /**
* 修改燃气隐患 * 修改燃气隐患
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "燃气隐患", businessType = BusinessType.UPDATE) @Log(title = "燃气隐患", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo) public AjaxResult edit(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo)
...@@ -152,7 +146,6 @@ public class THiddenTroubleInfoSController extends BaseController ...@@ -152,7 +146,6 @@ public class THiddenTroubleInfoSController extends BaseController
/** /**
* 删除燃气隐患 * 删除燃气隐患
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:remove')")
@Log(title = "燃气隐患", businessType = BusinessType.DELETE) @Log(title = "燃气隐患", businessType = BusinessType.DELETE)
@DeleteMapping("/{hiddenTroubleIds}") @DeleteMapping("/{hiddenTroubleIds}")
public AjaxResult remove(@PathVariable Long[] hiddenTroubleIds) public AjaxResult remove(@PathVariable Long[] hiddenTroubleIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TLinePatrolPersonController.java
View file @ 1c05698b
...@@ -7,7 +7,6 @@ import com.zehong.common.utils.SecurityUtils; ...@@ -7,7 +7,6 @@ import com.zehong.common.utils.SecurityUtils;
import com.zehong.common.utils.ServletUtils; import com.zehong.common.utils.ServletUtils;
import com.zehong.framework.web.service.TokenService; import com.zehong.framework.web.service.TokenService;
import com.zehong.system.domain.vo.Passmodel; import com.zehong.system.domain.vo.Passmodel;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -47,7 +46,6 @@ public class TLinePatrolPersonController extends BaseController ...@@ -47,7 +46,6 @@ public class TLinePatrolPersonController extends BaseController
/** /**
* 查询巡线人员管理列表 * 查询巡线人员管理列表
*/ */
//@PreAuthorize("@ss.hasPermi('linePatrol:person:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TLinePatrolPerson tLinePatrolPerson) public TableDataInfo list(TLinePatrolPerson tLinePatrolPerson)
{ {
...@@ -108,7 +106,6 @@ public class TLinePatrolPersonController extends BaseController ...@@ -108,7 +106,6 @@ public class TLinePatrolPersonController extends BaseController
/** /**
* 导出巡线人员管理列表 * 导出巡线人员管理列表
*/ */
//@PreAuthorize("@ss.hasPermi('linePatrol:person:export')")
@Log(title = "巡线人员管理", businessType = BusinessType.EXPORT) @Log(title = "巡线人员管理", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TLinePatrolPerson tLinePatrolPerson) public AjaxResult export(TLinePatrolPerson tLinePatrolPerson)
...@@ -121,7 +118,6 @@ public class TLinePatrolPersonController extends BaseController ...@@ -121,7 +118,6 @@ public class TLinePatrolPersonController extends BaseController
/** /**
* 获取巡线人员管理详细信息 * 获取巡线人员管理详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('linePatrol:person:query')")
@GetMapping(value = "/{personId}") @GetMapping(value = "/{personId}")
public AjaxResult getInfo(@PathVariable("personId") Long personId) public AjaxResult getInfo(@PathVariable("personId") Long personId)
{ {
...@@ -137,7 +133,6 @@ public class TLinePatrolPersonController extends BaseController ...@@ -137,7 +133,6 @@ public class TLinePatrolPersonController extends BaseController
/** /**
* 新增巡线人员管理 * 新增巡线人员管理
*/ */
//@PreAuthorize("@ss.hasPermi('linePatrol:person:add')")
@Log(title = "巡线人员管理", businessType = BusinessType.INSERT) @Log(title = "巡线人员管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TLinePatrolPerson tLinePatrolPerson) public AjaxResult add(@RequestBody TLinePatrolPerson tLinePatrolPerson)
...@@ -156,7 +151,6 @@ public class TLinePatrolPersonController extends BaseController ...@@ -156,7 +151,6 @@ public class TLinePatrolPersonController extends BaseController
/** /**
* 修改巡线人员管理 * 修改巡线人员管理
*/ */
//@PreAuthorize("@ss.hasPermi('linePatrol:person:edit')")
@Log(title = "巡线人员管理", businessType = BusinessType.UPDATE) @Log(title = "巡线人员管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TLinePatrolPerson tLinePatrolPerson) public AjaxResult edit(@RequestBody TLinePatrolPerson tLinePatrolPerson)
...@@ -167,7 +161,6 @@ public class TLinePatrolPersonController extends BaseController ...@@ -167,7 +161,6 @@ public class TLinePatrolPersonController extends BaseController
/** /**
* 删除巡线人员管理 * 删除巡线人员管理
*/ */
//@PreAuthorize("@ss.hasPermi('linePatrol:person:remove')")
@Log(title = "巡线人员管理", businessType = BusinessType.DELETE) @Log(title = "巡线人员管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{personIds}") @DeleteMapping("/{personIds}")
public AjaxResult remove(@PathVariable Long[] personIds) public AjaxResult remove(@PathVariable Long[] personIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TPipeInfoController.java
View file @ 1c05698b
...@@ -42,7 +42,6 @@ public class TPipeInfoController extends BaseController ...@@ -42,7 +42,6 @@ public class TPipeInfoController extends BaseController
/** /**
* 查询管道信息列表 * 查询管道信息列表
*/ */
//@PreAuthorize("@ss.hasPermi('supervise:pipe:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPipeInfo tPipeInfo) public TableDataInfo list(TPipeInfo tPipeInfo)
{ {
...@@ -57,7 +56,6 @@ public class TPipeInfoController extends BaseController ...@@ -57,7 +56,6 @@ public class TPipeInfoController extends BaseController
/** /**
* 导出管道信息列表 * 导出管道信息列表
*/ */
@PreAuthorize("@ss.hasPermi('supervise:pipe:export')")
@Log(title = "管道信息", businessType = BusinessType.EXPORT) @Log(title = "管道信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TPipeInfo tPipeInfo) public AjaxResult export(TPipeInfo tPipeInfo)
...@@ -73,7 +71,6 @@ public class TPipeInfoController extends BaseController ...@@ -73,7 +71,6 @@ public class TPipeInfoController extends BaseController
/** /**
* 获取管道信息详细信息 * 获取管道信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:pipe:query')")
@GetMapping(value = "/{pipeId}") @GetMapping(value = "/{pipeId}")
public AjaxResult getInfo(@PathVariable("pipeId") Long pipeId) public AjaxResult getInfo(@PathVariable("pipeId") Long pipeId)
{ {
...@@ -83,7 +80,6 @@ public class TPipeInfoController extends BaseController ...@@ -83,7 +80,6 @@ public class TPipeInfoController extends BaseController
/** /**
* 新增管道信息 * 新增管道信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:pipe:add')")
@Log(title = "管道信息", businessType = BusinessType.INSERT) @Log(title = "管道信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TPipeInfo tPipeInfo) { public AjaxResult add(@RequestBody TPipeInfo tPipeInfo) {
...@@ -99,7 +95,6 @@ public class TPipeInfoController extends BaseController ...@@ -99,7 +95,6 @@ public class TPipeInfoController extends BaseController
/** /**
* 修改管道信息 * 修改管道信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:pipe:edit')")
@Log(title = "管道信息", businessType = BusinessType.UPDATE) @Log(title = "管道信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TPipeInfo tPipeInfo) { public AjaxResult edit(@RequestBody TPipeInfo tPipeInfo) {
...@@ -112,7 +107,6 @@ public class TPipeInfoController extends BaseController ...@@ -112,7 +107,6 @@ public class TPipeInfoController extends BaseController
/** /**
* 删除管道信息 * 删除管道信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:pipe:remove')")
@Log(title = "管道信息", businessType = BusinessType.DELETE) @Log(title = "管道信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{pipeIds}") @DeleteMapping("/{pipeIds}")
public AjaxResult remove(@PathVariable Long[] pipeIds) public AjaxResult remove(@PathVariable Long[] pipeIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TProjectInfoController.java
View file @ 1c05698b
...@@ -5,7 +5,6 @@ import java.util.List; ...@@ -5,7 +5,6 @@ import java.util.List;
import com.zehong.common.config.GassafetyProgressConfig; import com.zehong.common.config.GassafetyProgressConfig;
import com.zehong.common.core.domain.entity.SysUser; import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.SecurityUtils; import com.zehong.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -40,7 +39,6 @@ public class TProjectInfoController extends BaseController ...@@ -40,7 +39,6 @@ public class TProjectInfoController extends BaseController
/** /**
* 查询工程项目信息列表 * 查询工程项目信息列表
*/ */
@PreAuthorize("@ss.hasPermi('project:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TProjectInfo tProjectInfo) public TableDataInfo list(TProjectInfo tProjectInfo)
{ {
...@@ -55,7 +53,6 @@ public class TProjectInfoController extends BaseController ...@@ -55,7 +53,6 @@ public class TProjectInfoController extends BaseController
/** /**
* 导出工程项目信息列表 * 导出工程项目信息列表
*/ */
@PreAuthorize("@ss.hasPermi('project:info:export')")
@Log(title = "工程项目信息", businessType = BusinessType.EXPORT) @Log(title = "工程项目信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TProjectInfo tProjectInfo) public AjaxResult export(TProjectInfo tProjectInfo)
...@@ -71,7 +68,6 @@ public class TProjectInfoController extends BaseController ...@@ -71,7 +68,6 @@ public class TProjectInfoController extends BaseController
/** /**
* 获取工程项目信息详细信息 * 获取工程项目信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('project:info:query')")
@GetMapping(value = "/{projectId}") @GetMapping(value = "/{projectId}")
public AjaxResult getInfo(@PathVariable("projectId") Long projectId) public AjaxResult getInfo(@PathVariable("projectId") Long projectId)
{ {
...@@ -81,7 +77,6 @@ public class TProjectInfoController extends BaseController ...@@ -81,7 +77,6 @@ public class TProjectInfoController extends BaseController
/** /**
* 新增工程项目信息 * 新增工程项目信息
*/ */
@PreAuthorize("@ss.hasPermi('project:info:add')")
@Log(title = "工程项目信息", businessType = BusinessType.INSERT) @Log(title = "工程项目信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TProjectInfo tProjectInfo) throws ParseException { public AjaxResult add(@RequestBody TProjectInfo tProjectInfo) throws ParseException {
...@@ -110,7 +105,6 @@ public class TProjectInfoController extends BaseController ...@@ -110,7 +105,6 @@ public class TProjectInfoController extends BaseController
/** /**
* 修改工程项目信息 * 修改工程项目信息
*/ */
@PreAuthorize("@ss.hasPermi('project:info:edit')")
@Log(title = "工程项目信息", businessType = BusinessType.UPDATE) @Log(title = "工程项目信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TProjectInfo tProjectInfo) public AjaxResult edit(@RequestBody TProjectInfo tProjectInfo)
...@@ -134,7 +128,6 @@ public class TProjectInfoController extends BaseController ...@@ -134,7 +128,6 @@ public class TProjectInfoController extends BaseController
/** /**
* 删除工程项目信息 * 删除工程项目信息
*/ */
@PreAuthorize("@ss.hasPermi('project:info:remove')")
@Log(title = "工程项目信息", businessType = BusinessType.DELETE) @Log(title = "工程项目信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{projectIds}") @DeleteMapping("/{projectIds}")
public AjaxResult remove(@PathVariable Long[] projectIds) public AjaxResult remove(@PathVariable Long[] projectIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TSiteStationInfoController.java
View file @ 1c05698b
...@@ -7,7 +7,6 @@ import com.zehong.system.domain.TTSiteStationInfoList; ...@@ -7,7 +7,6 @@ import com.zehong.system.domain.TTSiteStationInfoList;
import com.zehong.system.service.ITDeviceInfoService; import com.zehong.system.service.ITDeviceInfoService;
import com.zehong.system.service.ITEmployedPeopleInfoService; import com.zehong.system.service.ITEmployedPeopleInfoService;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -47,7 +46,6 @@ public class TSiteStationInfoController extends BaseController { ...@@ -47,7 +46,6 @@ public class TSiteStationInfoController extends BaseController {
/** /**
* 查询场站信息列表 * 查询场站信息列表
*/ */
@PreAuthorize("@ss.hasPermi('supervise:station:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSiteStationInfo tSiteStationInfo) public TableDataInfo list(TSiteStationInfo tSiteStationInfo)
{ {
...@@ -62,7 +60,6 @@ public class TSiteStationInfoController extends BaseController { ...@@ -62,7 +60,6 @@ public class TSiteStationInfoController extends BaseController {
/** /**
* 导出场站信息列表 * 导出场站信息列表
*/ */
@PreAuthorize("@ss.hasPermi('supervise:station:export')")
@Log(title = "场站信息", businessType = BusinessType.EXPORT) @Log(title = "场站信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TSiteStationInfo tSiteStationInfo) public AjaxResult export(TSiteStationInfo tSiteStationInfo)
...@@ -78,7 +75,6 @@ public class TSiteStationInfoController extends BaseController { ...@@ -78,7 +75,6 @@ public class TSiteStationInfoController extends BaseController {
/** /**
* 获取场站信息详细信息 * 获取场站信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:station:query')")
@GetMapping(value = "/{siteStationId}") @GetMapping(value = "/{siteStationId}")
public AjaxResult getInfo(@PathVariable("siteStationId") Long siteStationId) public AjaxResult getInfo(@PathVariable("siteStationId") Long siteStationId)
{ {
...@@ -88,7 +84,6 @@ public class TSiteStationInfoController extends BaseController { ...@@ -88,7 +84,6 @@ public class TSiteStationInfoController extends BaseController {
/** /**
* 新增场站信息 * 新增场站信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:station:add')")
@Log(title = "场站信息", businessType = BusinessType.INSERT) @Log(title = "场站信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public void add(@RequestBody TTSiteStationInfoList tSiteStationInfos) public void add(@RequestBody TTSiteStationInfoList tSiteStationInfos)
...@@ -106,7 +101,6 @@ public class TSiteStationInfoController extends BaseController { ...@@ -106,7 +101,6 @@ public class TSiteStationInfoController extends BaseController {
/** /**
* 修改场站信息 * 修改场站信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:station:edit')")
@Log(title = "场站信息", businessType = BusinessType.UPDATE) @Log(title = "场站信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TSiteStationInfo tSiteStationInfo) public AjaxResult edit(@RequestBody TSiteStationInfo tSiteStationInfo)
...@@ -120,7 +114,6 @@ public class TSiteStationInfoController extends BaseController { ...@@ -120,7 +114,6 @@ public class TSiteStationInfoController extends BaseController {
/** /**
* 删除场站信息 * 删除场站信息
*/ */
@PreAuthorize("@ss.hasPermi('supervise:station:remove')")
@Log(title = "场站信息", businessType = BusinessType.DELETE) @Log(title = "场站信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{siteStationIds}") @DeleteMapping("/{siteStationIds}")
public AjaxResult remove(@PathVariable Long[] siteStationIds) public AjaxResult remove(@PathVariable Long[] siteStationIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsHazRefController.java
View file @ 1c05698b
...@@ -36,7 +36,6 @@ public class TInsHazRefController extends BaseController ...@@ -36,7 +36,6 @@ public class TInsHazRefController extends BaseController
/** /**
* 查询监督检查-监督检查发现隐患及整改，执法结果列表 * 查询监督检查-监督检查发现隐患及整改，执法结果列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:rectification:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsHazRef tInsHazRef) public TableDataInfo list(TInsHazRef tInsHazRef)
{ {
...@@ -48,7 +47,6 @@ public class TInsHazRefController extends BaseController ...@@ -48,7 +47,6 @@ public class TInsHazRefController extends BaseController
/** /**
* 导出监督检查-监督检查发现隐患及整改，执法结果列表 * 导出监督检查-监督检查发现隐患及整改，执法结果列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:rectification:export')")
@Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.EXPORT) @Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsHazRef tInsHazRef) public AjaxResult export(TInsHazRef tInsHazRef)
...@@ -61,7 +59,6 @@ public class TInsHazRefController extends BaseController ...@@ -61,7 +59,6 @@ public class TInsHazRefController extends BaseController
/** /**
* 获取监督检查-监督检查发现隐患及整改，执法结果详细信息 * 获取监督检查-监督检查发现隐患及整改，执法结果详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:rectification:query')")
@GetMapping(value = "/{fInsHazRefId}") @GetMapping(value = "/{fInsHazRefId}")
public AjaxResult getInfo(@PathVariable("fInsHazRefId") Long fInsHazRefId) public AjaxResult getInfo(@PathVariable("fInsHazRefId") Long fInsHazRefId)
{ {
...@@ -71,7 +68,6 @@ public class TInsHazRefController extends BaseController ...@@ -71,7 +68,6 @@ public class TInsHazRefController extends BaseController
/** /**
* 新增监督检查-监督检查发现隐患及整改，执法结果 * 新增监督检查-监督检查发现隐患及整改，执法结果
*/ */
@PreAuthorize("@ss.hasPermi('supervision:rectification:add')")
@Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.INSERT) @Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsHazRef tInsHazRef) public AjaxResult add(@RequestBody TInsHazRef tInsHazRef)
...@@ -82,7 +78,6 @@ public class TInsHazRefController extends BaseController ...@@ -82,7 +78,6 @@ public class TInsHazRefController extends BaseController
/** /**
* 修改监督检查-监督检查发现隐患及整改，执法结果 * 修改监督检查-监督检查发现隐患及整改，执法结果
*/ */
@PreAuthorize("@ss.hasPermi('supervision:rectification:edit')")
@Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.UPDATE) @Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsHazRef tInsHazRef) public AjaxResult edit(@RequestBody TInsHazRef tInsHazRef)
...@@ -93,7 +88,6 @@ public class TInsHazRefController extends BaseController ...@@ -93,7 +88,6 @@ public class TInsHazRefController extends BaseController
/** /**
* 删除监督检查-监督检查发现隐患及整改，执法结果 * 删除监督检查-监督检查发现隐患及整改，执法结果
*/ */
@PreAuthorize("@ss.hasPermi('supervision:rectification:remove')")
@Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.DELETE) @Log(title = "监督检查-监督检查发现隐患及整改，执法结果", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsHazRefIds}") @DeleteMapping("/{fInsHazRefIds}")
public AjaxResult remove(@PathVariable Long[] fInsHazRefIds) public AjaxResult remove(@PathVariable Long[] fInsHazRefIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsInsListInforController.java
View file @ 1c05698b
package com.zehong.web.controller.supervision; package com.zehong.web.controller.supervision;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TInsInsListInforController extends BaseController ...@@ -36,7 +35,6 @@ public class TInsInsListInforController extends BaseController
/** /**
* 查询监督检查-获取检查项列表 * 查询监督检查-获取检查项列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:inspect:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsInsListInfor tInsInsListInfor) public TableDataInfo list(TInsInsListInfor tInsInsListInfor)
{ {
...@@ -48,7 +46,6 @@ public class TInsInsListInforController extends BaseController ...@@ -48,7 +46,6 @@ public class TInsInsListInforController extends BaseController
/** /**
* 导出监督检查-获取检查项列表 * 导出监督检查-获取检查项列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:inspect:export')")
@Log(title = "监督检查-获取检查项", businessType = BusinessType.EXPORT) @Log(title = "监督检查-获取检查项", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsInsListInfor tInsInsListInfor) public AjaxResult export(TInsInsListInfor tInsInsListInfor)
...@@ -61,7 +58,6 @@ public class TInsInsListInforController extends BaseController ...@@ -61,7 +58,6 @@ public class TInsInsListInforController extends BaseController
/** /**
* 获取监督检查-获取检查项详细信息 * 获取监督检查-获取检查项详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:inspect:query')")
@GetMapping(value = "/{fInsInsListInforId}") @GetMapping(value = "/{fInsInsListInforId}")
public AjaxResult getInfo(@PathVariable("fInsInsListInforId") Long fInsInsListInforId) public AjaxResult getInfo(@PathVariable("fInsInsListInforId") Long fInsInsListInforId)
{ {
...@@ -71,7 +67,6 @@ public class TInsInsListInforController extends BaseController ...@@ -71,7 +67,6 @@ public class TInsInsListInforController extends BaseController
/** /**
* 新增监督检查-获取检查项 * 新增监督检查-获取检查项
*/ */
@PreAuthorize("@ss.hasPermi('supervision:inspect:add')")
@Log(title = "监督检查-获取检查项", businessType = BusinessType.INSERT) @Log(title = "监督检查-获取检查项", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsInsListInfor tInsInsListInfor) public AjaxResult add(@RequestBody TInsInsListInfor tInsInsListInfor)
...@@ -82,7 +77,6 @@ public class TInsInsListInforController extends BaseController ...@@ -82,7 +77,6 @@ public class TInsInsListInforController extends BaseController
/** /**
* 修改监督检查-获取检查项 * 修改监督检查-获取检查项
*/ */
@PreAuthorize("@ss.hasPermi('supervision:inspect:edit')")
@Log(title = "监督检查-获取检查项", businessType = BusinessType.UPDATE) @Log(title = "监督检查-获取检查项", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsInsListInfor tInsInsListInfor) public AjaxResult edit(@RequestBody TInsInsListInfor tInsInsListInfor)
...@@ -93,7 +87,6 @@ public class TInsInsListInforController extends BaseController ...@@ -93,7 +87,6 @@ public class TInsInsListInforController extends BaseController
/** /**
* 删除监督检查-获取检查项 * 删除监督检查-获取检查项
*/ */
@PreAuthorize("@ss.hasPermi('supervision:inspect:remove')")
@Log(title = "监督检查-获取检查项", businessType = BusinessType.DELETE) @Log(title = "监督检查-获取检查项", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsInsListInforIds}") @DeleteMapping("/{fInsInsListInforIds}")
public AjaxResult remove(@PathVariable Long[] fInsInsListInforIds) public AjaxResult remove(@PathVariable Long[] fInsInsListInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsRecInforController.java
View file @ 1c05698b
package com.zehong.web.controller.supervision; package com.zehong.web.controller.supervision;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TInsRecInforController extends BaseController ...@@ -36,7 +35,6 @@ public class TInsRecInforController extends BaseController
/** /**
* 查询监督检查-检查记录列表 * 查询监督检查-检查记录列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsRecInfor tInsRecInfor) public TableDataInfo list(TInsRecInfor tInsRecInfor)
{ {
...@@ -59,7 +57,6 @@ public class TInsRecInforController extends BaseController ...@@ -59,7 +57,6 @@ public class TInsRecInforController extends BaseController
/** /**
* 导出监督检查-检查记录列表 * 导出监督检查-检查记录列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:record:export')")
@Log(title = "监督检查-检查记录", businessType = BusinessType.EXPORT) @Log(title = "监督检查-检查记录", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsRecInfor tInsRecInfor) public AjaxResult export(TInsRecInfor tInsRecInfor)
...@@ -72,7 +69,6 @@ public class TInsRecInforController extends BaseController ...@@ -72,7 +69,6 @@ public class TInsRecInforController extends BaseController
/** /**
* 获取监督检查-检查记录详细信息 * 获取监督检查-检查记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:record:query')")
@GetMapping(value = "/{fInsRecInforId}") @GetMapping(value = "/{fInsRecInforId}")
public AjaxResult getInfo(@PathVariable("fInsRecInforId") Long fInsRecInforId) public AjaxResult getInfo(@PathVariable("fInsRecInforId") Long fInsRecInforId)
{ {
...@@ -82,7 +78,6 @@ public class TInsRecInforController extends BaseController ...@@ -82,7 +78,6 @@ public class TInsRecInforController extends BaseController
/** /**
* 新增监督检查-检查记录 * 新增监督检查-检查记录
*/ */
@PreAuthorize("@ss.hasPermi('supervision:record:add')")
@Log(title = "监督检查-检查记录", businessType = BusinessType.INSERT) @Log(title = "监督检查-检查记录", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsRecInfor tInsRecInfor) public AjaxResult add(@RequestBody TInsRecInfor tInsRecInfor)
...@@ -93,7 +88,6 @@ public class TInsRecInforController extends BaseController ...@@ -93,7 +88,6 @@ public class TInsRecInforController extends BaseController
/** /**
* 修改监督检查-检查记录 * 修改监督检查-检查记录
*/ */
@PreAuthorize("@ss.hasPermi('supervision:record:edit')")
@Log(title = "监督检查-检查记录", businessType = BusinessType.UPDATE) @Log(title = "监督检查-检查记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsRecInfor tInsRecInfor) public AjaxResult edit(@RequestBody TInsRecInfor tInsRecInfor)
...@@ -104,7 +98,6 @@ public class TInsRecInforController extends BaseController ...@@ -104,7 +98,6 @@ public class TInsRecInforController extends BaseController
/** /**
* 删除监督检查-检查记录 * 删除监督检查-检查记录
*/ */
@PreAuthorize("@ss.hasPermi('supervision:record:remove')")
@Log(title = "监督检查-检查记录", businessType = BusinessType.DELETE) @Log(title = "监督检查-检查记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsRecInforIds}") @DeleteMapping("/{fInsRecInforIds}")
public AjaxResult remove(@PathVariable Long[] fInsRecInforIds) public AjaxResult remove(@PathVariable Long[] fInsRecInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsScopeInforController.java
View file @ 1c05698b
...@@ -36,7 +36,6 @@ public class TInsScopeInforController extends BaseController ...@@ -36,7 +36,6 @@ public class TInsScopeInforController extends BaseController
/** /**
* 查询监督检查-检查范围列表 * 查询监督检查-检查范围列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:scope:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsScopeInfor tInsScopeInfor) public TableDataInfo list(TInsScopeInfor tInsScopeInfor)
{ {
...@@ -48,7 +47,6 @@ public class TInsScopeInforController extends BaseController ...@@ -48,7 +47,6 @@ public class TInsScopeInforController extends BaseController
/** /**
* 导出监督检查-检查范围列表 * 导出监督检查-检查范围列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:scope:export')")
@Log(title = "监督检查-检查范围", businessType = BusinessType.EXPORT) @Log(title = "监督检查-检查范围", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsScopeInfor tInsScopeInfor) public AjaxResult export(TInsScopeInfor tInsScopeInfor)
...@@ -61,7 +59,6 @@ public class TInsScopeInforController extends BaseController ...@@ -61,7 +59,6 @@ public class TInsScopeInforController extends BaseController
/** /**
* 获取监督检查-检查范围详细信息 * 获取监督检查-检查范围详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:scope:query')")
@GetMapping(value = "/{fScopeInforId}") @GetMapping(value = "/{fScopeInforId}")
public AjaxResult getInfo(@PathVariable("fScopeInforId") Long fScopeInforId) public AjaxResult getInfo(@PathVariable("fScopeInforId") Long fScopeInforId)
{ {
...@@ -71,7 +68,6 @@ public class TInsScopeInforController extends BaseController ...@@ -71,7 +68,6 @@ public class TInsScopeInforController extends BaseController
/** /**
* 新增监督检查-检查范围 * 新增监督检查-检查范围
*/ */
@PreAuthorize("@ss.hasPermi('supervision:scope:add')")
@Log(title = "监督检查-检查范围", businessType = BusinessType.INSERT) @Log(title = "监督检查-检查范围", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsScopeInfor tInsScopeInfor) public AjaxResult add(@RequestBody TInsScopeInfor tInsScopeInfor)
...@@ -82,7 +78,6 @@ public class TInsScopeInforController extends BaseController ...@@ -82,7 +78,6 @@ public class TInsScopeInforController extends BaseController
/** /**
* 修改监督检查-检查范围 * 修改监督检查-检查范围
*/ */
@PreAuthorize("@ss.hasPermi('supervision:scope:edit')")
@Log(title = "监督检查-检查范围", businessType = BusinessType.UPDATE) @Log(title = "监督检查-检查范围", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsScopeInfor tInsScopeInfor) public AjaxResult edit(@RequestBody TInsScopeInfor tInsScopeInfor)
...@@ -93,7 +88,6 @@ public class TInsScopeInforController extends BaseController ...@@ -93,7 +88,6 @@ public class TInsScopeInforController extends BaseController
/** /**
* 删除监督检查-检查范围 * 删除监督检查-检查范围
*/ */
@PreAuthorize("@ss.hasPermi('supervision:scope:remove')")
@Log(title = "监督检查-检查范围", businessType = BusinessType.DELETE) @Log(title = "监督检查-检查范围", businessType = BusinessType.DELETE)
@DeleteMapping("/{fScopeInforIds}") @DeleteMapping("/{fScopeInforIds}")
public AjaxResult remove(@PathVariable Long[] fScopeInforIds) public AjaxResult remove(@PathVariable Long[] fScopeInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsSpotHazardRefController.java
View file @ 1c05698b
package com.zehong.web.controller.supervision; package com.zehong.web.controller.supervision;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TInsSpotHazardRefController extends BaseController ...@@ -36,7 +35,6 @@ public class TInsSpotHazardRefController extends BaseController
/** /**
* 查询监督检查-抽查隐患列表 * 查询监督检查-抽查隐患列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:spot:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsSpotHazardRef tInsSpotHazardRef) public TableDataInfo list(TInsSpotHazardRef tInsSpotHazardRef)
{ {
...@@ -48,7 +46,6 @@ public class TInsSpotHazardRefController extends BaseController ...@@ -48,7 +46,6 @@ public class TInsSpotHazardRefController extends BaseController
/** /**
* 导出监督检查-抽查隐患列表 * 导出监督检查-抽查隐患列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:spot:export')")
@Log(title = "监督检查-抽查隐患", businessType = BusinessType.EXPORT) @Log(title = "监督检查-抽查隐患", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsSpotHazardRef tInsSpotHazardRef) public AjaxResult export(TInsSpotHazardRef tInsSpotHazardRef)
...@@ -61,7 +58,6 @@ public class TInsSpotHazardRefController extends BaseController ...@@ -61,7 +58,6 @@ public class TInsSpotHazardRefController extends BaseController
/** /**
* 获取监督检查-抽查隐患详细信息 * 获取监督检查-抽查隐患详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:spot:query')")
@GetMapping(value = "/{fInsSpotHazardRefId}") @GetMapping(value = "/{fInsSpotHazardRefId}")
public AjaxResult getInfo(@PathVariable("fInsSpotHazardRefId") Long fInsSpotHazardRefId) public AjaxResult getInfo(@PathVariable("fInsSpotHazardRefId") Long fInsSpotHazardRefId)
{ {
...@@ -71,7 +67,6 @@ public class TInsSpotHazardRefController extends BaseController ...@@ -71,7 +67,6 @@ public class TInsSpotHazardRefController extends BaseController
/** /**
* 新增监督检查-抽查隐患 * 新增监督检查-抽查隐患
*/ */
@PreAuthorize("@ss.hasPermi('supervision:spot:add')")
@Log(title = "监督检查-抽查隐患", businessType = BusinessType.INSERT) @Log(title = "监督检查-抽查隐患", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsSpotHazardRef tInsSpotHazardRef) public AjaxResult add(@RequestBody TInsSpotHazardRef tInsSpotHazardRef)
...@@ -82,7 +77,6 @@ public class TInsSpotHazardRefController extends BaseController ...@@ -82,7 +77,6 @@ public class TInsSpotHazardRefController extends BaseController
/** /**
* 修改监督检查-抽查隐患 * 修改监督检查-抽查隐患
*/ */
@PreAuthorize("@ss.hasPermi('supervision:spot:edit')")
@Log(title = "监督检查-抽查隐患", businessType = BusinessType.UPDATE) @Log(title = "监督检查-抽查隐患", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsSpotHazardRef tInsSpotHazardRef) public AjaxResult edit(@RequestBody TInsSpotHazardRef tInsSpotHazardRef)
...@@ -93,7 +87,6 @@ public class TInsSpotHazardRefController extends BaseController ...@@ -93,7 +87,6 @@ public class TInsSpotHazardRefController extends BaseController
/** /**
* 删除监督检查-抽查隐患 * 删除监督检查-抽查隐患
*/ */
@PreAuthorize("@ss.hasPermi('supervision:spot:remove')")
@Log(title = "监督检查-抽查隐患", businessType = BusinessType.DELETE) @Log(title = "监督检查-抽查隐患", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsSpotHazardRefIds}") @DeleteMapping("/{fInsSpotHazardRefIds}")
public AjaxResult remove(@PathVariable Long[] fInsSpotHazardRefIds) public AjaxResult remove(@PathVariable Long[] fInsSpotHazardRefIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsSpotRecInforController.java
View file @ 1c05698b
package com.zehong.web.controller.supervision; package com.zehong.web.controller.supervision;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TInsSpotRecInforController extends BaseController ...@@ -36,7 +35,6 @@ public class TInsSpotRecInforController extends BaseController
/** /**
* 查询监督检查-调查结果列表 * 查询监督检查-调查结果列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:findings:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsSpotRecInfor tInsSpotRecInfor) public TableDataInfo list(TInsSpotRecInfor tInsSpotRecInfor)
{ {
...@@ -48,7 +46,6 @@ public class TInsSpotRecInforController extends BaseController ...@@ -48,7 +46,6 @@ public class TInsSpotRecInforController extends BaseController
/** /**
* 导出监督检查-调查结果列表 * 导出监督检查-调查结果列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:findings:export')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.EXPORT) @Log(title = "监督检查-调查结果", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsSpotRecInfor tInsSpotRecInfor) public AjaxResult export(TInsSpotRecInfor tInsSpotRecInfor)
...@@ -61,7 +58,6 @@ public class TInsSpotRecInforController extends BaseController ...@@ -61,7 +58,6 @@ public class TInsSpotRecInforController extends BaseController
/** /**
* 获取监督检查-调查结果详细信息 * 获取监督检查-调查结果详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:findings:query')")
@GetMapping(value = "/{fInsSpotRecInforId}") @GetMapping(value = "/{fInsSpotRecInforId}")
public AjaxResult getInfo(@PathVariable("fInsSpotRecInforId") Long fInsSpotRecInforId) public AjaxResult getInfo(@PathVariable("fInsSpotRecInforId") Long fInsSpotRecInforId)
{ {
...@@ -71,7 +67,6 @@ public class TInsSpotRecInforController extends BaseController ...@@ -71,7 +67,6 @@ public class TInsSpotRecInforController extends BaseController
/** /**
* 新增监督检查-调查结果 * 新增监督检查-调查结果
*/ */
@PreAuthorize("@ss.hasPermi('supervision:findings:add')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.INSERT) @Log(title = "监督检查-调查结果", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsSpotRecInfor tInsSpotRecInfor) public AjaxResult add(@RequestBody TInsSpotRecInfor tInsSpotRecInfor)
...@@ -82,7 +77,6 @@ public class TInsSpotRecInforController extends BaseController ...@@ -82,7 +77,6 @@ public class TInsSpotRecInforController extends BaseController
/** /**
* 修改监督检查-调查结果 * 修改监督检查-调查结果
*/ */
@PreAuthorize("@ss.hasPermi('supervision:findings:edit')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.UPDATE) @Log(title = "监督检查-调查结果", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsSpotRecInfor tInsSpotRecInfor) public AjaxResult edit(@RequestBody TInsSpotRecInfor tInsSpotRecInfor)
...@@ -93,7 +87,6 @@ public class TInsSpotRecInforController extends BaseController ...@@ -93,7 +87,6 @@ public class TInsSpotRecInforController extends BaseController
/** /**
* 删除监督检查-调查结果 * 删除监督检查-调查结果
*/ */
@PreAuthorize("@ss.hasPermi('supervision:findings:remove')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.DELETE) @Log(title = "监督检查-调查结果", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsSpotRecInforIds}") @DeleteMapping("/{fInsSpotRecInforIds}")
public AjaxResult remove(@PathVariable Long[] fInsSpotRecInforIds) public AjaxResult remove(@PathVariable Long[] fInsSpotRecInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsStaInforController.java
View file @ 1c05698b
...@@ -36,7 +36,6 @@ public class TInsStaInforController extends BaseController ...@@ -36,7 +36,6 @@ public class TInsStaInforController extends BaseController
/** /**
* 查询监督检查-隐患分类分级标准列表 * 查询监督检查-隐患分类分级标准列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:hideType:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsStaInfor tInsStaInfor) public TableDataInfo list(TInsStaInfor tInsStaInfor)
{ {
...@@ -54,7 +53,6 @@ public class TInsStaInforController extends BaseController ...@@ -54,7 +53,6 @@ public class TInsStaInforController extends BaseController
/** /**
* 导出监督检查-隐患分类分级标准列表 * 导出监督检查-隐患分类分级标准列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:hideType:export')")
@Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.EXPORT) @Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsStaInfor tInsStaInfor) public AjaxResult export(TInsStaInfor tInsStaInfor)
...@@ -67,7 +65,6 @@ public class TInsStaInforController extends BaseController ...@@ -67,7 +65,6 @@ public class TInsStaInforController extends BaseController
/** /**
* 获取监督检查-隐患分类分级标准详细信息 * 获取监督检查-隐患分类分级标准详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:hideType:query')")
@GetMapping(value = "/{fInsStaInforId}") @GetMapping(value = "/{fInsStaInforId}")
public AjaxResult getInfo(@PathVariable("fInsStaInforId") Long fInsStaInforId) public AjaxResult getInfo(@PathVariable("fInsStaInforId") Long fInsStaInforId)
{ {
...@@ -77,7 +74,6 @@ public class TInsStaInforController extends BaseController ...@@ -77,7 +74,6 @@ public class TInsStaInforController extends BaseController
/** /**
* 新增监督检查-隐患分类分级标准 * 新增监督检查-隐患分类分级标准
*/ */
@PreAuthorize("@ss.hasPermi('supervision:hideType:add')")
@Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.INSERT) @Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsStaInfor tInsStaInfor) public AjaxResult add(@RequestBody TInsStaInfor tInsStaInfor)
...@@ -88,7 +84,6 @@ public class TInsStaInforController extends BaseController ...@@ -88,7 +84,6 @@ public class TInsStaInforController extends BaseController
/** /**
* 修改监督检查-隐患分类分级标准 * 修改监督检查-隐患分类分级标准
*/ */
@PreAuthorize("@ss.hasPermi('supervision:hideType:edit')")
@Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.UPDATE) @Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsStaInfor tInsStaInfor) public AjaxResult edit(@RequestBody TInsStaInfor tInsStaInfor)
...@@ -99,7 +94,6 @@ public class TInsStaInforController extends BaseController ...@@ -99,7 +94,6 @@ public class TInsStaInforController extends BaseController
/** /**
* 删除监督检查-隐患分类分级标准 * 删除监督检查-隐患分类分级标准
*/ */
@PreAuthorize("@ss.hasPermi('supervision:hideType:remove')")
@Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.DELETE) @Log(title = "监督检查-隐患分类分级标准", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsStaInforIds}") @DeleteMapping("/{fInsStaInforIds}")
public AjaxResult remove(@PathVariable Long[] fInsStaInforIds) public AjaxResult remove(@PathVariable Long[] fInsStaInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsSurListInforController.java
View file @ 1c05698b
package com.zehong.web.controller.supervision; package com.zehong.web.controller.supervision;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TInsSurListInforController extends BaseController ...@@ -36,7 +35,6 @@ public class TInsSurListInforController extends BaseController
/** /**
* 查询监督检查-调查项列表 * 查询监督检查-调查项列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:survey:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsSurListInfor tInsSurListInfor) public TableDataInfo list(TInsSurListInfor tInsSurListInfor)
{ {
...@@ -48,7 +46,6 @@ public class TInsSurListInforController extends BaseController ...@@ -48,7 +46,6 @@ public class TInsSurListInforController extends BaseController
/** /**
* 导出监督检查-调查项列表 * 导出监督检查-调查项列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:survey:export')")
@Log(title = "监督检查-调查项", businessType = BusinessType.EXPORT) @Log(title = "监督检查-调查项", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsSurListInfor tInsSurListInfor) public AjaxResult export(TInsSurListInfor tInsSurListInfor)
...@@ -61,7 +58,6 @@ public class TInsSurListInforController extends BaseController ...@@ -61,7 +58,6 @@ public class TInsSurListInforController extends BaseController
/** /**
* 获取监督检查-调查项详细信息 * 获取监督检查-调查项详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:survey:query')")
@GetMapping(value = "/{fInsSurListInforId}") @GetMapping(value = "/{fInsSurListInforId}")
public AjaxResult getInfo(@PathVariable("fInsSurListInforId") Long fInsSurListInforId) public AjaxResult getInfo(@PathVariable("fInsSurListInforId") Long fInsSurListInforId)
{ {
...@@ -71,7 +67,6 @@ public class TInsSurListInforController extends BaseController ...@@ -71,7 +67,6 @@ public class TInsSurListInforController extends BaseController
/** /**
* 新增监督检查-调查项 * 新增监督检查-调查项
*/ */
@PreAuthorize("@ss.hasPermi('supervision:survey:add')")
@Log(title = "监督检查-调查项", businessType = BusinessType.INSERT) @Log(title = "监督检查-调查项", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsSurListInfor tInsSurListInfor) public AjaxResult add(@RequestBody TInsSurListInfor tInsSurListInfor)
...@@ -82,7 +77,6 @@ public class TInsSurListInforController extends BaseController ...@@ -82,7 +77,6 @@ public class TInsSurListInforController extends BaseController
/** /**
* 修改监督检查-调查项 * 修改监督检查-调查项
*/ */
@PreAuthorize("@ss.hasPermi('supervision:survey:edit')")
@Log(title = "监督检查-调查项", businessType = BusinessType.UPDATE) @Log(title = "监督检查-调查项", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsSurListInfor tInsSurListInfor) public AjaxResult edit(@RequestBody TInsSurListInfor tInsSurListInfor)
...@@ -93,7 +87,6 @@ public class TInsSurListInforController extends BaseController ...@@ -93,7 +87,6 @@ public class TInsSurListInforController extends BaseController
/** /**
* 删除监督检查-调查项 * 删除监督检查-调查项
*/ */
@PreAuthorize("@ss.hasPermi('supervision:survey:remove')")
@Log(title = "监督检查-调查项", businessType = BusinessType.DELETE) @Log(title = "监督检查-调查项", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsSurListInforIds}") @DeleteMapping("/{fInsSurListInforIds}")
public AjaxResult remove(@PathVariable Long[] fInsSurListInforIds) public AjaxResult remove(@PathVariable Long[] fInsSurListInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsTaskInforController.java
View file @ 1c05698b
package com.zehong.web.controller.supervision; package com.zehong.web.controller.supervision;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TInsTaskInforController extends BaseController ...@@ -36,7 +35,6 @@ public class TInsTaskInforController extends BaseController
/** /**
* 查询监督检查-检查任务列表 * 查询监督检查-检查任务列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:task:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TInsTaskInfor tInsTaskInfor) public TableDataInfo list(TInsTaskInfor tInsTaskInfor)
{ {
...@@ -57,7 +55,6 @@ public class TInsTaskInforController extends BaseController ...@@ -57,7 +55,6 @@ public class TInsTaskInforController extends BaseController
/** /**
* 导出监督检查-检查任务列表 * 导出监督检查-检查任务列表
*/ */
@PreAuthorize("@ss.hasPermi('supervision:task:export')")
@Log(title = "监督检查-检查任务", businessType = BusinessType.EXPORT) @Log(title = "监督检查-检查任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TInsTaskInfor tInsTaskInfor) public AjaxResult export(TInsTaskInfor tInsTaskInfor)
...@@ -70,7 +67,6 @@ public class TInsTaskInforController extends BaseController ...@@ -70,7 +67,6 @@ public class TInsTaskInforController extends BaseController
/** /**
* 获取监督检查-检查任务详细信息 * 获取监督检查-检查任务详细信息
*/ */
@PreAuthorize("@ss.hasPermi('supervision:task:query')")
@GetMapping(value = "/{fInsTaskInforId}") @GetMapping(value = "/{fInsTaskInforId}")
public AjaxResult getInfo(@PathVariable("fInsTaskInforId") Long fInsTaskInforId) public AjaxResult getInfo(@PathVariable("fInsTaskInforId") Long fInsTaskInforId)
{ {
...@@ -80,7 +76,6 @@ public class TInsTaskInforController extends BaseController ...@@ -80,7 +76,6 @@ public class TInsTaskInforController extends BaseController
/** /**
* 新增监督检查-检查任务 * 新增监督检查-检查任务
*/ */
@PreAuthorize("@ss.hasPermi('supervision:task:add')")
@Log(title = "监督检查-检查任务", businessType = BusinessType.INSERT) @Log(title = "监督检查-检查任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TInsTaskInfor tInsTaskInfor) public AjaxResult add(@RequestBody TInsTaskInfor tInsTaskInfor)
...@@ -91,7 +86,6 @@ public class TInsTaskInforController extends BaseController ...@@ -91,7 +86,6 @@ public class TInsTaskInforController extends BaseController
/** /**
* 修改监督检查-检查任务 * 修改监督检查-检查任务
*/ */
@PreAuthorize("@ss.hasPermi('supervision:task:edit')")
@Log(title = "监督检查-检查任务", businessType = BusinessType.UPDATE) @Log(title = "监督检查-检查任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TInsTaskInfor tInsTaskInfor) public AjaxResult edit(@RequestBody TInsTaskInfor tInsTaskInfor)
...@@ -102,7 +96,6 @@ public class TInsTaskInforController extends BaseController ...@@ -102,7 +96,6 @@ public class TInsTaskInforController extends BaseController
/** /**
* 删除监督检查-检查任务 * 删除监督检查-检查任务
*/ */
@PreAuthorize("@ss.hasPermi('supervision:task:remove')")
@Log(title = "监督检查-检查任务", businessType = BusinessType.DELETE) @Log(title = "监督检查-检查任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsTaskInforIds}") @DeleteMapping("/{fInsTaskInforIds}")
public AjaxResult remove(@PathVariable Long[] fInsTaskInforIds) public AjaxResult remove(@PathVariable Long[] fInsTaskInforIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysConfigController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system; ...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -39,7 +38,6 @@ public class SysConfigController extends BaseController ...@@ -39,7 +38,6 @@ public class SysConfigController extends BaseController
/** /**
* 获取参数配置列表 * 获取参数配置列表
*/ */
@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysConfig config) public TableDataInfo list(SysConfig config)
{ {
...@@ -49,7 +47,6 @@ public class SysConfigController extends BaseController ...@@ -49,7 +47,6 @@ public class SysConfigController extends BaseController
} }
@Log(title = "参数管理", businessType = BusinessType.EXPORT) @Log(title = "参数管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:config:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysConfig config) public AjaxResult export(SysConfig config)
{ {
...@@ -61,7 +58,6 @@ public class SysConfigController extends BaseController ...@@ -61,7 +58,6 @@ public class SysConfigController extends BaseController
/** /**
* 根据参数编号获取详细信息 * 根据参数编号获取详细信息
*/ */
@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 +76,6 @@ public class SysConfigController extends BaseController ...@@ -80,7 +76,6 @@ public class SysConfigController extends BaseController
/** /**
* 新增参数配置 * 新增参数配置
*/ */
@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "参数管理", businessType = BusinessType.INSERT) @Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@RepeatSubmit @RepeatSubmit
...@@ -97,7 +92,6 @@ public class SysConfigController extends BaseController ...@@ -97,7 +92,6 @@ public class SysConfigController extends BaseController
/** /**
* 修改参数配置 * 修改参数配置
*/ */
@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 +107,6 @@ public class SysConfigController extends BaseController ...@@ -113,7 +107,6 @@ public class SysConfigController extends BaseController
/** /**
* 删除参数配置 * 删除参数配置
*/ */
@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 +118,6 @@ public class SysConfigController extends BaseController ...@@ -125,7 +118,6 @@ public class SysConfigController extends BaseController
/** /**
* 刷新参数缓存 * 刷新参数缓存
*/ */
@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()
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysDeptController.java
View file @ 1c05698b
...@@ -4,7 +4,6 @@ import java.util.Iterator; ...@@ -4,7 +4,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -39,7 +38,6 @@ public class SysDeptController extends BaseController ...@@ -39,7 +38,6 @@ public class SysDeptController extends BaseController
/** /**
* 获取部门列表 * 获取部门列表
*/ */
@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysDept dept) public AjaxResult list(SysDept dept)
{ {
...@@ -50,7 +48,6 @@ public class SysDeptController extends BaseController ...@@ -50,7 +48,6 @@ public class SysDeptController extends BaseController
/** /**
* 查询部门列表（排除节点） * 查询部门列表（排除节点）
*/ */
@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 +68,6 @@ public class SysDeptController extends BaseController ...@@ -71,7 +68,6 @@ public class SysDeptController extends BaseController
/** /**
* 根据部门编号获取详细信息 * 根据部门编号获取详细信息
*/ */
@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 +100,6 @@ public class SysDeptController extends BaseController ...@@ -104,7 +100,6 @@ public class SysDeptController extends BaseController
/** /**
* 新增部门 * 新增部门
*/ */
@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 +115,6 @@ public class SysDeptController extends BaseController ...@@ -120,7 +115,6 @@ public class SysDeptController extends BaseController
/** /**
* 修改部门 * 修改部门
*/ */
@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 +139,6 @@ public class SysDeptController extends BaseController ...@@ -145,7 +139,6 @@ public class SysDeptController extends BaseController
/** /**
* 删除部门 * 删除部门
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysDictDataController.java
View file @ 1c05698b
...@@ -3,7 +3,6 @@ package com.zehong.web.controller.system; ...@@ -3,7 +3,6 @@ package com.zehong.web.controller.system;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -40,7 +39,6 @@ public class SysDictDataController extends BaseController ...@@ -40,7 +39,6 @@ public class SysDictDataController extends BaseController
@Autowired @Autowired
private ISysDictTypeService dictTypeService; private ISysDictTypeService dictTypeService;
//@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysDictData dictData) public TableDataInfo list(SysDictData dictData)
{ {
...@@ -50,7 +48,6 @@ public class SysDictDataController extends BaseController ...@@ -50,7 +48,6 @@ public class SysDictDataController extends BaseController
} }
@Log(title = "字典数据", businessType = BusinessType.EXPORT) @Log(title = "字典数据", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysDictData dictData) public AjaxResult export(SysDictData dictData)
{ {
...@@ -62,7 +59,6 @@ public class SysDictDataController extends BaseController ...@@ -62,7 +59,6 @@ public class SysDictDataController extends BaseController
/** /**
* 查询字典数据详细 * 查询字典数据详细
*/ */
@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 +82,6 @@ public class SysDictDataController extends BaseController ...@@ -86,7 +82,6 @@ public class SysDictDataController extends BaseController
/** /**
* 新增字典类型 * 新增字典类型
*/ */
@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 +93,6 @@ public class SysDictDataController extends BaseController ...@@ -98,7 +93,6 @@ public class SysDictDataController extends BaseController
/** /**
* 修改保存字典类型 * 修改保存字典类型
*/ */
@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 +104,6 @@ public class SysDictDataController extends BaseController ...@@ -110,7 +104,6 @@ public class SysDictDataController extends BaseController
/** /**
* 删除字典类型 * 删除字典类型
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysDictTypeController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system; ...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -35,7 +34,6 @@ public class SysDictTypeController extends BaseController ...@@ -35,7 +34,6 @@ public class SysDictTypeController extends BaseController
@Autowired @Autowired
private ISysDictTypeService dictTypeService; private ISysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysDictType dictType) public TableDataInfo list(SysDictType dictType)
{ {
...@@ -45,7 +43,6 @@ public class SysDictTypeController extends BaseController ...@@ -45,7 +43,6 @@ public class SysDictTypeController extends BaseController
} }
@Log(title = "字典类型", businessType = BusinessType.EXPORT) @Log(title = "字典类型", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysDictType dictType) public AjaxResult export(SysDictType dictType)
{ {
...@@ -57,7 +54,6 @@ public class SysDictTypeController extends BaseController ...@@ -57,7 +54,6 @@ public class SysDictTypeController extends BaseController
/** /**
* 查询字典类型详细 * 查询字典类型详细
*/ */
@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 +63,6 @@ public class SysDictTypeController extends BaseController ...@@ -67,7 +63,6 @@ public class SysDictTypeController extends BaseController
/** /**
* 新增字典类型 * 新增字典类型
*/ */
@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 +78,6 @@ public class SysDictTypeController extends BaseController ...@@ -83,7 +78,6 @@ public class SysDictTypeController extends BaseController
/** /**
* 修改字典类型 * 修改字典类型
*/ */
@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 +93,6 @@ public class SysDictTypeController extends BaseController ...@@ -99,7 +93,6 @@ public class SysDictTypeController extends BaseController
/** /**
* 删除字典类型 * 删除字典类型
*/ */
@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 +104,6 @@ public class SysDictTypeController extends BaseController ...@@ -111,7 +104,6 @@ public class SysDictTypeController extends BaseController
/** /**
* 刷新字典缓存 * 刷新字典缓存
*/ */
@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()
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysMenuController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system; ...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -44,7 +43,6 @@ public class SysMenuController extends BaseController ...@@ -44,7 +43,6 @@ public class SysMenuController extends BaseController
/** /**
* 获取菜单列表 * 获取菜单列表
*/ */
@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysMenu menu) public AjaxResult list(SysMenu menu)
{ {
...@@ -57,7 +55,6 @@ public class SysMenuController extends BaseController ...@@ -57,7 +55,6 @@ public class SysMenuController extends BaseController
/** /**
* 根据菜单编号获取详细信息 * 根据菜单编号获取详细信息
*/ */
@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 +90,6 @@ public class SysMenuController extends BaseController ...@@ -93,7 +90,6 @@ public class SysMenuController extends BaseController
/** /**
* 新增菜单 * 新增菜单
*/ */
@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 +110,6 @@ public class SysMenuController extends BaseController ...@@ -114,7 +110,6 @@ public class SysMenuController extends BaseController
/** /**
* 修改菜单 * 修改菜单
*/ */
@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 +134,6 @@ public class SysMenuController extends BaseController ...@@ -139,7 +134,6 @@ public class SysMenuController extends BaseController
/** /**
* 删除菜单 * 删除菜单
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysNoticeController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system; ...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -36,7 +35,6 @@ public class SysNoticeController extends BaseController ...@@ -36,7 +35,6 @@ public class SysNoticeController extends BaseController
/** /**
* 获取通知公告列表 * 获取通知公告列表
*/ */
@PreAuthorize("@ss.hasPermi('system:notice:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysNotice notice) public TableDataInfo list(SysNotice notice)
{ {
...@@ -48,7 +46,6 @@ public class SysNoticeController extends BaseController ...@@ -48,7 +46,6 @@ public class SysNoticeController extends BaseController
/** /**
* 根据通知公告编号获取详细信息 * 根据通知公告编号获取详细信息
*/ */
@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 +55,6 @@ public class SysNoticeController extends BaseController ...@@ -58,7 +55,6 @@ public class SysNoticeController extends BaseController
/** /**
* 新增通知公告 * 新增通知公告
*/ */
@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 +66,6 @@ public class SysNoticeController extends BaseController ...@@ -70,7 +66,6 @@ public class SysNoticeController extends BaseController
/** /**
* 修改通知公告 * 修改通知公告
*/ */
@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 +77,6 @@ public class SysNoticeController extends BaseController ...@@ -82,7 +77,6 @@ public class SysNoticeController extends BaseController
/** /**
* 删除通知公告 * 删除通知公告
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysPostController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system; ...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -38,7 +37,6 @@ public class SysPostController extends BaseController ...@@ -38,7 +37,6 @@ public class SysPostController extends BaseController
/** /**
* 获取岗位列表 * 获取岗位列表
*/ */
@PreAuthorize("@ss.hasPermi('system:post:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysPost post) public TableDataInfo list(SysPost post)
{ {
...@@ -48,7 +46,6 @@ public class SysPostController extends BaseController ...@@ -48,7 +46,6 @@ public class SysPostController extends BaseController
} }
@Log(title = "岗位管理", businessType = BusinessType.EXPORT) @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:post:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysPost post) public AjaxResult export(SysPost post)
{ {
...@@ -60,7 +57,6 @@ public class SysPostController extends BaseController ...@@ -60,7 +57,6 @@ public class SysPostController extends BaseController
/** /**
* 根据岗位编号获取详细信息 * 根据岗位编号获取详细信息
*/ */
@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 +66,6 @@ public class SysPostController extends BaseController ...@@ -70,7 +66,6 @@ public class SysPostController extends BaseController
/** /**
* 新增岗位 * 新增岗位
*/ */
@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 +85,6 @@ public class SysPostController extends BaseController ...@@ -90,7 +85,6 @@ public class SysPostController extends BaseController
/** /**
* 修改岗位 * 修改岗位
*/ */
@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 +104,6 @@ public class SysPostController extends BaseController ...@@ -110,7 +104,6 @@ public class SysPostController extends BaseController
/** /**
* 删除岗位 * 删除岗位
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysRoleController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system; ...@@ -2,7 +2,6 @@ package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -50,7 +49,6 @@ public class SysRoleController extends BaseController ...@@ -50,7 +49,6 @@ public class SysRoleController extends BaseController
@Autowired @Autowired
private ISysUserService userService; private ISysUserService userService;
@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysRole role) public TableDataInfo list(SysRole role)
{ {
...@@ -60,7 +58,6 @@ public class SysRoleController extends BaseController ...@@ -60,7 +58,6 @@ public class SysRoleController extends BaseController
} }
@Log(title = "角色管理", businessType = BusinessType.EXPORT) @Log(title = "角色管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:role:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysRole role) public AjaxResult export(SysRole role)
{ {
...@@ -72,7 +69,6 @@ public class SysRoleController extends BaseController ...@@ -72,7 +69,6 @@ public class SysRoleController extends BaseController
/** /**
* 根据角色编号获取详细信息 * 根据角色编号获取详细信息
*/ */
@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 +78,6 @@ public class SysRoleController extends BaseController ...@@ -82,7 +78,6 @@ public class SysRoleController extends BaseController
/** /**
* 新增角色 * 新增角色
*/ */
@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 +98,6 @@ public class SysRoleController extends BaseController ...@@ -103,7 +98,6 @@ public class SysRoleController extends BaseController
/** /**
* 修改保存角色 * 修改保存角色
*/ */
@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 +131,6 @@ public class SysRoleController extends BaseController ...@@ -137,7 +131,6 @@ public class SysRoleController extends BaseController
/** /**
* 修改保存数据权限 * 修改保存数据权限
*/ */
@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 +142,6 @@ public class SysRoleController extends BaseController ...@@ -149,7 +142,6 @@ public class SysRoleController extends BaseController
/** /**
* 状态修改 * 状态修改
*/ */
@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 +154,6 @@ public class SysRoleController extends BaseController ...@@ -162,7 +154,6 @@ public class SysRoleController extends BaseController
/** /**
* 删除角色 * 删除角色
*/ */
@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 +164,6 @@ public class SysRoleController extends BaseController ...@@ -173,7 +164,6 @@ public class SysRoleController extends BaseController
/** /**
* 获取角色选择框列表 * 获取角色选择框列表
*/ */
@PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect() public AjaxResult optionselect()
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysSettingController.java
View file @ 1c05698b
...@@ -3,7 +3,6 @@ package com.zehong.web.controller.system; ...@@ -3,7 +3,6 @@ package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import com.zehong.framework.systemsetting.SystemSetting; import com.zehong.framework.systemsetting.SystemSetting;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -41,7 +40,6 @@ public class SysSettingController extends BaseController ...@@ -41,7 +40,6 @@ public class SysSettingController extends BaseController
/** /**
* 查询系统参数配置列表 * 查询系统参数配置列表
*/ */
@PreAuthorize("@ss.hasPermi('system:setting:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysSetting sysSetting) public TableDataInfo list(SysSetting sysSetting)
{ {
...@@ -53,7 +51,6 @@ public class SysSettingController extends BaseController ...@@ -53,7 +51,6 @@ public class SysSettingController extends BaseController
/** /**
* 导出系统参数配置列表 * 导出系统参数配置列表
*/ */
@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 +63,6 @@ public class SysSettingController extends BaseController ...@@ -66,7 +63,6 @@ public class SysSettingController extends BaseController
/** /**
* 获取系统参数配置详细信息 * 获取系统参数配置详细信息
*/ */
@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 +72,6 @@ public class SysSettingController extends BaseController ...@@ -76,7 +72,6 @@ public class SysSettingController extends BaseController
/** /**
* 新增系统参数配置 * 新增系统参数配置
*/ */
@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 +82,6 @@ public class SysSettingController extends BaseController ...@@ -87,7 +82,6 @@ public class SysSettingController extends BaseController
/** /**
* 修改系统参数配置 * 修改系统参数配置
*/ */
@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 +92,6 @@ public class SysSettingController extends BaseController ...@@ -98,7 +92,6 @@ public class SysSettingController extends BaseController
/** /**
* 删除系统参数配置 * 删除系统参数配置
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysUserController.java
View file @ 1c05698b
...@@ -56,7 +56,6 @@ public class SysUserController extends BaseController ...@@ -56,7 +56,6 @@ public class SysUserController extends BaseController
/** /**
* 获取用户列表 * 获取用户列表
*/ */
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysUser user) public TableDataInfo list(SysUser user)
{ {
...@@ -66,7 +65,6 @@ public class SysUserController extends BaseController ...@@ -66,7 +65,6 @@ public class SysUserController extends BaseController
} }
@Log(title = "用户管理", businessType = BusinessType.EXPORT) @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysUser user) public AjaxResult export(SysUser user)
{ {
...@@ -76,7 +74,6 @@ public class SysUserController extends BaseController ...@@ -76,7 +74,6 @@ public class SysUserController extends BaseController
} }
@Log(title = "用户管理", businessType = BusinessType.IMPORT) @Log(title = "用户管理", businessType = BusinessType.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
{ {
...@@ -98,7 +95,6 @@ public class SysUserController extends BaseController ...@@ -98,7 +95,6 @@ public class SysUserController extends BaseController
/** /**
* 根据用户编号获取详细信息 * 根据用户编号获取详细信息
*/ */
@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)
{ {
...@@ -118,7 +114,6 @@ public class SysUserController extends BaseController ...@@ -118,7 +114,6 @@ public class SysUserController extends BaseController
/** /**
* 新增用户 * 新增用户
*/ */
@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)
...@@ -145,7 +140,6 @@ public class SysUserController extends BaseController ...@@ -145,7 +140,6 @@ public class SysUserController extends BaseController
/** /**
* 修改用户 * 修改用户
*/ */
@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)
...@@ -168,7 +162,6 @@ public class SysUserController extends BaseController ...@@ -168,7 +162,6 @@ public class SysUserController extends BaseController
/** /**
* 删除用户 * 删除用户
*/ */
@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)
...@@ -179,7 +172,6 @@ public class SysUserController extends BaseController ...@@ -179,7 +172,6 @@ public class SysUserController extends BaseController
/** /**
* 重置密码 * 重置密码
*/ */
@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)
...@@ -193,7 +185,6 @@ public class SysUserController extends BaseController ...@@ -193,7 +185,6 @@ public class SysUserController extends BaseController
/** /**
* 状态修改 * 状态修改
*/ */
@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/TDeliveryRecordController.java
View file @ 1c05698b
...@@ -9,7 +9,6 @@ import com.zehong.common.utils.poi.ExcelUtil; ...@@ -9,7 +9,6 @@ import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.*; import com.zehong.system.domain.*;
import com.zehong.system.service.*; import com.zehong.system.service.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Date; import java.util.Date;
...@@ -41,7 +40,6 @@ public class TDeliveryRecordController extends BaseController ...@@ -41,7 +40,6 @@ public class TDeliveryRecordController extends BaseController
/** /**
* 查询配送记录列表 * 查询配送记录列表
*/ */
@PreAuthorize("@ss.hasPermi('system:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDeliveryRecord tDeliveryRecord) public TableDataInfo list(TDeliveryRecord tDeliveryRecord)
{ {
...@@ -53,7 +51,6 @@ public class TDeliveryRecordController extends BaseController ...@@ -53,7 +51,6 @@ public class TDeliveryRecordController extends BaseController
/** /**
* 导出配送记录列表 * 导出配送记录列表
*/ */
@PreAuthorize("@ss.hasPermi('system:record:export')")
@Log(title = "配送记录", businessType = BusinessType.EXPORT) @Log(title = "配送记录", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDeliveryRecord tDeliveryRecord) public AjaxResult export(TDeliveryRecord tDeliveryRecord)
...@@ -66,7 +63,6 @@ public class TDeliveryRecordController extends BaseController ...@@ -66,7 +63,6 @@ public class TDeliveryRecordController extends BaseController
/** /**
* 获取配送记录详细信息 * 获取配送记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{deliveryRecordId}") @GetMapping(value = "/{deliveryRecordId}")
public AjaxResult getInfo(@PathVariable("deliveryRecordId") Long deliveryRecordId) public AjaxResult getInfo(@PathVariable("deliveryRecordId") Long deliveryRecordId)
{ {
...@@ -93,7 +89,6 @@ public class TDeliveryRecordController extends BaseController ...@@ -93,7 +89,6 @@ public class TDeliveryRecordController extends BaseController
/** /**
* 新增配送记录 * 新增配送记录
*/ */
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "配送记录", businessType = BusinessType.INSERT) @Log(title = "配送记录", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TDeliveryRecord tDeliveryRecord) public AjaxResult add(@RequestBody TDeliveryRecord tDeliveryRecord)
...@@ -171,7 +166,6 @@ public class TDeliveryRecordController extends BaseController ...@@ -171,7 +166,6 @@ public class TDeliveryRecordController extends BaseController
/** /**
* 修改配送记录 * 修改配送记录
*/ */
@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "配送记录", businessType = BusinessType.UPDATE) @Log(title = "配送记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDeliveryRecord tDeliveryRecord) public AjaxResult edit(@RequestBody TDeliveryRecord tDeliveryRecord)
...@@ -182,7 +176,6 @@ public class TDeliveryRecordController extends BaseController ...@@ -182,7 +176,6 @@ public class TDeliveryRecordController extends BaseController
/** /**
* 删除配送记录 * 删除配送记录
*/ */
@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "配送记录", businessType = BusinessType.DELETE) @Log(title = "配送记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{deliveryRecordIds}") @DeleteMapping("/{deliveryRecordIds}")
public AjaxResult remove(@PathVariable Long[] deliveryRecordIds) public AjaxResult remove(@PathVariable Long[] deliveryRecordIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/TDeviceUserController.java
View file @ 1c05698b
package com.zehong.web.controller.system; package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TDeviceUserController extends BaseController ...@@ -36,7 +35,6 @@ public class TDeviceUserController extends BaseController
/** /**
* 查询设备用户列表 * 查询设备用户列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:deviceUser:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDeviceUser tDeviceUser) public TableDataInfo list(TDeviceUser tDeviceUser)
{ {
...@@ -55,7 +53,6 @@ public class TDeviceUserController extends BaseController ...@@ -55,7 +53,6 @@ public class TDeviceUserController extends BaseController
/** /**
* 导出设备用户列表 * 导出设备用户列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:deviceUser:export')")
@Log(title = "设备用户", businessType = BusinessType.EXPORT) @Log(title = "设备用户", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDeviceUser tDeviceUser) public AjaxResult export(TDeviceUser tDeviceUser)
...@@ -68,7 +65,6 @@ public class TDeviceUserController extends BaseController ...@@ -68,7 +65,6 @@ public class TDeviceUserController extends BaseController
/** /**
* 获取设备用户详细信息 * 获取设备用户详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:deviceUser:query')")
@GetMapping(value = "/{userId}") @GetMapping(value = "/{userId}")
public AjaxResult getInfo(@PathVariable("userId") Long userId) public AjaxResult getInfo(@PathVariable("userId") Long userId)
{ {
...@@ -78,7 +74,6 @@ public class TDeviceUserController extends BaseController ...@@ -78,7 +74,6 @@ public class TDeviceUserController extends BaseController
/** /**
* 新增设备用户 * 新增设备用户
*/ */
//@PreAuthorize("@ss.hasPermi('system:deviceUser:add')")
@Log(title = "设备用户", businessType = BusinessType.INSERT) @Log(title = "设备用户", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TDeviceUser tDeviceUser) public AjaxResult add(@RequestBody TDeviceUser tDeviceUser)
...@@ -89,7 +84,6 @@ public class TDeviceUserController extends BaseController ...@@ -89,7 +84,6 @@ public class TDeviceUserController extends BaseController
/** /**
* 修改设备用户 * 修改设备用户
*/ */
//@PreAuthorize("@ss.hasPermi('system:deviceUser:edit')")
@Log(title = "设备用户", businessType = BusinessType.UPDATE) @Log(title = "设备用户", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDeviceUser tDeviceUser) public AjaxResult edit(@RequestBody TDeviceUser tDeviceUser)
...@@ -100,7 +94,6 @@ public class TDeviceUserController extends BaseController ...@@ -100,7 +94,6 @@ public class TDeviceUserController extends BaseController
/** /**
* 删除设备用户 * 删除设备用户
*/ */
//@PreAuthorize("@ss.hasPermi('system:deviceUser: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/TPatrolPositionController.java
View file @ 1c05698b
package com.zehong.web.controller.system; package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TPatrolPositionController extends BaseController ...@@ -36,7 +35,6 @@ public class TPatrolPositionController extends BaseController
/** /**
* 查询巡检点列表 * 查询巡检点列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:position:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPatrolPosition tPatrolPosition) public TableDataInfo list(TPatrolPosition tPatrolPosition)
{ {
...@@ -48,7 +46,6 @@ public class TPatrolPositionController extends BaseController ...@@ -48,7 +46,6 @@ public class TPatrolPositionController extends BaseController
/** /**
* 导出巡检点列表 * 导出巡检点列表
*/ */
//@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 +58,6 @@ public class TPatrolPositionController extends BaseController ...@@ -61,7 +58,6 @@ public class TPatrolPositionController extends BaseController
/** /**
* 获取巡检点详细信息 * 获取巡检点详细信息
*/ */
//@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)
{ {
...@@ -71,7 +67,6 @@ public class TPatrolPositionController extends BaseController ...@@ -71,7 +67,6 @@ public class TPatrolPositionController extends BaseController
/** /**
* 新增巡检点 * 新增巡检点
*/ */
// @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)
...@@ -82,7 +77,6 @@ public class TPatrolPositionController extends BaseController ...@@ -82,7 +77,6 @@ public class TPatrolPositionController extends BaseController
/** /**
* 修改巡检点 * 修改巡检点
*/ */
//@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)
...@@ -93,7 +87,6 @@ public class TPatrolPositionController extends BaseController ...@@ -93,7 +87,6 @@ public class TPatrolPositionController extends BaseController
/** /**
* 删除巡检点 * 删除巡检点
*/ */
//@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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/TPatrolWorkInfoController.java
View file @ 1c05698b
package com.zehong.web.controller.system; package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TPatrolWorkInfoController extends BaseController ...@@ -36,7 +35,6 @@ public class TPatrolWorkInfoController extends BaseController
/** /**
* 查询巡检任务列表 * 查询巡检任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPatrolWorkInfo tPatrolWorkInfo) public TableDataInfo list(TPatrolWorkInfo tPatrolWorkInfo)
{ {
...@@ -48,7 +46,6 @@ public class TPatrolWorkInfoController extends BaseController ...@@ -48,7 +46,6 @@ public class TPatrolWorkInfoController extends BaseController
/** /**
* 导出巡检任务列表 * 导出巡检任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:export')")
@Log(title = "巡检任务", businessType = BusinessType.EXPORT) @Log(title = "巡检任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TPatrolWorkInfo tPatrolWorkInfo) public AjaxResult export(TPatrolWorkInfo tPatrolWorkInfo)
...@@ -61,7 +58,6 @@ public class TPatrolWorkInfoController extends BaseController ...@@ -61,7 +58,6 @@ public class TPatrolWorkInfoController extends BaseController
/** /**
* 获取巡检任务详细信息 * 获取巡检任务详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:query')")
@GetMapping(value = "/{workId}") @GetMapping(value = "/{workId}")
public AjaxResult getInfo(@PathVariable("workId") Long workId) public AjaxResult getInfo(@PathVariable("workId") Long workId)
{ {
...@@ -71,7 +67,6 @@ public class TPatrolWorkInfoController extends BaseController ...@@ -71,7 +67,6 @@ public class TPatrolWorkInfoController extends BaseController
/** /**
* 新增巡检任务 * 新增巡检任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "巡检任务", businessType = BusinessType.INSERT) @Log(title = "巡检任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TPatrolWorkInfo tPatrolWorkInfo) public AjaxResult add(@RequestBody TPatrolWorkInfo tPatrolWorkInfo)
...@@ -82,7 +77,6 @@ public class TPatrolWorkInfoController extends BaseController ...@@ -82,7 +77,6 @@ public class TPatrolWorkInfoController extends BaseController
/** /**
* 修改巡检任务 * 修改巡检任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "巡检任务", businessType = BusinessType.UPDATE) @Log(title = "巡检任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TPatrolWorkInfo tPatrolWorkInfo) public AjaxResult edit(@RequestBody TPatrolWorkInfo tPatrolWorkInfo)
...@@ -93,7 +87,6 @@ public class TPatrolWorkInfoController extends BaseController ...@@ -93,7 +87,6 @@ public class TPatrolWorkInfoController extends BaseController
/** /**
* 删除巡检任务 * 删除巡检任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:info: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/TSecurityDisseminateController.java
View file @ 1c05698b
package com.zehong.web.controller.system; package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TSecurityDisseminateController extends BaseController ...@@ -36,7 +35,6 @@ public class TSecurityDisseminateController extends BaseController
/** /**
* 查询安全宣传列表 * 查询安全宣传列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:disseminate:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TSecurityDisseminate tSecurityDisseminate) public TableDataInfo list(TSecurityDisseminate tSecurityDisseminate)
{ {
...@@ -48,7 +46,6 @@ public class TSecurityDisseminateController extends BaseController ...@@ -48,7 +46,6 @@ public class TSecurityDisseminateController extends BaseController
/** /**
* 导出安全宣传列表 * 导出安全宣传列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:disseminate:export')")
@Log(title = "安全宣传", businessType = BusinessType.EXPORT) @Log(title = "安全宣传", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TSecurityDisseminate tSecurityDisseminate) public AjaxResult export(TSecurityDisseminate tSecurityDisseminate)
...@@ -61,7 +58,6 @@ public class TSecurityDisseminateController extends BaseController ...@@ -61,7 +58,6 @@ public class TSecurityDisseminateController extends BaseController
/** /**
* 获取安全宣传详细信息 * 获取安全宣传详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:disseminate:query')")
@GetMapping(value = "/{securityId}") @GetMapping(value = "/{securityId}")
public AjaxResult getInfo(@PathVariable("securityId") Long securityId) public AjaxResult getInfo(@PathVariable("securityId") Long securityId)
{ {
...@@ -71,7 +67,6 @@ public class TSecurityDisseminateController extends BaseController ...@@ -71,7 +67,6 @@ public class TSecurityDisseminateController extends BaseController
/** /**
* 新增安全宣传 * 新增安全宣传
*/ */
//@PreAuthorize("@ss.hasPermi('system:disseminate:add')")
@Log(title = "安全宣传", businessType = BusinessType.INSERT) @Log(title = "安全宣传", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TSecurityDisseminate tSecurityDisseminate) public AjaxResult add(@RequestBody TSecurityDisseminate tSecurityDisseminate)
...@@ -82,7 +77,6 @@ public class TSecurityDisseminateController extends BaseController ...@@ -82,7 +77,6 @@ public class TSecurityDisseminateController extends BaseController
/** /**
* 修改安全宣传 * 修改安全宣传
*/ */
//@PreAuthorize("@ss.hasPermi('system:disseminate:edit')")
@Log(title = "安全宣传", businessType = BusinessType.UPDATE) @Log(title = "安全宣传", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TSecurityDisseminate tSecurityDisseminate) public AjaxResult edit(@RequestBody TSecurityDisseminate tSecurityDisseminate)
...@@ -93,7 +87,6 @@ public class TSecurityDisseminateController extends BaseController ...@@ -93,7 +87,6 @@ public class TSecurityDisseminateController extends BaseController
/** /**
* 删除安全宣传 * 删除安全宣传
*/ */
//@PreAuthorize("@ss.hasPermi('system:disseminate:remove')")
@Log(title = "安全宣传", businessType = BusinessType.DELETE) @Log(title = "安全宣传", businessType = BusinessType.DELETE)
@DeleteMapping("/{securityIds}") @DeleteMapping("/{securityIds}")
public AjaxResult remove(@PathVariable Long[] securityIds) public AjaxResult remove(@PathVariable Long[] securityIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/TVehicleInfosController.java
View file @ 1c05698b
...@@ -12,7 +12,6 @@ import com.zehong.system.service.ITVehicleInfoService; ...@@ -12,7 +12,6 @@ import com.zehong.system.service.ITVehicleInfoService;
import com.zehong.system.service.ITVehicleLocationInfoService; import com.zehong.system.service.ITVehicleLocationInfoService;
import io.jsonwebtoken.lang.Collections; import io.jsonwebtoken.lang.Collections;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
...@@ -34,7 +33,6 @@ public class TVehicleInfosController extends BaseController ...@@ -34,7 +33,6 @@ public class TVehicleInfosController extends BaseController
/** /**
* 查询燃气车辆信息列表 * 查询燃气车辆信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:info:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TVehicleInfo tVehicleInfo) public TableDataInfo list(TVehicleInfo tVehicleInfo)
{ {
...@@ -58,7 +56,6 @@ public class TVehicleInfosController extends BaseController ...@@ -58,7 +56,6 @@ public class TVehicleInfosController extends BaseController
/** /**
* 导出燃气车辆信息列表 * 导出燃气车辆信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:info:export')")
@Log(title = "燃气车辆信息", businessType = BusinessType.EXPORT) @Log(title = "燃气车辆信息", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TVehicleInfo tVehicleInfo) public AjaxResult export(TVehicleInfo tVehicleInfo)
...@@ -71,7 +68,6 @@ public class TVehicleInfosController extends BaseController ...@@ -71,7 +68,6 @@ public class TVehicleInfosController extends BaseController
/** /**
* 获取燃气车辆信息详细信息 * 获取燃气车辆信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:info:query')")
@GetMapping(value = "/{vehicleId}") @GetMapping(value = "/{vehicleId}")
public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId) public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId)
{ {
...@@ -94,7 +90,6 @@ public class TVehicleInfosController extends BaseController ...@@ -94,7 +90,6 @@ public class TVehicleInfosController extends BaseController
/** /**
* 新增燃气车辆信息 * 新增燃气车辆信息
*/ */
@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "燃气车辆信息", businessType = BusinessType.INSERT) @Log(title = "燃气车辆信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo) public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo)
...@@ -105,7 +100,6 @@ public class TVehicleInfosController extends BaseController ...@@ -105,7 +100,6 @@ public class TVehicleInfosController extends BaseController
/** /**
* 修改燃气车辆信息 * 修改燃气车辆信息
*/ */
@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE) @Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo) public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo)
...@@ -116,7 +110,6 @@ public class TVehicleInfosController extends BaseController ...@@ -116,7 +110,6 @@ public class TVehicleInfosController extends BaseController
/** /**
* 删除燃气车辆信息 * 删除燃气车辆信息
*/ */
@PreAuthorize("@ss.hasPermi('system:info:remove')")
@Log(title = "燃气车辆信息", businessType = BusinessType.DELETE) @Log(title = "燃气车辆信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleIds}") @DeleteMapping("/{vehicleIds}")
public AjaxResult remove(@PathVariable Long[] vehicleIds) public AjaxResult remove(@PathVariable Long[] vehicleIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/TVehicleUseRecordController.java
View file @ 1c05698b
...@@ -16,7 +16,6 @@ import com.zehong.system.service.ITTaskRecordService; ...@@ -16,7 +16,6 @@ import com.zehong.system.service.ITTaskRecordService;
import com.zehong.system.service.ITVehicleInfoService; import com.zehong.system.service.ITVehicleInfoService;
import com.zehong.system.service.ITVehicleUseRecordService; import com.zehong.system.service.ITVehicleUseRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.ParseException; import java.text.ParseException;
...@@ -47,7 +46,6 @@ public class TVehicleUseRecordController extends BaseController ...@@ -47,7 +46,6 @@ public class TVehicleUseRecordController extends BaseController
/** /**
* 查询车辆使用记录列表 * 查询车辆使用记录列表
*/ */
@PreAuthorize("@ss.hasPermi('system:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TVehicleUseRecord tVehicleUseRecord) public TableDataInfo list(TVehicleUseRecord tVehicleUseRecord)
{ {
...@@ -73,7 +71,6 @@ public class TVehicleUseRecordController extends BaseController ...@@ -73,7 +71,6 @@ public class TVehicleUseRecordController extends BaseController
/** /**
* 导出车辆使用记录列表 * 导出车辆使用记录列表
*/ */
@PreAuthorize("@ss.hasPermi('system:record:export')")
@Log(title = "车辆使用记录", businessType = BusinessType.EXPORT) @Log(title = "车辆使用记录", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TVehicleUseRecord tVehicleUseRecord) public AjaxResult export(TVehicleUseRecord tVehicleUseRecord)
...@@ -86,7 +83,6 @@ public class TVehicleUseRecordController extends BaseController ...@@ -86,7 +83,6 @@ public class TVehicleUseRecordController extends BaseController
/** /**
* 获取车辆使用记录详细信息 * 获取车辆使用记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{vehicleUseRecordId}") @GetMapping(value = "/{vehicleUseRecordId}")
public AjaxResult getInfo(@PathVariable("vehicleUseRecordId") Long vehicleUseRecordId) public AjaxResult getInfo(@PathVariable("vehicleUseRecordId") Long vehicleUseRecordId)
{ {
...@@ -96,7 +92,6 @@ public class TVehicleUseRecordController extends BaseController ...@@ -96,7 +92,6 @@ public class TVehicleUseRecordController extends BaseController
/** /**
* 新增车辆使用记录 * 新增车辆使用记录
*/ */
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "车辆使用记录", businessType = BusinessType.INSERT) @Log(title = "车辆使用记录", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TVehicleUseRecord tVehicleUseRecord) public AjaxResult add(@RequestBody TVehicleUseRecord tVehicleUseRecord)
...@@ -160,7 +155,6 @@ public class TVehicleUseRecordController extends BaseController ...@@ -160,7 +155,6 @@ public class TVehicleUseRecordController extends BaseController
/** /**
* 修改车辆使用记录 * 修改车辆使用记录
*/ */
@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "车辆使用记录", businessType = BusinessType.UPDATE) @Log(title = "车辆使用记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TVehicleUseRecord tVehicleUseRecord) public AjaxResult edit(@RequestBody TVehicleUseRecord tVehicleUseRecord)
...@@ -171,7 +165,6 @@ public class TVehicleUseRecordController extends BaseController ...@@ -171,7 +165,6 @@ public class TVehicleUseRecordController extends BaseController
/** /**
* 删除车辆使用记录 * 删除车辆使用记录
*/ */
@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "车辆使用记录", businessType = BusinessType.DELETE) @Log(title = "车辆使用记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleUseRecordIds}") @DeleteMapping("/{vehicleUseRecordIds}")
public AjaxResult remove(@PathVariable Long[] vehicleUseRecordIds) public AjaxResult remove(@PathVariable Long[] vehicleUseRecordIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TUserLocationController.java
View file @ 1c05698b
...@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
//import org.springframework.security.access.prepost.PreAuthorize;
/** /**
* 【请填写功能名称】Controller * 【请填写功能名称】Controller
* *
...@@ -31,7 +29,6 @@ public class TUserLocationController extends BaseController ...@@ -31,7 +29,6 @@ public class TUserLocationController extends BaseController
/** /**
* 查询【请填写功能名称】列表 * 查询【请填写功能名称】列表
*/ */
//@PreAuthorize("@ss.hasPermi('task:location:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TUserLocation tUserLocation) public TableDataInfo list(TUserLocation tUserLocation)
{ {
...@@ -49,7 +46,6 @@ public class TUserLocationController extends BaseController ...@@ -49,7 +46,6 @@ public class TUserLocationController extends BaseController
/** /**
* 导出【请填写功能名称】列表 * 导出【请填写功能名称】列表
*/ */
//@PreAuthorize("@ss.hasPermi('task:location:export')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TUserLocation tUserLocation) public AjaxResult export(TUserLocation tUserLocation)
...@@ -62,7 +58,6 @@ public class TUserLocationController extends BaseController ...@@ -62,7 +58,6 @@ public class TUserLocationController extends BaseController
/** /**
* 获取【请填写功能名称】详细信息 * 获取【请填写功能名称】详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('task:location:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -72,7 +67,6 @@ public class TUserLocationController extends BaseController ...@@ -72,7 +67,6 @@ public class TUserLocationController extends BaseController
/** /**
* 新增【请填写功能名称】 * 新增【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('task:location:add')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TUserLocation tUserLocation) public AjaxResult add(@RequestBody TUserLocation tUserLocation)
...@@ -83,7 +77,6 @@ public class TUserLocationController extends BaseController ...@@ -83,7 +77,6 @@ public class TUserLocationController extends BaseController
/** /**
* 修改【请填写功能名称】 * 修改【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('task:location:edit')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TUserLocation tUserLocation) public AjaxResult edit(@RequestBody TUserLocation tUserLocation)
...@@ -94,7 +87,6 @@ public class TUserLocationController extends BaseController ...@@ -94,7 +87,6 @@ public class TUserLocationController extends BaseController
/** /**
* 删除【请填写功能名称】 * 删除【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('task:location: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TWorkTaskController.java
View file @ 1c05698b
...@@ -6,7 +6,6 @@ import java.util.Map; ...@@ -6,7 +6,6 @@ import java.util.Map;
import com.zehong.common.core.domain.entity.SysRole; import com.zehong.common.core.domain.entity.SysRole;
import com.zehong.common.utils.SecurityUtils; import com.zehong.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.zehong.common.annotation.Log; import com.zehong.common.annotation.Log;
...@@ -34,7 +33,6 @@ public class TWorkTaskController extends BaseController ...@@ -34,7 +33,6 @@ public class TWorkTaskController extends BaseController
/** /**
* 查询巡检巡查任务列表 * 查询巡检巡查任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:task:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TWorkTask tWorkTask) public TableDataInfo list(TWorkTask tWorkTask)
{ {
...@@ -51,7 +49,6 @@ public class TWorkTaskController extends BaseController ...@@ -51,7 +49,6 @@ public class TWorkTaskController extends BaseController
/** /**
* 导出巡检巡查任务列表 * 导出巡检巡查任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:task:export')")
@Log(title = "巡检巡查任务", businessType = BusinessType.EXPORT) @Log(title = "巡检巡查任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TWorkTask tWorkTask) public AjaxResult export(TWorkTask tWorkTask)
...@@ -64,7 +61,6 @@ public class TWorkTaskController extends BaseController ...@@ -64,7 +61,6 @@ public class TWorkTaskController extends BaseController
/** /**
* 获取巡检巡查任务详细信息 * 获取巡检巡查任务详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:task:query')")
@GetMapping(value = "/{taskId}") @GetMapping(value = "/{taskId}")
public AjaxResult getInfo(@PathVariable("taskId") Long taskId) public AjaxResult getInfo(@PathVariable("taskId") Long taskId)
{ {
...@@ -74,7 +70,6 @@ public class TWorkTaskController extends BaseController ...@@ -74,7 +70,6 @@ public class TWorkTaskController extends BaseController
/** /**
* 新增巡检巡查任务 * 新增巡检巡查任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:task:add')")
@Log(title = "巡检巡查任务", businessType = BusinessType.INSERT) @Log(title = "巡检巡查任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TWorkTask tWorkTask) public AjaxResult add(@RequestBody TWorkTask tWorkTask)
...@@ -88,7 +83,6 @@ public class TWorkTaskController extends BaseController ...@@ -88,7 +83,6 @@ public class TWorkTaskController extends BaseController
/** /**
* 修改巡检巡查任务 * 修改巡检巡查任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:task:edit')")
@Log(title = "巡检巡查任务", businessType = BusinessType.UPDATE) @Log(title = "巡检巡查任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TWorkTask tWorkTask) public AjaxResult edit(@RequestBody TWorkTask tWorkTask)
...@@ -99,7 +93,6 @@ public class TWorkTaskController extends BaseController ...@@ -99,7 +93,6 @@ public class TWorkTaskController extends BaseController
/** /**
* 删除巡检巡查任务 * 删除巡检巡查任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:task:remove')")
@Log(title = "巡检巡查任务", businessType = BusinessType.DELETE) @Log(title = "巡检巡查任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskIds}") @DeleteMapping("/{taskIds}")
public AjaxResult remove(@PathVariable Long[] taskIds) public AjaxResult remove(@PathVariable Long[] taskIds)
...@@ -144,7 +137,6 @@ public class TWorkTaskController extends BaseController ...@@ -144,7 +137,6 @@ public class TWorkTaskController extends BaseController
/** /**
* 中途添加执行任务人员 * 中途添加执行任务人员
* @param taskId
* @return * @return
*/ */
@PostMapping("/addmember") @PostMapping("/addmember")
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TWorkTaskInspectController.java
View file @ 1c05698b
...@@ -2,15 +2,11 @@ package com.zehong.web.controller.task; ...@@ -2,15 +2,11 @@ package com.zehong.web.controller.task;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import com.zehong.common.core.domain.entity.SysUser; import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.SecurityUtils; import com.zehong.common.utils.SecurityUtils;
import com.zehong.common.utils.StringUtils; import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.TDetectorUser; import com.zehong.system.domain.TDetectorUser;
import com.zehong.system.service.ITDetectorUserService; import com.zehong.system.service.ITDetectorUserService;
import com.zehong.system.domain.TDetectorUser;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -49,7 +45,6 @@ public class TWorkTaskInspectController extends BaseController ...@@ -49,7 +45,6 @@ public class TWorkTaskInspectController extends BaseController
/** /**
* 查询入户安检列表 * 查询入户安检列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:inspect:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TWorkTaskInspect tWorkTaskInspect) public TableDataInfo list(TWorkTaskInspect tWorkTaskInspect)
{ {
...@@ -75,7 +70,6 @@ public class TWorkTaskInspectController extends BaseController ...@@ -75,7 +70,6 @@ public class TWorkTaskInspectController extends BaseController
/** /**
* 导出入户安检列表 * 导出入户安检列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:inspect:export')")
@Log(title = "入户安检", businessType = BusinessType.EXPORT) @Log(title = "入户安检", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TWorkTaskInspect tWorkTaskInspect) public AjaxResult export(TWorkTaskInspect tWorkTaskInspect)
...@@ -88,7 +82,6 @@ public class TWorkTaskInspectController extends BaseController ...@@ -88,7 +82,6 @@ public class TWorkTaskInspectController extends BaseController
/** /**
* 获取入户安检详细信息 * 获取入户安检详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:inspect:query')")
@GetMapping(value = "/{inspectId}") @GetMapping(value = "/{inspectId}")
public AjaxResult getInfo(@PathVariable("inspectId") Long inspectId) public AjaxResult getInfo(@PathVariable("inspectId") Long inspectId)
{ {
...@@ -98,7 +91,6 @@ public class TWorkTaskInspectController extends BaseController ...@@ -98,7 +91,6 @@ public class TWorkTaskInspectController extends BaseController
/** /**
* 新增入户安检 * 新增入户安检
*/ */
//@PreAuthorize("@ss.hasPermi('system:inspect:add')")
@Log(title = "入户安检", businessType = BusinessType.INSERT) @Log(title = "入户安检", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TWorkTaskInspect tWorkTaskInspect) public AjaxResult add(@RequestBody TWorkTaskInspect tWorkTaskInspect)
...@@ -110,7 +102,6 @@ public class TWorkTaskInspectController extends BaseController ...@@ -110,7 +102,6 @@ public class TWorkTaskInspectController extends BaseController
/** /**
* 修改入户安检 * 修改入户安检
*/ */
//@PreAuthorize("@ss.hasPermi('system:inspect:edit')")
@Log(title = "入户安检", businessType = BusinessType.UPDATE) @Log(title = "入户安检", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TWorkTaskInspect tWorkTaskInspect) public AjaxResult edit(@RequestBody TWorkTaskInspect tWorkTaskInspect)
...@@ -121,7 +112,6 @@ public class TWorkTaskInspectController extends BaseController ...@@ -121,7 +112,6 @@ public class TWorkTaskInspectController extends BaseController
/** /**
* 删除入户安检 * 删除入户安检
*/ */
//@PreAuthorize("@ss.hasPermi('system:inspect:remove')")
@Log(title = "入户安检", businessType = BusinessType.DELETE) @Log(title = "入户安检", businessType = BusinessType.DELETE)
@DeleteMapping("/{inspectIds}") @DeleteMapping("/{inspectIds}")
public AjaxResult remove(@PathVariable Long[] inspectIds) public AjaxResult remove(@PathVariable Long[] inspectIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TWorkTaskMemberController.java
View file @ 1c05698b
package com.zehong.web.controller.task; package com.zehong.web.controller.task;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TWorkTaskMemberController extends BaseController ...@@ -36,7 +35,6 @@ public class TWorkTaskMemberController extends BaseController
/** /**
* 查询【请填写功能名称】列表 * 查询【请填写功能名称】列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:member:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TWorkTaskMember tWorkTaskMember) public TableDataInfo list(TWorkTaskMember tWorkTaskMember)
{ {
...@@ -48,7 +46,6 @@ public class TWorkTaskMemberController extends BaseController ...@@ -48,7 +46,6 @@ public class TWorkTaskMemberController extends BaseController
/** /**
* 导出【请填写功能名称】列表 * 导出【请填写功能名称】列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:member:export')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TWorkTaskMember tWorkTaskMember) public AjaxResult export(TWorkTaskMember tWorkTaskMember)
...@@ -61,7 +58,6 @@ public class TWorkTaskMemberController extends BaseController ...@@ -61,7 +58,6 @@ public class TWorkTaskMemberController extends BaseController
/** /**
* 获取【请填写功能名称】详细信息 * 获取【请填写功能名称】详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:member:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -71,7 +67,6 @@ public class TWorkTaskMemberController extends BaseController ...@@ -71,7 +67,6 @@ public class TWorkTaskMemberController extends BaseController
/** /**
* 新增【请填写功能名称】 * 新增【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('system:member:add')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TWorkTaskMember tWorkTaskMember) public AjaxResult add(@RequestBody TWorkTaskMember tWorkTaskMember)
...@@ -82,7 +77,6 @@ public class TWorkTaskMemberController extends BaseController ...@@ -82,7 +77,6 @@ public class TWorkTaskMemberController extends BaseController
/** /**
* 修改【请填写功能名称】 * 修改【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('system:member:edit')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TWorkTaskMember tWorkTaskMember) public AjaxResult edit(@RequestBody TWorkTaskMember tWorkTaskMember)
...@@ -93,7 +87,6 @@ public class TWorkTaskMemberController extends BaseController ...@@ -93,7 +87,6 @@ public class TWorkTaskMemberController extends BaseController
/** /**
* 删除【请填写功能名称】 * 删除【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('system:member: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TWorkTaskPatrolCardController.java
View file @ 1c05698b
package com.zehong.web.controller.task; package com.zehong.web.controller.task;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TWorkTaskPatrolCardController extends BaseController ...@@ -36,7 +35,6 @@ public class TWorkTaskPatrolCardController extends BaseController
/** /**
* 查询【请填写功能名称】列表 * 查询【请填写功能名称】列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:card:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TWorkTaskPatrolCard tWorkTaskPatrolCard) public TableDataInfo list(TWorkTaskPatrolCard tWorkTaskPatrolCard)
{ {
...@@ -54,7 +52,6 @@ public class TWorkTaskPatrolCardController extends BaseController ...@@ -54,7 +52,6 @@ public class TWorkTaskPatrolCardController extends BaseController
/** /**
* 导出【请填写功能名称】列表 * 导出【请填写功能名称】列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:card:export')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TWorkTaskPatrolCard tWorkTaskPatrolCard) public AjaxResult export(TWorkTaskPatrolCard tWorkTaskPatrolCard)
...@@ -67,7 +64,6 @@ public class TWorkTaskPatrolCardController extends BaseController ...@@ -67,7 +64,6 @@ public class TWorkTaskPatrolCardController extends BaseController
/** /**
* 获取【请填写功能名称】详细信息 * 获取【请填写功能名称】详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:card:query')")
@GetMapping(value = "/{cardId}") @GetMapping(value = "/{cardId}")
public AjaxResult getInfo(@PathVariable("cardId") Long cardId) public AjaxResult getInfo(@PathVariable("cardId") Long cardId)
{ {
...@@ -77,7 +73,6 @@ public class TWorkTaskPatrolCardController extends BaseController ...@@ -77,7 +73,6 @@ public class TWorkTaskPatrolCardController extends BaseController
/** /**
* 新增【请填写功能名称】 * 新增【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('system:card:add')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TWorkTaskPatrolCard tWorkTaskPatrolCard) public AjaxResult add(@RequestBody TWorkTaskPatrolCard tWorkTaskPatrolCard)
...@@ -94,7 +89,6 @@ public class TWorkTaskPatrolCardController extends BaseController ...@@ -94,7 +89,6 @@ public class TWorkTaskPatrolCardController extends BaseController
/** /**
* 修改【请填写功能名称】 * 修改【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('system:card:edit')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TWorkTaskPatrolCard tWorkTaskPatrolCard) public AjaxResult edit(@RequestBody TWorkTaskPatrolCard tWorkTaskPatrolCard)
...@@ -105,7 +99,6 @@ public class TWorkTaskPatrolCardController extends BaseController ...@@ -105,7 +99,6 @@ public class TWorkTaskPatrolCardController extends BaseController
/** /**
* 删除【请填写功能名称】 * 删除【请填写功能名称】
*/ */
//@PreAuthorize("@ss.hasPermi('system:card:remove')")
@Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
@DeleteMapping("/{cardIds}") @DeleteMapping("/{cardIds}")
public AjaxResult remove(@PathVariable Long[] cardIds) public AjaxResult remove(@PathVariable Long[] cardIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/task/TWorkTaskPatrolController.java
View file @ 1c05698b
package com.zehong.web.controller.task; package com.zehong.web.controller.task;
import java.util.List; import java.util.List;
import java.util.Map;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -38,7 +35,6 @@ public class TWorkTaskPatrolController extends BaseController ...@@ -38,7 +35,6 @@ public class TWorkTaskPatrolController extends BaseController
/** /**
* 查询巡线任务列表 * 查询巡线任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:patrol:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TWorkTaskPatrol tWorkTaskPatrol) public TableDataInfo list(TWorkTaskPatrol tWorkTaskPatrol)
{ {
...@@ -50,7 +46,6 @@ public class TWorkTaskPatrolController extends BaseController ...@@ -50,7 +46,6 @@ public class TWorkTaskPatrolController extends BaseController
/** /**
* 导出巡线任务列表 * 导出巡线任务列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:patrol:export')")
@Log(title = "巡线任务", businessType = BusinessType.EXPORT) @Log(title = "巡线任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TWorkTaskPatrol tWorkTaskPatrol) public AjaxResult export(TWorkTaskPatrol tWorkTaskPatrol)
...@@ -63,7 +58,6 @@ public class TWorkTaskPatrolController extends BaseController ...@@ -63,7 +58,6 @@ public class TWorkTaskPatrolController extends BaseController
/** /**
* 获取巡线任务详细信息 * 获取巡线任务详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:patrol:query')")
@GetMapping(value = "/{patrolId}") @GetMapping(value = "/{patrolId}")
public AjaxResult getInfo(@PathVariable("patrolId") Long patrolId) public AjaxResult getInfo(@PathVariable("patrolId") Long patrolId)
{ {
...@@ -73,7 +67,6 @@ public class TWorkTaskPatrolController extends BaseController ...@@ -73,7 +67,6 @@ public class TWorkTaskPatrolController extends BaseController
/** /**
* 新增巡线任务 * 新增巡线任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:patrol:add')")
@Log(title = "巡线任务", businessType = BusinessType.INSERT) @Log(title = "巡线任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TWorkTaskPatrol tWorkTaskPatrol) public AjaxResult add(@RequestBody TWorkTaskPatrol tWorkTaskPatrol)
...@@ -92,7 +85,6 @@ public class TWorkTaskPatrolController extends BaseController ...@@ -92,7 +85,6 @@ public class TWorkTaskPatrolController extends BaseController
/** /**
* 修改巡线任务 * 修改巡线任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:patrol:edit')")
@Log(title = "巡线任务", businessType = BusinessType.UPDATE) @Log(title = "巡线任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TWorkTaskPatrol tWorkTaskPatrol) public AjaxResult edit(@RequestBody TWorkTaskPatrol tWorkTaskPatrol)
...@@ -103,7 +95,6 @@ public class TWorkTaskPatrolController extends BaseController ...@@ -103,7 +95,6 @@ public class TWorkTaskPatrolController extends BaseController
/** /**
* 删除巡线任务 * 删除巡线任务
*/ */
//@PreAuthorize("@ss.hasPermi('system:patrol: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/tool/SwaggerController.java
View file @ 1c05698b
package com.zehong.web.controller.tool; package com.zehong.web.controller.tool;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -15,7 +14,6 @@ import com.zehong.common.core.controller.BaseController; ...@@ -15,7 +14,6 @@ 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')")
@GetMapping() @GetMapping()
public String index() public String index()
{ {
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/trainmanage/TTrainManageController.java
View file @ 1c05698b
...@@ -6,7 +6,6 @@ import com.zehong.common.core.domain.entity.SysUser; ...@@ -6,7 +6,6 @@ import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.core.domain.model.LoginUser; import com.zehong.common.core.domain.model.LoginUser;
import com.zehong.common.utils.ServletUtils; import com.zehong.common.utils.ServletUtils;
import com.zehong.framework.web.service.TokenService; import com.zehong.framework.web.service.TokenService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -44,7 +43,6 @@ public class TTrainManageController extends BaseController ...@@ -44,7 +43,6 @@ public class TTrainManageController extends BaseController
/** /**
* 查询培训管理列表 * 查询培训管理列表
*/ */
@PreAuthorize("@ss.hasPermi('system:manage:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TTrainManage tTrainManage) public TableDataInfo list(TTrainManage tTrainManage)
{ {
...@@ -56,7 +54,6 @@ public class TTrainManageController extends BaseController ...@@ -56,7 +54,6 @@ public class TTrainManageController extends BaseController
/** /**
* 导出培训管理列表 * 导出培训管理列表
*/ */
@PreAuthorize("@ss.hasPermi('system:manage:export')")
@Log(title = "培训管理", businessType = BusinessType.EXPORT) @Log(title = "培训管理", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TTrainManage tTrainManage) public AjaxResult export(TTrainManage tTrainManage)
...@@ -69,7 +66,6 @@ public class TTrainManageController extends BaseController ...@@ -69,7 +66,6 @@ public class TTrainManageController extends BaseController
/** /**
* 获取培训管理详细信息 * 获取培训管理详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:manage:query')")
@GetMapping(value = "/{trainManageId}") @GetMapping(value = "/{trainManageId}")
public AjaxResult getInfo(@PathVariable("trainManageId") Long trainManageId) public AjaxResult getInfo(@PathVariable("trainManageId") Long trainManageId)
{ {
...@@ -79,7 +75,6 @@ public class TTrainManageController extends BaseController ...@@ -79,7 +75,6 @@ public class TTrainManageController extends BaseController
/** /**
* 新增培训管理 * 新增培训管理
*/ */
@PreAuthorize("@ss.hasPermi('system:manage:add')")
@Log(title = "培训管理", businessType = BusinessType.INSERT) @Log(title = "培训管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TTrainManage tTrainManage) public AjaxResult add(@RequestBody TTrainManage tTrainManage)
...@@ -90,7 +85,6 @@ public class TTrainManageController extends BaseController ...@@ -90,7 +85,6 @@ public class TTrainManageController extends BaseController
/** /**
* 修改培训管理 * 修改培训管理
*/ */
@PreAuthorize("@ss.hasPermi('system:manage:edit')")
@Log(title = "培训管理", businessType = BusinessType.UPDATE) @Log(title = "培训管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TTrainManage tTrainManage) public AjaxResult edit(@RequestBody TTrainManage tTrainManage)
...@@ -101,7 +95,6 @@ public class TTrainManageController extends BaseController ...@@ -101,7 +95,6 @@ public class TTrainManageController extends BaseController
/** /**
* 删除培训管理 * 删除培训管理
*/ */
@PreAuthorize("@ss.hasPermi('system:manage:remove')")
@Log(title = "培训管理", businessType = BusinessType.DELETE) @Log(title = "培训管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{trainManageIds}") @DeleteMapping("/{trainManageIds}")
public AjaxResult remove(@PathVariable Long[] trainManageIds) public AjaxResult remove(@PathVariable Long[] trainManageIds)
...@@ -111,7 +104,6 @@ public class TTrainManageController extends BaseController ...@@ -111,7 +104,6 @@ public class TTrainManageController extends BaseController
/** /**
* 根据培训人员查询培训课程 * 根据培训人员查询培训课程
* @param trainPersonId 培训人员
* @return * @return
*/ */
@RequestMapping("/getTrainInfoByPersonId") @RequestMapping("/getTrainInfoByPersonId")
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/trainmanage/TTrainPersonController.java
View file @ 1c05698b
package com.zehong.web.controller.trainmanage; package com.zehong.web.controller.trainmanage;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TTrainPersonController extends BaseController ...@@ -36,7 +35,6 @@ public class TTrainPersonController extends BaseController
/** /**
* 查询燃气培训人员列表 * 查询燃气培训人员列表
*/ */
@PreAuthorize("@ss.hasPermi('system:person:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TTrainPerson tTrainPerson) public TableDataInfo list(TTrainPerson tTrainPerson)
{ {
...@@ -48,7 +46,6 @@ public class TTrainPersonController extends BaseController ...@@ -48,7 +46,6 @@ public class TTrainPersonController extends BaseController
/** /**
* 导出燃气培训人员列表 * 导出燃气培训人员列表
*/ */
@PreAuthorize("@ss.hasPermi('system:person:export')")
@Log(title = "燃气培训人员", businessType = BusinessType.EXPORT) @Log(title = "燃气培训人员", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TTrainPerson tTrainPerson) public AjaxResult export(TTrainPerson tTrainPerson)
...@@ -61,7 +58,6 @@ public class TTrainPersonController extends BaseController ...@@ -61,7 +58,6 @@ public class TTrainPersonController extends BaseController
/** /**
* 获取燃气培训人员详细信息 * 获取燃气培训人员详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:person:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -71,7 +67,6 @@ public class TTrainPersonController extends BaseController ...@@ -71,7 +67,6 @@ public class TTrainPersonController extends BaseController
/** /**
* 新增燃气培训人员 * 新增燃气培训人员
*/ */
@PreAuthorize("@ss.hasPermi('system:person:add')")
@Log(title = "燃气培训人员", businessType = BusinessType.INSERT) @Log(title = "燃气培训人员", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TTrainPerson tTrainPerson) public AjaxResult add(@RequestBody TTrainPerson tTrainPerson)
...@@ -82,7 +77,6 @@ public class TTrainPersonController extends BaseController ...@@ -82,7 +77,6 @@ public class TTrainPersonController extends BaseController
/** /**
* 修改燃气培训人员 * 修改燃气培训人员
*/ */
@PreAuthorize("@ss.hasPermi('system:person:edit')")
@Log(title = "燃气培训人员", businessType = BusinessType.UPDATE) @Log(title = "燃气培训人员", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TTrainPerson tTrainPerson) public AjaxResult edit(@RequestBody TTrainPerson tTrainPerson)
...@@ -93,7 +87,6 @@ public class TTrainPersonController extends BaseController ...@@ -93,7 +87,6 @@ public class TTrainPersonController extends BaseController
/** /**
* 删除燃气培训人员 * 删除燃气培训人员
*/ */
@PreAuthorize("@ss.hasPermi('system:person: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)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/transferPostRecord/TTransferPostRecordController.java
View file @ 1c05698b
package com.zehong.web.controller.transferPostRecord; package com.zehong.web.controller.transferPostRecord;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TTransferPostRecordController extends BaseController ...@@ -36,7 +35,6 @@ public class TTransferPostRecordController extends BaseController
/** /**
* 查询调岗记录列表 * 查询调岗记录列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:record:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TTransferPostRecord tTransferPostRecord) public TableDataInfo list(TTransferPostRecord tTransferPostRecord)
{ {
...@@ -55,7 +53,6 @@ public class TTransferPostRecordController extends BaseController ...@@ -55,7 +53,6 @@ public class TTransferPostRecordController extends BaseController
/** /**
* 导出调岗记录列表 * 导出调岗记录列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:record:export')")
@Log(title = "调岗记录", businessType = BusinessType.EXPORT) @Log(title = "调岗记录", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TTransferPostRecord tTransferPostRecord) public AjaxResult export(TTransferPostRecord tTransferPostRecord)
...@@ -68,7 +65,6 @@ public class TTransferPostRecordController extends BaseController ...@@ -68,7 +65,6 @@ public class TTransferPostRecordController extends BaseController
/** /**
* 获取调岗记录详细信息 * 获取调岗记录详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{recordId}") @GetMapping(value = "/{recordId}")
public AjaxResult getInfo(@PathVariable("recordId") Long recordId) public AjaxResult getInfo(@PathVariable("recordId") Long recordId)
{ {
...@@ -78,7 +74,6 @@ public class TTransferPostRecordController extends BaseController ...@@ -78,7 +74,6 @@ public class TTransferPostRecordController extends BaseController
/** /**
* 新增调岗记录 * 新增调岗记录
*/ */
//@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "调岗记录", businessType = BusinessType.INSERT) @Log(title = "调岗记录", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TTransferPostRecord tTransferPostRecord) public AjaxResult add(@RequestBody TTransferPostRecord tTransferPostRecord)
...@@ -89,7 +84,6 @@ public class TTransferPostRecordController extends BaseController ...@@ -89,7 +84,6 @@ public class TTransferPostRecordController extends BaseController
/** /**
* 修改调岗记录 * 修改调岗记录
*/ */
//@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "调岗记录", businessType = BusinessType.UPDATE) @Log(title = "调岗记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TTransferPostRecord tTransferPostRecord) public AjaxResult edit(@RequestBody TTransferPostRecord tTransferPostRecord)
...@@ -100,7 +94,6 @@ public class TTransferPostRecordController extends BaseController ...@@ -100,7 +94,6 @@ public class TTransferPostRecordController extends BaseController
/** /**
* 删除调岗记录 * 删除调岗记录
*/ */
//@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "调岗记录", businessType = BusinessType.DELETE) @Log(title = "调岗记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordIds}") @DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable Long[] recordIds) public AjaxResult remove(@PathVariable Long[] recordIds)
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/video/TVideoManagerController.java
View file @ 1c05698b
...@@ -12,7 +12,6 @@ import com.zehong.system.domain.vo.EnterpriseVideoTreeNode; ...@@ -12,7 +12,6 @@ import com.zehong.system.domain.vo.EnterpriseVideoTreeNode;
import com.zehong.system.service.ITEnterpriseInfoService; import com.zehong.system.service.ITEnterpriseInfoService;
import com.zehong.system.service.ITVideoManagerService; import com.zehong.system.service.ITVideoManagerService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -37,7 +36,6 @@ public class TVideoManagerController extends BaseController ...@@ -37,7 +36,6 @@ public class TVideoManagerController extends BaseController
/** /**
* 查询视频管理列表 * 查询视频管理列表
*/ */
@PreAuthorize("@ss.hasPermi('system:manager:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TVideoManager tVideoManager) public TableDataInfo list(TVideoManager tVideoManager)
{ {
...@@ -49,7 +47,6 @@ public class TVideoManagerController extends BaseController ...@@ -49,7 +47,6 @@ public class TVideoManagerController extends BaseController
/** /**
* 导出视频管理列表 * 导出视频管理列表
*/ */
@PreAuthorize("@ss.hasPermi('system:manager:export')")
@Log(title = "视频管理", businessType = BusinessType.EXPORT) @Log(title = "视频管理", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TVideoManager tVideoManager) public AjaxResult export(TVideoManager tVideoManager)
...@@ -117,7 +114,6 @@ public class TVideoManagerController extends BaseController ...@@ -117,7 +114,6 @@ public class TVideoManagerController extends BaseController
/** /**
* 获取视频管理详细信息 * 获取视频管理详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:manager:query')")
@GetMapping(value = "/{videoManagerId}") @GetMapping(value = "/{videoManagerId}")
public AjaxResult getInfo(@PathVariable("videoManagerId") Long videoManagerId) public AjaxResult getInfo(@PathVariable("videoManagerId") Long videoManagerId)
{ {
...@@ -127,7 +123,6 @@ public class TVideoManagerController extends BaseController ...@@ -127,7 +123,6 @@ public class TVideoManagerController extends BaseController
/** /**
* 新增视频管理 * 新增视频管理
*/ */
@PreAuthorize("@ss.hasPermi('system:manager:add')")
@Log(title = "视频管理", businessType = BusinessType.INSERT) @Log(title = "视频管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TVideoManager tVideoManager) public AjaxResult add(@RequestBody TVideoManager tVideoManager)
...@@ -138,7 +133,6 @@ public class TVideoManagerController extends BaseController ...@@ -138,7 +133,6 @@ public class TVideoManagerController extends BaseController
/** /**
* 修改视频管理 * 修改视频管理
*/ */
@PreAuthorize("@ss.hasPermi('system:manager:edit')")
@Log(title = "视频管理", businessType = BusinessType.UPDATE) @Log(title = "视频管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TVideoManager tVideoManager) public AjaxResult edit(@RequestBody TVideoManager tVideoManager)
...@@ -149,7 +143,6 @@ public class TVideoManagerController extends BaseController ...@@ -149,7 +143,6 @@ public class TVideoManagerController extends BaseController
/** /**
* 删除视频管理 * 删除视频管理
*/ */
@PreAuthorize("@ss.hasPermi('system:manager:remove')")
@Log(title = "视频管理", businessType = BusinessType.DELETE) @Log(title = "视频管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{videoManagerIds}") @DeleteMapping("/{videoManagerIds}")
public AjaxResult remove(@PathVariable Long[] videoManagerIds) public AjaxResult remove(@PathVariable Long[] videoManagerIds)
......
zh-baseversion-generator/src/main/java/com/zehong/generator/controller/GenController.java
View file @ 1c05698b
...@@ -7,7 +7,6 @@ import java.util.Map; ...@@ -7,7 +7,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -46,7 +45,6 @@ public class GenController extends BaseController ...@@ -46,7 +45,6 @@ public class GenController extends BaseController
/** /**
* 查询代码生成列表 * 查询代码生成列表
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo genList(GenTable genTable) public TableDataInfo genList(GenTable genTable)
{ {
...@@ -58,7 +56,6 @@ public class GenController extends BaseController ...@@ -58,7 +56,6 @@ public class GenController extends BaseController
/** /**
* 修改代码生成业务 * 修改代码生成业务
*/ */
@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 +72,6 @@ public class GenController extends BaseController ...@@ -75,7 +72,6 @@ public class GenController extends BaseController
/** /**
* 查询数据库列表 * 查询数据库列表
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/db/list") @GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable) public TableDataInfo dataList(GenTable genTable)
{ {
...@@ -87,7 +83,6 @@ public class GenController extends BaseController ...@@ -87,7 +83,6 @@ public class GenController extends BaseController
/** /**
* 查询数据表字段列表 * 查询数据表字段列表
*/ */
@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 +96,6 @@ public class GenController extends BaseController ...@@ -101,7 +96,6 @@ public class GenController extends BaseController
/** /**
* 导入表结构（保存） * 导入表结构（保存）
*/ */
@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 +110,6 @@ public class GenController extends BaseController ...@@ -116,7 +110,6 @@ public class GenController extends BaseController
/** /**
* 修改保存代码生成业务 * 修改保存代码生成业务
*/ */
@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 +122,6 @@ public class GenController extends BaseController ...@@ -129,7 +122,6 @@ public class GenController extends BaseController
/** /**
* 删除代码生成 * 删除代码生成
*/ */
@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 +133,6 @@ public class GenController extends BaseController ...@@ -141,7 +133,6 @@ public class GenController extends BaseController
/** /**
* 预览代码 * 预览代码
*/ */
@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 +143,6 @@ public class GenController extends BaseController ...@@ -152,7 +143,6 @@ public class GenController extends BaseController
/** /**
* 生成代码（下载方式） * 生成代码（下载方式）
*/ */
@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 +154,6 @@ public class GenController extends BaseController ...@@ -164,7 +154,6 @@ public class GenController extends BaseController
/** /**
* 生成代码（自定义路径） * 生成代码（自定义路径）
*/ */
@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 +165,6 @@ public class GenController extends BaseController ...@@ -176,7 +165,6 @@ public class GenController extends BaseController
/** /**
* 同步数据库 * 同步数据库
*/ */
@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 +176,6 @@ public class GenController extends BaseController ...@@ -188,7 +176,6 @@ public class GenController extends BaseController
/** /**
* 批量生成代码 * 批量生成代码
*/ */
@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
......
zh-baseversion-generator/src/main/resources/vm/java/controller.java.vm
View file @ 1c05698b
...@@ -39,7 +39,6 @@ public class ${ClassName}Controller extends BaseController ...@@ -39,7 +39,6 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
*/ */
@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 +58,6 @@ public class ${ClassName}Controller extends BaseController ...@@ -59,7 +58,6 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 导出${functionName}列表 * 导出${functionName}列表
*/ */
@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 +70,6 @@ public class ${ClassName}Controller extends BaseController ...@@ -72,7 +70,6 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 获取${functionName}详细信息 * 获取${functionName}详细信息
*/ */
@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 +79,6 @@ public class ${ClassName}Controller extends BaseController ...@@ -82,7 +79,6 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 新增${functionName} * 新增${functionName}
*/ */
@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 +89,6 @@ public class ${ClassName}Controller extends BaseController ...@@ -93,7 +89,6 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 修改${functionName} * 修改${functionName}
*/ */
@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 +99,6 @@ public class ${ClassName}Controller extends BaseController ...@@ -104,7 +99,6 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 删除${functionName} * 删除${functionName}
*/ */
@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)
......
zh-baseversion-quartz/src/main/java/com/zehong/quartz/controller/SysJobController.java
View file @ 1c05698b
...@@ -3,7 +3,6 @@ package com.zehong.quartz.controller; ...@@ -3,7 +3,6 @@ package com.zehong.quartz.controller;
import java.util.List; import java.util.List;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -39,7 +38,6 @@ public class SysJobController extends BaseController ...@@ -39,7 +38,6 @@ public class SysJobController extends BaseController
/** /**
* 查询定时任务列表 * 查询定时任务列表
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysJob sysJob) public TableDataInfo list(SysJob sysJob)
{ {
...@@ -51,7 +49,6 @@ public class SysJobController extends BaseController ...@@ -51,7 +49,6 @@ public class SysJobController extends BaseController
/** /**
* 导出定时任务列表 * 导出定时任务列表
*/ */
@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 +61,6 @@ public class SysJobController extends BaseController ...@@ -64,7 +61,6 @@ public class SysJobController extends BaseController
/** /**
* 获取定时任务详细信息 * 获取定时任务详细信息
*/ */
@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 +70,6 @@ public class SysJobController extends BaseController ...@@ -74,7 +70,6 @@ public class SysJobController extends BaseController
/** /**
* 新增定时任务 * 新增定时任务
*/ */
@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 +85,6 @@ public class SysJobController extends BaseController ...@@ -90,7 +85,6 @@ public class SysJobController extends BaseController
/** /**
* 修改定时任务 * 修改定时任务
*/ */
@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 +100,6 @@ public class SysJobController extends BaseController ...@@ -106,7 +100,6 @@ public class SysJobController extends BaseController
/** /**
* 定时任务状态修改 * 定时任务状态修改
*/ */
@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 +112,6 @@ public class SysJobController extends BaseController ...@@ -119,7 +112,6 @@ public class SysJobController extends BaseController
/** /**
* 定时任务立即执行一次 * 定时任务立即执行一次
*/ */
@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 +123,6 @@ public class SysJobController extends BaseController ...@@ -131,7 +123,6 @@ public class SysJobController extends BaseController
/** /**
* 删除定时任务 * 删除定时任务
*/ */
@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
......
zh-baseversion-quartz/src/main/java/com/zehong/quartz/controller/SysJobLogController.java
View file @ 1c05698b
...@@ -2,7 +2,6 @@ package com.zehong.quartz.controller; ...@@ -2,7 +2,6 @@ package com.zehong.quartz.controller;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -32,7 +31,6 @@ public class SysJobLogController extends BaseController ...@@ -32,7 +31,6 @@ public class SysJobLogController extends BaseController
/** /**
* 查询定时任务调度日志列表 * 查询定时任务调度日志列表
*/ */
@PreAuthorize("@ss.hasPermi('monitor:job:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog) public TableDataInfo list(SysJobLog sysJobLog)
{ {
...@@ -44,7 +42,6 @@ public class SysJobLogController extends BaseController ...@@ -44,7 +42,6 @@ public class SysJobLogController extends BaseController
/** /**
* 导出定时任务调度日志列表 * 导出定时任务调度日志列表
*/ */
@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 +54,6 @@ public class SysJobLogController extends BaseController ...@@ -57,7 +54,6 @@ public class SysJobLogController extends BaseController
/** /**
* 根据调度编号获取详细信息 * 根据调度编号获取详细信息
*/ */
@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 +64,6 @@ public class SysJobLogController extends BaseController ...@@ -68,7 +64,6 @@ public class SysJobLogController extends BaseController
/** /**
* 删除定时任务调度日志 * 删除定时任务调度日志
*/ */
@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 +74,6 @@ public class SysJobLogController extends BaseController ...@@ -79,7 +74,6 @@ public class SysJobLogController extends BaseController
/** /**
* 清空定时任务调度日志 * 清空定时任务调度日志
*/ */
@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()
......
zh-baseversion-system/src/main/java/com/zehong/system/controller/TDoubleBookController.java
View file @ 1c05698b
package com.zehong.system.controller; package com.zehong.system.controller;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TDoubleBookController extends BaseController ...@@ -36,7 +35,6 @@ public class TDoubleBookController extends BaseController
/** /**
* 查询双代台账列表 * 查询双代台账列表
*/ */
@PreAuthorize("@ss.hasPermi('system:book:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TDoubleBook tDoubleBook) public TableDataInfo list(TDoubleBook tDoubleBook)
{ {
...@@ -48,7 +46,6 @@ public class TDoubleBookController extends BaseController ...@@ -48,7 +46,6 @@ public class TDoubleBookController extends BaseController
/** /**
* 导出双代台账列表 * 导出双代台账列表
*/ */
@PreAuthorize("@ss.hasPermi('system:book:export')")
@Log(title = "双代台账", businessType = BusinessType.EXPORT) @Log(title = "双代台账", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TDoubleBook tDoubleBook) public AjaxResult export(TDoubleBook tDoubleBook)
...@@ -61,7 +58,6 @@ public class TDoubleBookController extends BaseController ...@@ -61,7 +58,6 @@ public class TDoubleBookController extends BaseController
/** /**
* 获取双代台账详细信息 * 获取双代台账详细信息
*/ */
@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 +67,6 @@ public class TDoubleBookController extends BaseController ...@@ -71,7 +67,6 @@ public class TDoubleBookController extends BaseController
/** /**
* 新增双代台账 * 新增双代台账
*/ */
@PreAuthorize("@ss.hasPermi('system:book:add')")
@Log(title = "双代台账", businessType = BusinessType.INSERT) @Log(title = "双代台账", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TDoubleBook tDoubleBook) public AjaxResult add(@RequestBody TDoubleBook tDoubleBook)
...@@ -82,7 +77,6 @@ public class TDoubleBookController extends BaseController ...@@ -82,7 +77,6 @@ public class TDoubleBookController extends BaseController
/** /**
* 修改双代台账 * 修改双代台账
*/ */
@PreAuthorize("@ss.hasPermi('system:book:edit')")
@Log(title = "双代台账", businessType = BusinessType.UPDATE) @Log(title = "双代台账", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TDoubleBook tDoubleBook) public AjaxResult edit(@RequestBody TDoubleBook tDoubleBook)
...@@ -93,7 +87,6 @@ public class TDoubleBookController extends BaseController ...@@ -93,7 +87,6 @@ public class TDoubleBookController extends BaseController
/** /**
* 删除双代台账 * 删除双代台账
*/ */
@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)
......
zh-baseversion-system/src/main/java/com/zehong/system/controller/TEventHandleController.java
View file @ 1c05698b
package com.zehong.system.controller; package com.zehong.system.controller;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TEventHandleController extends BaseController ...@@ -36,7 +35,6 @@ public class TEventHandleController extends BaseController
/** /**
* 查询事件处置列表 * 查询事件处置列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:handle:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEventHandle tEventHandle) public TableDataInfo list(TEventHandle tEventHandle)
{ {
...@@ -48,7 +46,6 @@ public class TEventHandleController extends BaseController ...@@ -48,7 +46,6 @@ public class TEventHandleController extends BaseController
/** /**
* 导出事件处置列表 * 导出事件处置列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:handle:export')")
@Log(title = "事件处置", businessType = BusinessType.EXPORT) @Log(title = "事件处置", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TEventHandle tEventHandle) public AjaxResult export(TEventHandle tEventHandle)
...@@ -61,7 +58,6 @@ public class TEventHandleController extends BaseController ...@@ -61,7 +58,6 @@ public class TEventHandleController extends BaseController
/** /**
* 获取事件处置详细信息 * 获取事件处置详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:handle:query')")
@GetMapping(value = "/{handleId}") @GetMapping(value = "/{handleId}")
public AjaxResult getInfo(@PathVariable("handleId") Long handleId) public AjaxResult getInfo(@PathVariable("handleId") Long handleId)
{ {
...@@ -71,7 +67,6 @@ public class TEventHandleController extends BaseController ...@@ -71,7 +67,6 @@ public class TEventHandleController extends BaseController
/** /**
* 新增事件处置 * 新增事件处置
*/ */
//@PreAuthorize("@ss.hasPermi('system:handle:add')")
@Log(title = "事件处置", businessType = BusinessType.INSERT) @Log(title = "事件处置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TEventHandle tEventHandle) public AjaxResult add(@RequestBody TEventHandle tEventHandle)
...@@ -82,7 +77,6 @@ public class TEventHandleController extends BaseController ...@@ -82,7 +77,6 @@ public class TEventHandleController extends BaseController
/** /**
* 修改事件处置 * 修改事件处置
*/ */
//@PreAuthorize("@ss.hasPermi('system:handle:edit')")
@Log(title = "事件处置", businessType = BusinessType.UPDATE) @Log(title = "事件处置", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TEventHandle tEventHandle) public AjaxResult edit(@RequestBody TEventHandle tEventHandle)
...@@ -93,7 +87,6 @@ public class TEventHandleController extends BaseController ...@@ -93,7 +87,6 @@ public class TEventHandleController extends BaseController
/** /**
* 删除事件处置 * 删除事件处置
*/ */
//@PreAuthorize("@ss.hasPermi('system:handle:remove')")
@Log(title = "事件处置", businessType = BusinessType.DELETE) @Log(title = "事件处置", businessType = BusinessType.DELETE)
@DeleteMapping("/{handleIds}") @DeleteMapping("/{handleIds}")
public AjaxResult remove(@PathVariable Long[] handleIds) public AjaxResult remove(@PathVariable Long[] handleIds)
......
zh-baseversion-system/src/main/java/com/zehong/system/controller/TEventInfoController.java
View file @ 1c05698b
package com.zehong.system.controller; package com.zehong.system.controller;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TEventInfoController extends BaseController ...@@ -36,7 +35,6 @@ public class TEventInfoController extends BaseController
/** /**
* 查询事件处置列表 * 查询事件处置列表
*/ */
@PreAuthorize("@ss.hasPermi('system:eventInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEventInfo tEventInfo) public TableDataInfo list(TEventInfo tEventInfo)
{ {
...@@ -48,7 +46,6 @@ public class TEventInfoController extends BaseController ...@@ -48,7 +46,6 @@ public class TEventInfoController extends BaseController
/** /**
* 导出事件处置列表 * 导出事件处置列表
*/ */
@PreAuthorize("@ss.hasPermi('system:eventInfo:export')")
@Log(title = "事件处置", businessType = BusinessType.EXPORT) @Log(title = "事件处置", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TEventInfo tEventInfo) public AjaxResult export(TEventInfo tEventInfo)
...@@ -61,7 +58,6 @@ public class TEventInfoController extends BaseController ...@@ -61,7 +58,6 @@ public class TEventInfoController extends BaseController
/** /**
* 获取事件处置详细信息 * 获取事件处置详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:eventInfo:query')")
@GetMapping(value = "/{eventId}") @GetMapping(value = "/{eventId}")
public AjaxResult getInfo(@PathVariable("eventId") Long eventId) public AjaxResult getInfo(@PathVariable("eventId") Long eventId)
{ {
...@@ -71,7 +67,6 @@ public class TEventInfoController extends BaseController ...@@ -71,7 +67,6 @@ public class TEventInfoController extends BaseController
/** /**
* 新增事件处置 * 新增事件处置
*/ */
@PreAuthorize("@ss.hasPermi('system:eventInfo:add')")
@Log(title = "事件处置", businessType = BusinessType.INSERT) @Log(title = "事件处置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TEventInfo tEventInfo) public AjaxResult add(@RequestBody TEventInfo tEventInfo)
...@@ -82,7 +77,6 @@ public class TEventInfoController extends BaseController ...@@ -82,7 +77,6 @@ public class TEventInfoController extends BaseController
/** /**
* 修改事件处置 * 修改事件处置
*/ */
@PreAuthorize("@ss.hasPermi('system:eventInfo:edit')")
@Log(title = "事件处置", businessType = BusinessType.UPDATE) @Log(title = "事件处置", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TEventInfo tEventInfo) public AjaxResult edit(@RequestBody TEventInfo tEventInfo)
...@@ -93,7 +87,6 @@ public class TEventInfoController extends BaseController ...@@ -93,7 +87,6 @@ public class TEventInfoController extends BaseController
/** /**
* 删除事件处置 * 删除事件处置
*/ */
@PreAuthorize("@ss.hasPermi('system:eventInfo:remove')")
@Log(title = "事件处置", businessType = BusinessType.DELETE) @Log(title = "事件处置", businessType = BusinessType.DELETE)
@DeleteMapping("/{eventIds}") @DeleteMapping("/{eventIds}")
public AjaxResult remove(@PathVariable Long[] eventIds) public AjaxResult remove(@PathVariable Long[] eventIds)
......
zh-baseversion-system/src/main/java/com/zehong/system/controller/TEventReceiveController.java
View file @ 1c05698b
...@@ -2,8 +2,6 @@ package com.zehong.system.controller; ...@@ -2,8 +2,6 @@ package com.zehong.system.controller;
import java.util.List; import java.util.List;
import com.alibaba.fastjson.JSONObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -38,7 +36,6 @@ public class TEventReceiveController extends BaseController ...@@ -38,7 +36,6 @@ public class TEventReceiveController extends BaseController
/** /**
* 查询事件接报列表 * 查询事件接报列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:receive:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TEventReceive tEventReceive) public TableDataInfo list(TEventReceive tEventReceive)
{ {
...@@ -50,7 +47,6 @@ public class TEventReceiveController extends BaseController ...@@ -50,7 +47,6 @@ public class TEventReceiveController extends BaseController
/** /**
* 导出事件接报列表 * 导出事件接报列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:receive:export')")
@Log(title = "事件接报", businessType = BusinessType.EXPORT) @Log(title = "事件接报", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TEventReceive tEventReceive) public AjaxResult export(TEventReceive tEventReceive)
...@@ -63,7 +59,6 @@ public class TEventReceiveController extends BaseController ...@@ -63,7 +59,6 @@ public class TEventReceiveController extends BaseController
/** /**
* 获取事件接报详细信息 * 获取事件接报详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:receive:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) public AjaxResult getInfo(@PathVariable("id") String id)
{ {
...@@ -73,7 +68,6 @@ public class TEventReceiveController extends BaseController ...@@ -73,7 +68,6 @@ public class TEventReceiveController extends BaseController
/** /**
* 新增事件接报 * 新增事件接报
*/ */
//@PreAuthorize("@ss.hasPermi('system:receive:add')")
@Log(title = "事件接报", businessType = BusinessType.INSERT) @Log(title = "事件接报", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TEventReceive tEventReceive) public AjaxResult add(@RequestBody TEventReceive tEventReceive)
...@@ -84,7 +78,6 @@ public class TEventReceiveController extends BaseController ...@@ -84,7 +78,6 @@ public class TEventReceiveController extends BaseController
/** /**
* 修改事件接报 * 修改事件接报
*/ */
//@PreAuthorize("@ss.hasPermi('system:receive:edit')")
@Log(title = "事件接报", businessType = BusinessType.UPDATE) @Log(title = "事件接报", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TEventReceive tEventReceive) public AjaxResult edit(@RequestBody TEventReceive tEventReceive)
...@@ -95,7 +88,6 @@ public class TEventReceiveController extends BaseController ...@@ -95,7 +88,6 @@ public class TEventReceiveController extends BaseController
/** /**
* 删除事件接报 * 删除事件接报
*/ */
//@PreAuthorize("@ss.hasPermi('system:receive:remove')")
@Log(title = "事件接报", businessType = BusinessType.DELETE) @Log(title = "事件接报", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) public AjaxResult remove(@PathVariable String[] ids)
......
zh-baseversion-system/src/main/java/com/zehong/system/controller/TPatrolCheckInController.java
View file @ 1c05698b
package com.zehong.system.controller; package com.zehong.system.controller;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TPatrolCheckInController extends BaseController ...@@ -36,7 +35,6 @@ public class TPatrolCheckInController extends BaseController
/** /**
* 查询巡检签到列表 * 查询巡检签到列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:in:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPatrolCheckIn tPatrolCheckIn) public TableDataInfo list(TPatrolCheckIn tPatrolCheckIn)
{ {
...@@ -48,7 +46,6 @@ public class TPatrolCheckInController extends BaseController ...@@ -48,7 +46,6 @@ public class TPatrolCheckInController extends BaseController
/** /**
* 导出巡检签到列表 * 导出巡检签到列表
*/ */
//@PreAuthorize("@ss.hasPermi('system:in:export')")
@Log(title = "巡检签到", businessType = BusinessType.EXPORT) @Log(title = "巡检签到", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(TPatrolCheckIn tPatrolCheckIn) public AjaxResult export(TPatrolCheckIn tPatrolCheckIn)
...@@ -61,7 +58,6 @@ public class TPatrolCheckInController extends BaseController ...@@ -61,7 +58,6 @@ public class TPatrolCheckInController extends BaseController
/** /**
* 获取巡检签到详细信息 * 获取巡检签到详细信息
*/ */
//@PreAuthorize("@ss.hasPermi('system:in:query')")
@GetMapping(value = "/{checkInId}") @GetMapping(value = "/{checkInId}")
public AjaxResult getInfo(@PathVariable("checkInId") Long checkInId) public AjaxResult getInfo(@PathVariable("checkInId") Long checkInId)
{ {
...@@ -71,7 +67,6 @@ public class TPatrolCheckInController extends BaseController ...@@ -71,7 +67,6 @@ public class TPatrolCheckInController extends BaseController
/** /**
* 新增巡检签到 * 新增巡检签到
*/ */
//@PreAuthorize("@ss.hasPermi('system:in:add')")
@Log(title = "巡检签到", businessType = BusinessType.INSERT) @Log(title = "巡检签到", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TPatrolCheckIn tPatrolCheckIn) public AjaxResult add(@RequestBody TPatrolCheckIn tPatrolCheckIn)
...@@ -82,7 +77,6 @@ public class TPatrolCheckInController extends BaseController ...@@ -82,7 +77,6 @@ public class TPatrolCheckInController extends BaseController
/** /**
* 修改巡检签到 * 修改巡检签到
*/ */
//@PreAuthorize("@ss.hasPermi('system:in:edit')")
@Log(title = "巡检签到", businessType = BusinessType.UPDATE) @Log(title = "巡检签到", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody TPatrolCheckIn tPatrolCheckIn) public AjaxResult edit(@RequestBody TPatrolCheckIn tPatrolCheckIn)
...@@ -93,7 +87,6 @@ public class TPatrolCheckInController extends BaseController ...@@ -93,7 +87,6 @@ public class TPatrolCheckInController extends BaseController
/** /**
* 删除巡检签到 * 删除巡检签到
*/ */
//@PreAuthorize("@ss.hasPermi('system:in:remove')")
@Log(title = "巡检签到", businessType = BusinessType.DELETE) @Log(title = "巡检签到", businessType = BusinessType.DELETE)
@DeleteMapping("/{checkInIds}") @DeleteMapping("/{checkInIds}")
public AjaxResult remove(@PathVariable Long[] checkInIds) public AjaxResult remove(@PathVariable Long[] checkInIds)
......
zh-baseversion-system/src/main/java/com/zehong/system/controller/TPlanInfoController.java
View file @ 1c05698b
package com.zehong.system.controller; package com.zehong.system.controller;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -36,7 +35,6 @@ public class TPlanInfoController extends BaseController ...@@ -36,7 +35,6 @@ public class TPlanInfoController extends BaseController
/** /**
* 查询应急预案列表 * 查询应急预案列表
*/ */
@PreAuthorize("@ss.hasPermi('system:planInfo:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TPlanInfo tPlanInfo) public TableDataInfo list(TPlanInfo tPlanInfo)
{ {
...@@ -48,7 +46,6 @@ public class TPlanInfoController extends BaseController ...@@ -48,7 +46,6 @@ public class TPlanInfoController extends BaseController
/** /**
* 导出应急预案列表 * 导出应急预案列表
*/ */
@PreAuthorize("@ss.hasPermi('system:planInfo: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)
...@@ -61,7 +58,6 @@ public class TPlanInfoController extends BaseController ...@@ -61,7 +58,6 @@ public class TPlanInfoController extends BaseController
/** /**
* 获取应急预案详细信息 * 获取应急预案详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:planInfo:query')")
@GetMapping(value = "/{planId}") @GetMapping(value = "/{planId}")
public AjaxResult getInfo(@PathVariable("planId") Long planId) public AjaxResult getInfo(@PathVariable("planId") Long planId)
{ {
...@@ -71,7 +67,6 @@ public class TPlanInfoController extends BaseController ...@@ -71,7 +67,6 @@ public class TPlanInfoController extends BaseController
/** /**
* 新增应急预案 * 新增应急预案
*/ */
@PreAuthorize("@ss.hasPermi('system:planInfo: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)
...@@ -82,7 +77,6 @@ public class TPlanInfoController extends BaseController ...@@ -82,7 +77,6 @@ public class TPlanInfoController extends BaseController
/** /**
* 修改应急预案 * 修改应急预案
*/ */
@PreAuthorize("@ss.hasPermi('system:planInfo: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)
...@@ -93,7 +87,6 @@ public class TPlanInfoController extends BaseController ...@@ -93,7 +87,6 @@ public class TPlanInfoController extends BaseController
/** /**
* 删除应急预案 * 删除应急预案
*/ */
@PreAuthorize("@ss.hasPermi('system:planInfo: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)
......
zh-baseversion-web/src/utils/mapClass/map.js
View file @ 1c05698b
...@@ -319,13 +319,13 @@ export class EditorMap { ...@@ -319,13 +319,13 @@ export class EditorMap {
addDevice(deviceData, compontent, showBool = true) { addDevice(deviceData, compontent, showBool = true) {
const { longitude: lng, latitude: lat, iconType } = deviceData; const { longitude: lng, latitude: lat, iconType } = deviceData;
const icon = svgUrl[iconType]; const icon = svgUrl[iconType];
console.log("icon", icon);
let device = this.createMarker({ let device = this.createMarker({
map: this.map, map: this.map,
anchor: "bottom-center", anchor: "bottom-center",
icon, icon,
position: [lng, lat], position: [lng, lat],
extData: deviceData, extData: deviceData,
alwaysRender: false
// label:{ // label:{
// content:123, // content:123,
// direction:"top", // direction:"top",
...@@ -441,6 +441,7 @@ export class EditorMap { ...@@ -441,6 +441,7 @@ export class EditorMap {
// 创建marker // 创建marker
createMarker(MarkerOptions) { createMarker(MarkerOptions) {
return new AMap.Marker(MarkerOptions); return new AMap.Marker(MarkerOptions);
// return new AMap.MarkerClusterer(MarkerOptions);
} }
filterSelectPipe(id,mediumComponent,lng, lat) { filterSelectPipe(id,mediumComponent,lng, lat) {
......
zh-baseversion-web/src/views/bigWindow/index.vue
View file @ 1c05698b
...@@ -173,7 +173,7 @@ import { ...@@ -173,7 +173,7 @@ import {
getYhq, getYhq,
deviceUser deviceUser
} from "@/api/bigWindow/getDevice"; } from "@/api/bigWindow/getDevice";
import Line from "@/components/bigWindow/Line.vue"; import Line from "@/components/bigWindow/Line.vue";
import VideoView from "@/components/bigWindow/VideoView.vue"; import VideoView from "@/components/bigWindow/VideoView.vue";
import Device from "@/components/bigWindow/Device.vue"; import Device from "@/components/bigWindow/Device.vue";
import Cz from "@/components/bigWindow/Cz.vue"; import Cz from "@/components/bigWindow/Cz.vue";
...@@ -723,6 +723,7 @@ export default { ...@@ -723,6 +723,7 @@ export default {
background-size: 105% 100%; background-size: 105% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-left: -20px; margin-left: -20px;
pointer-events: none;
} }
.rightbar { .rightbar {
width: 585px; width: 585px;
...@@ -735,6 +736,7 @@ export default { ...@@ -735,6 +736,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-right: -20px; margin-right: -20px;
pointer-events: none;
} }
.home-div { .home-div {
width: 40%; width: 40%;
......
zh-baseversion-web/src/views/complainDeal/index.vue
View file @ 1c05698b
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['complainDeal:complainDeal:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
...@@ -71,7 +70,6 @@ ...@@ -71,7 +70,6 @@
size="mini" size="mini"
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
v-hasPermi="['complainDeal:complainDeal:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -106,7 +104,6 @@ ...@@ -106,7 +104,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handlefankui(scope.row)" @click="handlefankui(scope.row)"
v-hasPermi="['complainDeal:complainDeal:edit']"
>反馈</el-button> >反馈</el-button>
<el-button <el-button
size="mini" size="mini"
...@@ -115,7 +112,6 @@ ...@@ -115,7 +112,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handlegui(scope.row)" @click="handlegui(scope.row)"
v-hasPermi="['complainDeal:complainDeal:edit']"
>归档</el-button> >归档</el-button>
<el-button <el-button
size="mini" size="mini"
...@@ -123,7 +119,6 @@ ...@@ -123,7 +119,6 @@
v-if="scope.row.complainStatus==1 && deptId==-2" v-if="scope.row.complainStatus==1 && deptId==-2"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['complainDeal:complainDeal:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
...@@ -136,7 +131,6 @@ ...@@ -136,7 +131,6 @@
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['complainDeal:complainDeal:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/emergencydrills/record/index.vue
View file @ 1c05698b
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['emergencydrills:record:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -44,7 +43,6 @@ ...@@ -44,7 +43,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['emergencydrills:record:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -55,7 +53,6 @@ ...@@ -55,7 +53,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['emergencydrills:record:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -66,7 +63,6 @@ ...@@ -66,7 +63,6 @@
size="mini" size="mini"
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
v-hasPermi="['emergencydrills:record:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -87,14 +83,12 @@ ...@@ -87,14 +83,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['emergencydrills:record:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['emergencydrills:record:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/gasBottleTrack/bottleTrackRecord/index.vue
View file @ 1c05698b
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:record:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -52,7 +51,6 @@ ...@@ -52,7 +51,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:record:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -63,7 +61,6 @@ ...@@ -63,7 +61,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:record:remove']"
>删除</el-button> >删除</el-button>
</el-col>--> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -74,7 +71,6 @@ ...@@ -74,7 +71,6 @@
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['track:record:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -121,14 +117,12 @@ ...@@ -121,14 +117,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:record:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:record:remove']"
>删除</el-button>--> >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/gasBottleTrack/chargeRecord/index.vue
View file @ 1c05698b
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:record:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -66,7 +65,6 @@ ...@@ -66,7 +65,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:record:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -77,7 +75,6 @@ ...@@ -77,7 +75,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:record:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -88,7 +85,6 @@ ...@@ -88,7 +85,6 @@
size="mini" size="mini"
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:record:export']"
>导出</el-button> >导出</el-button>
</el-col>--> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -98,7 +94,6 @@ ...@@ -98,7 +94,6 @@
size="mini" size="mini"
style="color: #1890ff" style="color: #1890ff"
@click="handleImport" @click="handleImport"
v-hasPermi="['charge:record:import']"
>批量导入</el-button> >批量导入</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -128,21 +123,18 @@ ...@@ -128,21 +123,18 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-document" icon="el-icon-document"
@click="showDetail(scope.row)"
>查看</el-button> >查看</el-button>
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:record:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:record:remove']"
>删除</el-button>--> >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/gasBottleTrack/gasBottleManage/index.vue
View file @ 1c05698b
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['gasBottle:info:add']"
>新增气瓶</el-button> >新增气瓶</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -77,7 +76,6 @@ ...@@ -77,7 +76,6 @@
size="mini" size="mini"
style="color: #1890ff" style="color: #1890ff"
@click="handleImport" @click="handleImport"
v-hasPermi="['gasBottle:info:import']"
>导入</el-button> >导入</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -88,7 +86,6 @@ ...@@ -88,7 +86,6 @@
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['gasBottle:info:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -133,14 +130,12 @@ ...@@ -133,14 +130,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['gasBottle:info:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['gasBottle:info:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/gasBottleTrack/gasHolderStationManage/index.vue
View file @ 1c05698b
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['gasBottleTrack:storageStationManage:add']"
>新增储配站</el-button> >新增储配站</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -56,7 +55,6 @@ ...@@ -56,7 +55,6 @@
size="mini" size="mini"
@click="handleImport" @click="handleImport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['gasBottleTrack:storageStationManage:import']"
>导入</el-button> >导入</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -67,7 +65,6 @@ ...@@ -67,7 +65,6 @@
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['gasBottleTrack:storageStationManage:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -108,14 +105,12 @@ ...@@ -108,14 +105,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['gasBottleTrack:storageStationManage:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['gasBottleTrack:storageStationManage:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/gasBottleTrack/gasUser/index.vue
View file @ 1c05698b
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['gasUser:info:add']"
>新增燃气用户</el-button> >新增燃气用户</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -57,7 +56,6 @@ ...@@ -57,7 +56,6 @@
size="mini" size="mini"
@click="handleImport" @click="handleImport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['gasUser:info:import']"
>导入</el-button> >导入</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -68,7 +66,6 @@ ...@@ -68,7 +66,6 @@
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['gasUser:info:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -116,14 +113,12 @@ ...@@ -116,14 +113,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['gasUser:info:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['gasUser:info:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/gasBottleTrack/practitionerManage/index.vue
View file @ 1c05698b
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['practitioner:info:add']"
>新增从业人员</el-button> >新增从业人员</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -64,7 +63,6 @@ ...@@ -64,7 +63,6 @@
size="mini" size="mini"
@click="handleImport" @click="handleImport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['practitioner:info:import']"
>导入</el-button> >导入</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -75,7 +73,6 @@ ...@@ -75,7 +73,6 @@
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['practitioner:info:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -113,14 +110,12 @@ ...@@ -113,14 +110,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['practitioner:info:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['practitioner:info:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/gasBottleTrack/safeCheckRecord/index.vue
View file @ 1c05698b
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:record:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -79,7 +78,6 @@ ...@@ -79,7 +78,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:record:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -90,7 +88,6 @@ ...@@ -90,7 +88,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:record:remove']"
>删除</el-button> >删除</el-button>
</el-col>--> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -101,7 +98,6 @@ ...@@ -101,7 +98,6 @@
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
style="color: #1890ff" style="color: #1890ff"
v-hasPermi="['safe:record:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -143,14 +139,12 @@ ...@@ -143,14 +139,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:record:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:record:remove']"
>删除</el-button>--> >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
......
zh-baseversion-web/src/views/inspectionWork/workOrder/index.vue
View file @ 1c05698b
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:order:add']"
v-if="roleType != 'inpector'" v-if="roleType != 'inpector'"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
...@@ -52,7 +51,6 @@ ...@@ -52,7 +51,6 @@
size="mini" size="mini"
:loading="exportLoading" :loading="exportLoading"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:order:export']"
v-if="roleType != 'inpector'" v-if="roleType != 'inpector'"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
...@@ -137,7 +135,6 @@ ...@@ -137,7 +135,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="workDetail(scope.row)" @click="workDetail(scope.row)"
v-hasPermi="['system:order:edit']"
key="detail" key="detail"
>详情</el-button> >详情</el-button>
<el-button v-if="('zhengfu'== roleType || (('enterprise'== roleType || 'doubleRole' == roleType) && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId))&& scope.row.workStatus == '0'" key="edit" <el-button v-if="('zhengfu'== roleType || (('enterprise'== roleType || 'doubleRole' == roleType) && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId))&& scope.row.workStatus == '0'" key="edit"
...@@ -145,14 +142,12 @@ ...@@ -145,14 +142,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:order:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']"
v-if="('zhengfu'== roleType || (('enterprise'== roleType || 'doubleRole' == roleType) && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId))&& scope.row.workStatus == '0'" v-if="('zhengfu'== roleType || (('enterprise'== roleType || 'doubleRole' == roleType) && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId))&& scope.row.workStatus == '0'"
key="detele" key="detele"
>删除</el-button> >删除</el-button>
...@@ -161,7 +156,6 @@ ...@@ -161,7 +156,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="workIssue(scope.row)" @click="workIssue(scope.row)"
v-hasPermi="['system:order:edit']"
key="work" key="work"
>任务下发</el-button> >任务下发</el-button>
<el-button v-if=" ('inpector'== roleType || 'doubleRole' == roleType) && (scope.row.workAssignManId == $store.state.user.userId) && scope.row.workStatus == '0'" <el-button v-if=" ('inpector'== roleType || 'doubleRole' == roleType) && (scope.row.workAssignManId == $store.state.user.userId) && scope.row.workStatus == '0'"
...@@ -169,7 +163,6 @@ ...@@ -169,7 +163,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="takingOrder(scope.row)" @click="takingOrder(scope.row)"
v-hasPermi="['system:order:edit']"
key="recieve" key="recieve"
>接单</el-button> >接单</el-button>
<el-button v-if="'zhengfu'!= roleType && (scope.row.workStatus == '0' || scope.row.workStatus == '1')" <el-button v-if="'zhengfu'!= roleType && (scope.row.workStatus == '0' || scope.row.workStatus == '1')"
...@@ -177,7 +170,6 @@ ...@@ -177,7 +170,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="feedbookWork(scope.row)" @click="feedbookWork(scope.row)"
v-hasPermi="['system:order:edit']"
key="feedbook" key="feedbook"
>反馈</el-button> >反馈</el-button>
<el-button v-if="scope.row.workStatus == '2' && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId" <el-button v-if="scope.row.workStatus == '2' && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId"
...@@ -185,7 +177,6 @@ ...@@ -185,7 +177,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="sortWork(scope.row)" @click="sortWork(scope.row)"
v-hasPermi="['system:order:edit']"
key="sort" key="sort"
>归档</el-button> >归档</el-button>
<el-button v-if="'zhengfu'!= roleType && scope.row.workStatus != '3'" <el-button v-if="'zhengfu'!= roleType && scope.row.workStatus != '3'"
...@@ -193,7 +184,6 @@ ...@@ -193,7 +184,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="hiddenFeed(scope.row)" @click="hiddenFeed(scope.row)"
v-hasPermi="['system:order:edit']"
key="hidden" key="hidden"
>隐患反馈</el-button> >隐患反馈</el-button>
<el-button v-if="'zhengfu'== roleType && scope.row.workStatus != '2' && scope.row.workStatus != '3' && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId" <el-button v-if="'zhengfu'== roleType && scope.row.workStatus != '2' && scope.row.workStatus != '3' && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId"
...@@ -201,7 +191,6 @@ ...@@ -201,7 +191,6 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="supervisor(scope.row)" @click="supervisor(scope.row)"
v-hasPermi="['system:order:edit']"
key="supervisor" key="supervisor"
>督办</el-button> >督办</el-button>
</template> </template>
......
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