#适配现有的权限方案的改动
This commit is contained in:
@@ -102,7 +102,7 @@ public class SysProfileController extends BaseController
|
||||
* 重置密码
|
||||
*/
|
||||
@ApiOperation("重置密码")
|
||||
@PreAuthorize("@ss.hasPermi('systerm:user:updatePwd')")
|
||||
//@PreAuthorize("@ss.hasPermi('systerm:user:updatePwd')")
|
||||
@Log(title = "个人信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/updatePwd")
|
||||
public AjaxResult updatePwd(String oldPassword, String newPassword)
|
||||
|
||||
@@ -23,7 +23,7 @@ public class SysQrCodeController {
|
||||
@Autowired
|
||||
private ISysQrCodeService qrCodeService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:list')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:qrcode:list')")
|
||||
@ApiOperation("分页查询二维码")
|
||||
@GetMapping("/page")
|
||||
public AjaxResult page(Page<SysQrCode> page, SysQrCode qrCode) {
|
||||
@@ -31,7 +31,7 @@ public class SysQrCodeController {
|
||||
return AjaxResult.success(result.getRecords(), (int) result.getTotal());
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:list')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:qrcode:list')")
|
||||
@ApiOperation("查询二维码列表")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SysQrCode qrCode) {
|
||||
@@ -39,14 +39,14 @@ public class SysQrCodeController {
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:query')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:qrcode:query')")
|
||||
@ApiOperation("查询二维码详情")
|
||||
@GetMapping("/{id}")
|
||||
public AjaxResult getInfo(@PathVariable Long id) {
|
||||
return AjaxResult.success(qrCodeService.getById(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:qrcode:query')")
|
||||
@ApiOperation("根据序列号查询二维码")
|
||||
@GetMapping("/serial/{serialNumber}")
|
||||
public AjaxResult getBySerialNumber(@PathVariable String serialNumber) {
|
||||
@@ -70,7 +70,7 @@ public class SysQrCodeController {
|
||||
|
||||
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:generate')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:qrcode:generate')")
|
||||
@ApiOperation("生成二维码并保存记录")
|
||||
@PostMapping("/generate")
|
||||
public AjaxResult generate(@RequestBody QrCodeGenerateRequest request) {
|
||||
@@ -79,7 +79,7 @@ public class SysQrCodeController {
|
||||
}
|
||||
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:bind')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:qrcode:bind')")
|
||||
@ApiOperation("绑定设备")
|
||||
@PostMapping("/bind/{qrCodeId}/{deviceId}")
|
||||
public AjaxResult bindDevice(@PathVariable Long qrCodeId,
|
||||
@@ -87,14 +87,14 @@ public class SysQrCodeController {
|
||||
return toAjax(qrCodeService.bindDevice(qrCodeId, deviceId));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:unbind')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:qrcode:unbind')")
|
||||
@ApiOperation("解绑设备")
|
||||
@PostMapping("/unbind/{qrCodeId}")
|
||||
public AjaxResult unbindDevice(@PathVariable Long qrCodeId) {
|
||||
return toAjax(qrCodeService.unbindDevice(qrCodeId));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:qrcode:remove')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:qrcode:remove')")
|
||||
@ApiOperation("删除二维码")
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
|
||||
@@ -22,7 +22,7 @@ public class SysRobotConfigController {
|
||||
@Autowired
|
||||
private ISysRobotConfigService configService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:config:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:config:list')")
|
||||
@ApiOperation("分页查询机器人配置")
|
||||
@GetMapping("/page")
|
||||
public AjaxResult page(Page<SysRobotConfig> page, SysRobotConfig config) {
|
||||
@@ -30,7 +30,7 @@ public class SysRobotConfigController {
|
||||
return AjaxResult.success(result.getRecords(), (int) result.getTotal());
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:config:list')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:config:list')")
|
||||
@ApiOperation("查询机器人配置列表")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SysRobotConfig config) {
|
||||
@@ -38,14 +38,14 @@ public class SysRobotConfigController {
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:config:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:config:query')")
|
||||
@ApiOperation("查询机器人配置详情")
|
||||
@GetMapping("/{id}")
|
||||
public AjaxResult getInfo(@PathVariable Long id) {
|
||||
return AjaxResult.success(configService.getById(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:config:add')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:config:add')")
|
||||
@ApiOperation("新增机器人配置")
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SysRobotConfig config) {
|
||||
@@ -55,7 +55,7 @@ public class SysRobotConfigController {
|
||||
return toAjax(configService.save(config));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:config:edit')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:config:edit')")
|
||||
@ApiOperation("修改机器人配置")
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SysRobotConfig config) {
|
||||
@@ -65,7 +65,7 @@ public class SysRobotConfigController {
|
||||
return toAjax(configService.updateById(config));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:config:remove')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:config:remove')")
|
||||
@ApiOperation("删除机器人配置")
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
|
||||
@@ -22,7 +22,7 @@ public class SysRobotCountryController {
|
||||
@Autowired
|
||||
private ISysRobotCountryService countryService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:country:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:country:list')")
|
||||
@ApiOperation("分页查询国家")
|
||||
@GetMapping("/page")
|
||||
public AjaxResult page(Page<SysRobotCountry> page, SysRobotCountry country) {
|
||||
@@ -30,7 +30,7 @@ public class SysRobotCountryController {
|
||||
return AjaxResult.success(result.getRecords(), (int) result.getTotal());
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:country:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:country:list')")
|
||||
@ApiOperation("查询国家列表")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SysRobotCountry country) {
|
||||
@@ -38,14 +38,14 @@ public class SysRobotCountryController {
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:country:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:country:query')")
|
||||
@ApiOperation("查询国家详情")
|
||||
@GetMapping("/{id}")
|
||||
public AjaxResult getInfo(@PathVariable Long id) {
|
||||
return AjaxResult.success(countryService.getById(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:country:add')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:country:add')")
|
||||
@ApiOperation("新增国家")
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SysRobotCountry country) {
|
||||
@@ -55,7 +55,7 @@ public class SysRobotCountryController {
|
||||
return toAjax(countryService.save(country));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:country:edit')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:country:edit')")
|
||||
@ApiOperation("修改国家")
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SysRobotCountry country) {
|
||||
@@ -65,7 +65,7 @@ public class SysRobotCountryController {
|
||||
return toAjax(countryService.updateById(country));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:country:remove')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:country:remove')")
|
||||
@ApiOperation("删除国家")
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
|
||||
@@ -22,7 +22,7 @@ public class SysRobotModelController {
|
||||
@Autowired
|
||||
private ISysRobotModelService modelService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:model:list')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:model:list')")
|
||||
@ApiOperation("分页查询机器人型号")
|
||||
@GetMapping("/page")
|
||||
public AjaxResult page(Page<SysRobotModel> page, SysRobotModel model) {
|
||||
@@ -30,7 +30,7 @@ public class SysRobotModelController {
|
||||
return AjaxResult.success(result.getRecords(), (int) result.getTotal());
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:model:list')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:model:list')")
|
||||
@ApiOperation("查询机器人型号列表")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SysRobotModel model) {
|
||||
@@ -38,14 +38,14 @@ public class SysRobotModelController {
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:model:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:model:query')")
|
||||
@ApiOperation("查询机器人型号详情")
|
||||
@GetMapping("/{id}")
|
||||
public AjaxResult getInfo(@PathVariable Long id) {
|
||||
return AjaxResult.success(modelService.getById(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:model:add')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:model:add')")
|
||||
@ApiOperation("新增机器人型号")
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SysRobotModel model) {
|
||||
@@ -55,7 +55,7 @@ public class SysRobotModelController {
|
||||
return toAjax(modelService.save(model));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:model:edit')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:model:edit')")
|
||||
@ApiOperation("修改机器人型号")
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SysRobotModel model) {
|
||||
@@ -65,7 +65,7 @@ public class SysRobotModelController {
|
||||
return toAjax(modelService.updateById(model));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:model:remove')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:model:remove')")
|
||||
@ApiOperation("删除机器人型号")
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
|
||||
@@ -22,7 +22,7 @@ public class SysRobotProvinceController {
|
||||
@Autowired
|
||||
private ISysRobotProvinceService provinceService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:province:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:province:list')")
|
||||
@ApiOperation("分页查询省份")
|
||||
@GetMapping("/page")
|
||||
public AjaxResult page(Page<SysRobotProvince> page, SysRobotProvince province) {
|
||||
@@ -30,7 +30,7 @@ public class SysRobotProvinceController {
|
||||
return AjaxResult.success(result.getRecords(), (int) result.getTotal());
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:province:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:province:list')")
|
||||
@ApiOperation("查询省份列表")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SysRobotProvince province) {
|
||||
@@ -38,14 +38,14 @@ public class SysRobotProvinceController {
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:province:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:province:query')")
|
||||
@ApiOperation("查询省份详情")
|
||||
@GetMapping("/{id}")
|
||||
public AjaxResult getInfo(@PathVariable Long id) {
|
||||
return AjaxResult.success(provinceService.getById(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:province:add')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:province:add')")
|
||||
@ApiOperation("新增省份")
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SysRobotProvince province) {
|
||||
@@ -55,7 +55,7 @@ public class SysRobotProvinceController {
|
||||
return toAjax(provinceService.save(province));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:province:edit')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:province:edit')")
|
||||
@ApiOperation("修改省份")
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SysRobotProvince province) {
|
||||
@@ -65,7 +65,7 @@ public class SysRobotProvinceController {
|
||||
return toAjax(provinceService.updateById(province));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:province:remove')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:province:remove')")
|
||||
@ApiOperation("删除省份")
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
|
||||
@@ -22,7 +22,7 @@ public class SysRobotTypeController {
|
||||
@Autowired
|
||||
private ISysRobotTypeService typeService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:type:list')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:type:list')")
|
||||
@ApiOperation("分页查询机器人类型")
|
||||
@GetMapping("/page")
|
||||
public AjaxResult page(Page<SysRobotType> page, SysRobotType type) {
|
||||
@@ -30,7 +30,7 @@ public class SysRobotTypeController {
|
||||
return AjaxResult.success(result.getRecords(), (int) result.getTotal());
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:type:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:type:list')")
|
||||
@ApiOperation("查询机器人类型列表")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SysRobotType type) {
|
||||
@@ -38,14 +38,14 @@ public class SysRobotTypeController {
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:type:query')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:type:query')")
|
||||
@ApiOperation("查询机器人类型详情")
|
||||
@GetMapping("/{id}")
|
||||
public AjaxResult getInfo(@PathVariable Long id) {
|
||||
return AjaxResult.success(typeService.getById(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:type:add')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:type:add')")
|
||||
@ApiOperation("新增机器人类型")
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody SysRobotType type) {
|
||||
@@ -55,7 +55,7 @@ public class SysRobotTypeController {
|
||||
return toAjax(typeService.save(type));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:type:edit')")
|
||||
//@PreAuthorize("@ss.hasPermi('system:robot:type:edit')")
|
||||
@ApiOperation("修改机器人类型")
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody SysRobotType type) {
|
||||
@@ -65,7 +65,7 @@ public class SysRobotTypeController {
|
||||
return toAjax(typeService.updateById(type));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:robot:type:remove')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:robot:type:remove')")
|
||||
@ApiOperation("删除机器人类型")
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
|
||||
Reference in New Issue
Block a user