opi(execl表格)依赖冲突解决,还有权限字符串修改
This commit is contained in:
@@ -41,7 +41,7 @@ public class BasSheepTypeController extends BaseController
|
||||
/**
|
||||
* 查询羊只类型列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('base:base:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('base:base:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BasSheepType basSheepType)
|
||||
{
|
||||
@@ -53,7 +53,7 @@ public class BasSheepTypeController extends BaseController
|
||||
/**
|
||||
* 导出羊只类型列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('base:base:export')")
|
||||
// @PreAuthorize("@ss.hasPermi('base:base:export')")
|
||||
@Log(title = "羊只类型", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BasSheepType basSheepType)
|
||||
@@ -66,7 +66,7 @@ public class BasSheepTypeController extends BaseController
|
||||
/**
|
||||
* 获取羊只类型详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('base:base:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('base:base:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Integer id)
|
||||
{
|
||||
@@ -76,7 +76,7 @@ public class BasSheepTypeController extends BaseController
|
||||
/**
|
||||
* 新增羊只类型
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('base:base:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('base:base:add')")
|
||||
@Log(title = "羊只类型", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BasSheepType basSheepType)
|
||||
@@ -87,7 +87,7 @@ public class BasSheepTypeController extends BaseController
|
||||
/**
|
||||
* 修改羊只类型
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('base:base:edit')")
|
||||
// @PreAuthorize("@ss.hasPermi('base:base:edit')")
|
||||
@Log(title = "羊只类型", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody BasSheepType basSheepType)
|
||||
@@ -98,7 +98,7 @@ public class BasSheepTypeController extends BaseController
|
||||
/**
|
||||
* 删除羊只类型
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('base:base:remove')")
|
||||
// @PreAuthorize("@ss.hasPermi('base:base:remove')")
|
||||
@Log(title = "羊只类型", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Integer[] ids)
|
||||
|
||||
@@ -42,7 +42,7 @@ public class DaRanchController extends BaseController
|
||||
/**
|
||||
* 查询牧场管理列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ranch:ranch:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('ranch:ranch:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(DaRanch daRanch)
|
||||
{
|
||||
@@ -54,7 +54,7 @@ public class DaRanchController extends BaseController
|
||||
/**
|
||||
* 导出牧场管理列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ranch:ranch:export')")
|
||||
// @PreAuthorize("@ss.hasPermi('ranch:ranch:export')")
|
||||
@Log(title = "牧场管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, DaRanch daRanch)
|
||||
@@ -67,7 +67,7 @@ public class DaRanchController extends BaseController
|
||||
/**
|
||||
* 获取牧场管理详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ranch:ranch:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('ranch:ranch:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
@@ -77,7 +77,7 @@ public class DaRanchController extends BaseController
|
||||
/**
|
||||
* 获取指定牧场下的所有羊只耳号
|
||||
*/
|
||||
@GetMapping("/getSheepByRanchId/{ranchId}")
|
||||
// @GetMapping("/getSheepByRanchId/{ranchId}")
|
||||
public AjaxResult getSheepByRanchId(@PathVariable Long ranchId) {
|
||||
List<BasSheep> sheepList = basSheepService.getSheepByRanchId(ranchId);
|
||||
return AjaxResult.success(sheepList);
|
||||
@@ -87,7 +87,7 @@ public class DaRanchController extends BaseController
|
||||
/**
|
||||
* 新增牧场管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ranch:ranch:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('ranch:ranch:add')")
|
||||
@Log(title = "牧场管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody DaRanch daRanch)
|
||||
@@ -98,7 +98,7 @@ public class DaRanchController extends BaseController
|
||||
/**
|
||||
* 修改牧场管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ranch:ranch:edit')")
|
||||
// @PreAuthorize("@ss.hasPermi('ranch:ranch:edit')")
|
||||
@Log(title = "牧场管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody DaRanch daRanch)
|
||||
@@ -109,7 +109,7 @@ public class DaRanchController extends BaseController
|
||||
/**
|
||||
* 删除牧场管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('ranch:ranch:remove')")
|
||||
// @PreAuthorize("@ss.hasPermi('ranch:ranch:remove')")
|
||||
@Log(title = "牧场管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
|
||||
@@ -37,7 +37,7 @@ public class SwDiseaseController extends BaseController
|
||||
/**
|
||||
* 查询疾病列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('disease:disease:list')")
|
||||
@PreAuthorize("@ss.hasPermi('biosafety:disease:list')")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SwDisease swDisease)
|
||||
{
|
||||
@@ -48,7 +48,7 @@ public class SwDiseaseController extends BaseController
|
||||
/**
|
||||
* 导出疾病列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('disease:disease:export')")
|
||||
@PreAuthorize("@ss.hasPermi('biosafety:disease:export')")
|
||||
@Log(title = "疾病", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, SwDisease swDisease)
|
||||
@@ -61,7 +61,7 @@ public class SwDiseaseController extends BaseController
|
||||
/**
|
||||
* 获取疾病详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('disease:disease:query')")
|
||||
@PreAuthorize("@ss.hasPermi('biosafety:disease:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
@@ -71,7 +71,7 @@ public class SwDiseaseController extends BaseController
|
||||
/**
|
||||
* 新增疾病
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('disease:disease:add')")
|
||||
@PreAuthorize("@ss.hasPermi('biosafety:disease:add')")
|
||||
@Log(title = "疾病", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SwDisease swDisease)
|
||||
@@ -82,7 +82,7 @@ public class SwDiseaseController extends BaseController
|
||||
/**
|
||||
* 修改疾病
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('disease:disease:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('biosafety:disease:edit')")
|
||||
@Log(title = "疾病", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SwDisease swDisease)
|
||||
@@ -93,7 +93,7 @@ public class SwDiseaseController extends BaseController
|
||||
/**
|
||||
* 删除疾病
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('disease:disease:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('biosafety:disease:remove')")
|
||||
@Log(title = "疾病", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
|
||||
Reference in New Issue
Block a user