解决主从服务器用户信息同步的通讯问题

2023-10-22 11:25:58 +08:00
parent d0ce6c7312
commit e515cffde0
141 changed files with 349 additions and 1223 deletions
@@ -32,7 +32,6 @@ public class BcAgentController extends BaseController {
    private BcAgentService bcAgentService;
    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
    @OperationLog
    @ApiOperation("分页查询代报餐管理")
    @GetMapping("/page")
    public ApiResult<PageResult<BcAgent>> page(BcAgentParam param) {
@@ -41,7 +40,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
    @OperationLog
    @ApiOperation("查询全部代报餐管理")
    @GetMapping()
    public ApiResult<List<BcAgent>> list(BcAgentParam param) {
@@ -50,7 +48,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
    @OperationLog
    @ApiOperation("根据id查询代报餐管理")
    @GetMapping("/{id}")
    public ApiResult<BcAgent> get(@PathVariable("id") Integer id) {
@@ -59,7 +56,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:save')")
    @OperationLog
    @ApiOperation("添加代报餐管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcAgent bcAgent) {
@@ -70,7 +66,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
    @OperationLog
    @ApiOperation("修改代报餐管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcAgent bcAgent) {
@@ -81,7 +76,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
    @OperationLog
    @ApiOperation("删除代报餐管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -92,7 +86,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:save')")
    @OperationLog
    @ApiOperation("批量添加代报餐管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcAgent> list) {
@@ -103,7 +96,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
    @OperationLog
    @ApiOperation("批量修改代报餐管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcAgent> batchParam) {
@@ -114,7 +106,6 @@ public class BcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
    @OperationLog
    @ApiOperation("批量删除代报餐管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class BcCookbookController extends BaseController {
    private BcCookbookService bcCookbookService;
    @PreAuthorize("hasAuthority('apps:bcCookbook:list')")
    @OperationLog
    @ApiOperation("分页查询常用菜谱")
    @GetMapping("/page")
    public ApiResult<PageResult<BcCookbook>> page(BcCookbookParam param) {
@@ -44,7 +43,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:list')")
    @OperationLog
    @ApiOperation("查询全部常用菜谱")
    @GetMapping()
    public ApiResult<List<BcCookbook>> list(BcCookbookParam param) {
@@ -56,7 +54,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:list')")
    @OperationLog
    @ApiOperation("根据id查询常用菜谱")
    @GetMapping("/{id}")
    public ApiResult<BcCookbook> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:save')")
    @OperationLog
    @ApiOperation("添加常用菜谱")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcCookbook bcCookbook) {
@@ -82,7 +78,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:update')")
    @OperationLog
    @ApiOperation("修改常用菜谱")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcCookbook bcCookbook) {
@@ -93,7 +88,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:remove')")
    @OperationLog
    @ApiOperation("删除常用菜谱")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -104,7 +98,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:save')")
    @OperationLog
    @ApiOperation("批量添加常用菜谱")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcCookbook> list) {
@@ -115,7 +108,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:update')")
    @OperationLog
    @ApiOperation("批量修改常用菜谱")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcCookbook> batchParam) {
@@ -126,7 +118,6 @@ public class BcCookbookController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcCookbook:remove')")
    @OperationLog
    @ApiOperation("批量删除常用菜谱")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -35,7 +35,6 @@ public class BcEquipmentController extends BaseController {
    private BcUtil bcUtil;
    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
    @OperationLog
    @ApiOperation("分页查询报餐设备管理")
    @GetMapping("/page")
    public ApiResult<PageResult<BcEquipment>> page(BcEquipmentParam param) {
@@ -47,7 +46,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
    @OperationLog
    @ApiOperation("查询全部报餐设备管理")
    @GetMapping()
    public ApiResult<List<BcEquipment>> list(BcEquipmentParam param) {
@@ -59,7 +57,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
    @OperationLog
    @ApiOperation("根据id查询报餐设备管理")
    @GetMapping("/{id}")
    public ApiResult<BcEquipment> get(@PathVariable("id") Integer id) {
@@ -69,7 +66,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
    @OperationLog
    @ApiOperation("添加报餐设备管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcEquipment bcEquipment) {
@@ -86,7 +82,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
    @OperationLog
    @ApiOperation("修改报餐设备管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcEquipment bcEquipment) {
@@ -97,7 +92,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
    @OperationLog
    @ApiOperation("删除报餐设备管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -108,7 +102,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:save')")
    @OperationLog
    @ApiOperation("批量添加报餐设备管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcEquipment> list) {
@@ -119,7 +112,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:update')")
    @OperationLog
    @ApiOperation("批量修改报餐设备管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcEquipment> batchParam) {
@@ -130,7 +122,6 @@ public class BcEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcEquipment:remove')")
    @OperationLog
    @ApiOperation("批量删除报餐设备管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -56,7 +56,6 @@ public class BcExportController extends BaseController {
    private UserService userService;
    @PreAuthorize("hasAuthority('apps:bcExport:list')")
    @OperationLog
    @ApiOperation("分页查询报餐统计导出")
    @GetMapping("/page")
    public ApiResult<PageResult<BcExport>> page(BcExportParam param) {
@@ -240,7 +239,6 @@ public class BcExportController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcExport:list')")
    @OperationLog
    @ApiOperation("根据id查询报餐统计导出")
    @GetMapping("/{id}")
    public ApiResult<BcExport> get(@PathVariable("id") Integer id) {
@@ -250,7 +248,6 @@ public class BcExportController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcExport:save')")
    @OperationLog
    @ApiOperation("添加报餐统计导出")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcExport bcExport) {
@@ -266,7 +263,6 @@ public class BcExportController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcExport:update')")
    @OperationLog
    @ApiOperation("修改报餐统计导出")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcExport bcExport) {
@@ -277,7 +273,6 @@ public class BcExportController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcExport:remove')")
    @OperationLog
    @ApiOperation("删除报餐统计导出")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -288,7 +283,6 @@ public class BcExportController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcExport:save')")
    @OperationLog
    @ApiOperation("批量添加报餐统计导出")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcExport> list) {
@@ -299,7 +293,6 @@ public class BcExportController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcExport:update')")
    @OperationLog
    @ApiOperation("批量修改报餐统计导出")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcExport> batchParam) {
@@ -310,7 +303,6 @@ public class BcExportController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcExport:remove')")
    @OperationLog
    @ApiOperation("批量删除报餐统计导出")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -189,7 +189,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:list')")
    @OperationLog
    @ApiOperation("分页查询发布菜品明细")
    @GetMapping("/page")
    public ApiResult<PageResult<BcFood>> page(BcFoodParam param) {
@@ -198,7 +197,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:list')")
    @OperationLog
    @ApiOperation("查询全部发布菜品明细")
    @GetMapping()
    public ApiResult<List<BcFood>> list(BcFoodParam param) {
@@ -207,7 +205,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:list')")
    @OperationLog
    @ApiOperation("根据id查询发布菜品明细")
    @GetMapping("/{id}")
    public ApiResult<BcFood> get(@PathVariable("id") Integer id) {
@@ -216,7 +213,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:save')")
    @OperationLog
    @ApiOperation("添加发布菜品明细")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcFood bcFood) {
@@ -232,7 +228,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:update')")
    @OperationLog
    @ApiOperation("修改发布菜品明细")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcFood bcFood) {
@@ -243,7 +238,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:remove')")
    @OperationLog
    @ApiOperation("删除发布菜品明细")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -254,7 +248,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:save')")
    @OperationLog
    @ApiOperation("批量添加发布菜品明细")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcFood> list) {
@@ -265,7 +258,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:update')")
    @OperationLog
    @ApiOperation("批量修改发布菜品明细")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcFood> batchParam) {
@@ -276,7 +268,6 @@ public class BcFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcFood:remove')")
    @OperationLog
    @ApiOperation("批量删除发布菜品明细")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -35,7 +35,6 @@ public class BcPlanController extends BaseController {
    private BcPlanService bcPlanService;
    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
    @OperationLog
    @ApiOperation("分页查询菜品发布管理")
    @GetMapping("/page")
    public ApiResult<PageResult<BcPlan>> page(BcPlanParam param) {
@@ -44,7 +43,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
    @OperationLog
    @ApiOperation("查询全部菜品发布管理")
    @GetMapping()
    public ApiResult<List<BcPlan>> list(BcPlanParam param) {
@@ -53,7 +51,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
    @OperationLog
    @ApiOperation("根据id查询菜品发布管理")
    @GetMapping("/{id}")
    public ApiResult<BcPlan> get(@PathVariable("id") Integer id) {
@@ -62,7 +59,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:save')")
    @OperationLog
    @ApiOperation("添加菜品发布管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcPlan bcPlan) {
@@ -82,7 +78,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:update')")
    @OperationLog
    @ApiOperation("修改菜品发布管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcPlan bcPlan) {
@@ -98,7 +93,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:remove')")
    @OperationLog
    @ApiOperation("删除菜品发布管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -109,7 +103,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:save')")
    @OperationLog
    @ApiOperation("批量添加菜品发布管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcPlan> list) {
@@ -120,7 +113,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:update')")
    @OperationLog
    @ApiOperation("批量修改菜品发布管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcPlan> batchParam) {
@@ -131,7 +123,6 @@ public class BcPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcPlan:remove')")
    @OperationLog
    @ApiOperation("批量删除菜品发布管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -36,7 +36,6 @@ public class BcTemporaryController extends BaseController {
    private BcTemporaryService bcTemporaryService;
    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
    @OperationLog
    @ApiOperation("分页查询临时报餐管理")
    @GetMapping("/page")
    public ApiResult<PageResult<BcTemporary>> page(BcTemporaryParam param) {
@@ -45,7 +44,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
    @OperationLog
    @ApiOperation("查询全部临时报餐管理")
    @GetMapping()
    public ApiResult<List<BcTemporary>> list(BcTemporaryParam param) {
@@ -54,7 +52,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
    @OperationLog
    @ApiOperation("根据id查询临时报餐管理")
    @GetMapping("/{id}")
    public ApiResult<BcTemporary> get(@PathVariable("id") Integer id) {
@@ -64,7 +61,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
    @OperationLog
    @ApiOperation("添加临时报餐管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcTemporary bcTemporary) {
@@ -77,7 +73,6 @@ public class BcTemporaryController extends BaseController {
    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
    @OperationLog
    @ApiOperation("申请临时报餐")
    @PostMapping("/apply")
    public ApiResult<?> apply(@RequestBody BcTemporary bcTemporary) {
@@ -99,7 +94,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
    @OperationLog
    @ApiOperation("修改临时报餐管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcTemporary bcTemporary) {
@@ -112,7 +106,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
    @OperationLog
    @ApiOperation("删除临时报餐管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -123,7 +116,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
    @OperationLog
    @ApiOperation("批量添加临时报餐管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcTemporary> list) {
@@ -134,7 +126,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
    @OperationLog
    @ApiOperation("批量修改临时报餐管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcTemporary> batchParam) {
@@ -145,7 +136,6 @@ public class BcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
    @OperationLog
    @ApiOperation("批量删除临时报餐管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class CashierController extends BaseController {
    private CashierService cashierService;
    @PreAuthorize("hasAuthority('apps:cashier:list')")
    @OperationLog
    @ApiOperation("分页查询海牛收银台记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Cashier>> page(CashierParam param) {
@@ -44,7 +43,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:list')")
    @OperationLog
    @ApiOperation("查询全部海牛收银台记录表")
    @GetMapping()
    public ApiResult<List<Cashier>> list(CashierParam param) {
@@ -56,7 +54,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:list')")
    @OperationLog
    @ApiOperation("根据id查询海牛收银台记录表")
    @GetMapping("/{id}")
    public ApiResult<Cashier> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:save')")
    @OperationLog
    @ApiOperation("添加海牛收银台记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Cashier cashier) {
@@ -80,7 +76,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:update')")
    @OperationLog
    @ApiOperation("修改海牛收银台记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Cashier cashier) {
@@ -91,7 +86,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:remove')")
    @OperationLog
    @ApiOperation("删除海牛收银台记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -102,7 +96,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:save')")
    @OperationLog
    @ApiOperation("批量添加海牛收银台记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Cashier> list) {
@@ -113,7 +106,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:update')")
    @OperationLog
    @ApiOperation("批量修改海牛收银台记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Cashier> batchParam) {
@@ -124,7 +116,6 @@ public class CashierController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:cashier:remove')")
    @OperationLog
    @ApiOperation("批量删除海牛收银台记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class EquipmentAlarmController extends BaseController {
    private EquipmentAlarmService equipmentAlarmService;
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')")
    @OperationLog
    @ApiOperation("分页查询故障报警记录")
    @GetMapping("/page")
    public ApiResult<PageResult<EquipmentAlarm>> page(EquipmentAlarmParam param) {
@@ -44,7 +43,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')")
    @OperationLog
    @ApiOperation("查询全部故障报警记录")
    @GetMapping()
    public ApiResult<List<EquipmentAlarm>> list(EquipmentAlarmParam param) {
@@ -56,7 +54,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')")
    @OperationLog
    @ApiOperation("根据id查询故障报警记录")
    @GetMapping("/{id}")
    public ApiResult<EquipmentAlarm> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:save')")
    @OperationLog
    @ApiOperation("添加故障报警记录")
    @PostMapping()
    public ApiResult<?> save(@RequestBody EquipmentAlarm equipmentAlarm) {
@@ -83,7 +79,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:update')")
    @OperationLog
    @ApiOperation("修改故障报警记录")
    @PutMapping()
    public ApiResult<?> update(@RequestBody EquipmentAlarm equipmentAlarm) {
@@ -94,7 +89,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:remove')")
    @OperationLog
    @ApiOperation("删除故障报警记录")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,7 +99,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:save')")
    @OperationLog
    @ApiOperation("批量添加故障报警记录")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<EquipmentAlarm> list) {
@@ -116,7 +109,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:update')")
    @OperationLog
    @ApiOperation("批量修改故障报警记录")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentAlarm> batchParam) {
@@ -127,7 +119,6 @@ public class EquipmentAlarmController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentAlarm:remove')")
    @OperationLog
    @ApiOperation("批量删除故障报警记录")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -55,7 +55,6 @@ public class EquipmentController extends BaseController {
    private EquipmentRecordService equipmentRecordService;
    @PreAuthorize("hasAuthority('apps:equipment:list')")
    @OperationLog
    @ApiOperation("分页查询设备管理")
    @GetMapping("/page")
    public ApiResult<PageResult<Equipment>> page(EquipmentParam param) {
@@ -67,7 +66,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:list')")
    @OperationLog
    @ApiOperation("查询全部设备管理")
    @GetMapping()
    public ApiResult<List<Equipment>> list(EquipmentParam param) {
@@ -79,7 +77,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:list')")
    @OperationLog
    @ApiOperation("根据id查询设备管理")
    @GetMapping("/{id}")
    public ApiResult<Equipment> get(@PathVariable("id") Integer id) {
@@ -89,7 +86,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:save')")
    @OperationLog
    @ApiOperation("添加设备管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Equipment equipment) throws AlipayApiException {
@@ -113,7 +109,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:update')")
    @OperationLog
    @ApiOperation("修改设备管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Equipment equipment) throws AlipayApiException {
@@ -128,7 +123,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:update')")
    @OperationLog
    @ApiOperation("绑定设备")
    @PutMapping("/bind")
    public ApiResult<?> bindEquipment(@RequestBody Equipment equipment) {
@@ -167,7 +161,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:remove')")
    @OperationLog
    @ApiOperation("删除设备管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -178,7 +171,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:save')")
    @OperationLog
    @ApiOperation("批量添加设备管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Equipment> list) {
@@ -189,7 +181,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:update')")
    @OperationLog
    @ApiOperation("批量修改设备管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Equipment> batchParam) {
@@ -200,7 +191,6 @@ public class EquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:remove')")
    @OperationLog
    @ApiOperation("批量删除设备管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class EquipmentFaultController extends BaseController {
    private EquipmentFaultService equipmentFaultService;
    @PreAuthorize("hasAuthority('apps:equipmentFault:list')")
    @OperationLog
    @ApiOperation("分页查询故障电池")
    @GetMapping("/page")
    public ApiResult<PageResult<EquipmentFault>> page(EquipmentFaultParam param) {
@@ -44,7 +43,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:list')")
    @OperationLog
    @ApiOperation("查询全部故障电池")
    @GetMapping()
    public ApiResult<List<EquipmentFault>> list(EquipmentFaultParam param) {
@@ -56,7 +54,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:list')")
    @OperationLog
    @ApiOperation("根据id查询故障电池")
    @GetMapping("/{id}")
    public ApiResult<EquipmentFault> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:save')")
    @OperationLog
    @ApiOperation("添加故障电池")
    @PostMapping()
    public ApiResult<?> save(@RequestBody EquipmentFault equipmentFault) {
@@ -83,7 +79,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:update')")
    @OperationLog
    @ApiOperation("修改故障电池")
    @PutMapping()
    public ApiResult<?> update(@RequestBody EquipmentFault equipmentFault) {
@@ -94,7 +89,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:remove')")
    @OperationLog
    @ApiOperation("删除故障电池")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,7 +99,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:save')")
    @OperationLog
    @ApiOperation("批量添加故障电池")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<EquipmentFault> list) {
@@ -116,7 +109,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:update')")
    @OperationLog
    @ApiOperation("批量修改故障电池")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentFault> batchParam) {
@@ -127,7 +119,6 @@ public class EquipmentFaultController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentFault:remove')")
    @OperationLog
    @ApiOperation("批量删除故障电池")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -34,7 +34,6 @@ public class EquipmentGoodsController extends BaseController {
    private EquipmentGoodsService equipmentGoodsService;
    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
    @OperationLog
    @ApiOperation("分页查询电池管理记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<EquipmentGoods>> page(EquipmentGoodsParam param) {
@@ -43,7 +42,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
    @OperationLog
    @ApiOperation("查询全部电池管理记录表")
    @GetMapping()
    public ApiResult<List<EquipmentGoods>> list(EquipmentGoodsParam param) {
@@ -52,7 +50,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
    @OperationLog
    @ApiOperation("根据id查询电池管理记录表")
    @GetMapping("/{id}")
    public ApiResult<EquipmentGoods> get(@PathVariable("id") Integer id) {
@@ -61,7 +58,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:save')")
    @OperationLog
    @ApiOperation("添加电池管理记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody EquipmentGoods equipmentGoods) {
@@ -73,7 +69,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:update')")
    @OperationLog
    @ApiOperation("修改电池管理记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody EquipmentGoods equipmentGoods) {
@@ -84,7 +79,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:remove')")
    @OperationLog
    @ApiOperation("删除电池管理记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -95,7 +89,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:save')")
    @OperationLog
    @ApiOperation("批量添加电池管理记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<EquipmentGoods> list) {
@@ -106,7 +99,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:update')")
    @OperationLog
    @ApiOperation("批量修改电池管理记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentGoods> batchParam) {
@@ -117,7 +109,6 @@ public class EquipmentGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentGoods:remove')")
    @OperationLog
    @ApiOperation("批量删除电池管理记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class EquipmentOrderController extends BaseController {
    private EquipmentOrderService equipmentOrderService;
    @PreAuthorize("hasAuthority('apps:equipmentOrder:list')")
    @OperationLog
    @ApiOperation("分页查询订单记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<EquipmentOrder>> page(EquipmentOrderParam param) {
@@ -44,7 +43,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:list')")
    @OperationLog
    @ApiOperation("查询全部订单记录表")
    @GetMapping()
    public ApiResult<List<EquipmentOrder>> list(EquipmentOrderParam param) {
@@ -56,7 +54,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:list')")
    @OperationLog
    @ApiOperation("根据id查询订单记录表")
    @GetMapping("/{id}")
    public ApiResult<EquipmentOrder> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:save')")
    @OperationLog
    @ApiOperation("添加订单记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody EquipmentOrder equipmentOrder) {
@@ -83,7 +79,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:update')")
    @OperationLog
    @ApiOperation("修改订单记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody EquipmentOrder equipmentOrder) {
@@ -94,7 +89,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:remove')")
    @OperationLog
    @ApiOperation("删除订单记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,7 +99,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:save')")
    @OperationLog
    @ApiOperation("批量添加订单记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<EquipmentOrder> list) {
@@ -116,7 +109,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:update')")
    @OperationLog
    @ApiOperation("批量修改订单记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentOrder> batchParam) {
@@ -127,7 +119,6 @@ public class EquipmentOrderController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrder:remove')")
    @OperationLog
    @ApiOperation("批量删除订单记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    private EquipmentOrderGoodsService equipmentOrderGoodsService;
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')")
    @OperationLog
    @ApiOperation("分页查询电池管理记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<EquipmentOrderGoods>> page(EquipmentOrderGoodsParam param) {
@@ -44,7 +43,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')")
    @OperationLog
    @ApiOperation("查询全部电池管理记录表")
    @GetMapping()
    public ApiResult<List<EquipmentOrderGoods>> list(EquipmentOrderGoodsParam param) {
@@ -64,7 +62,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')")
    @OperationLog
    @ApiOperation("根据id查询电池管理记录表")
    @GetMapping("/{id}")
    public ApiResult<EquipmentOrderGoods> get(@PathVariable("id") Integer id) {
@@ -74,7 +71,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:save')")
    @OperationLog
    @ApiOperation("添加电池管理记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody EquipmentOrderGoods equipmentOrderGoods) {
@@ -91,7 +87,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:update')")
    @OperationLog
    @ApiOperation("修改电池管理记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody EquipmentOrderGoods equipmentOrderGoods) {
@@ -102,7 +97,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:remove')")
    @OperationLog
    @ApiOperation("删除电池管理记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -113,7 +107,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:save')")
    @OperationLog
    @ApiOperation("批量添加电池管理记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<EquipmentOrderGoods> list) {
@@ -124,7 +117,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:update')")
    @OperationLog
    @ApiOperation("批量修改电池管理记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentOrderGoods> batchParam) {
@@ -135,7 +127,6 @@ public class EquipmentOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:remove')")
    @OperationLog
    @ApiOperation("批量删除电池管理记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class EquipmentRecordController extends BaseController {
    private EquipmentRecordService equipmentRecordService;
    @PreAuthorize("hasAuthority('apps:equipmentRecord:list')")
    @OperationLog
    @ApiOperation("分页查询前世今生")
    @GetMapping("/page")
    public ApiResult<PageResult<EquipmentRecord>> page(EquipmentRecordParam param) {
@@ -48,7 +47,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:list')")
    @OperationLog
    @ApiOperation("查询全部前世今生")
    @GetMapping()
    public ApiResult<List<EquipmentRecord>> list(EquipmentRecordParam param) {
@@ -60,7 +58,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:list')")
    @OperationLog
    @ApiOperation("根据id查询前世今生")
    @GetMapping("/{id}")
    public ApiResult<EquipmentRecord> get(@PathVariable("id") Integer id) {
@@ -70,7 +67,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:save')")
    @OperationLog
    @ApiOperation("添加前世今生")
    @PostMapping()
    public ApiResult<?> save(@RequestBody EquipmentRecord equipmentRecord) {
@@ -87,7 +83,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:update')")
    @OperationLog
    @ApiOperation("修改前世今生")
    @PutMapping()
    public ApiResult<?> update(@RequestBody EquipmentRecord equipmentRecord) {
@@ -98,7 +93,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:remove')")
    @OperationLog
    @ApiOperation("删除前世今生")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -109,7 +103,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:save')")
    @OperationLog
    @ApiOperation("批量添加前世今生")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<EquipmentRecord> list) {
@@ -120,7 +113,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:update')")
    @OperationLog
    @ApiOperation("批量修改前世今生")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentRecord> batchParam) {
@@ -131,7 +123,6 @@ public class EquipmentRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipmentRecord:remove')")
    @OperationLog
    @ApiOperation("批量删除前世今生")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class HualalaCardBenefitsController extends BaseController {
    private HualalaCardBenefitsService hualalaCardBenefitsService;
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')")
    @OperationLog
    @ApiOperation("分页查询会员权益")
    @GetMapping("/page")
    public ApiResult<PageResult<HualalaCardBenefits>> page(HualalaCardBenefitsParam param) {
@@ -44,7 +43,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')")
    @OperationLog
    @ApiOperation("查询全部会员权益")
    @GetMapping()
    public ApiResult<List<HualalaCardBenefits>> list(HualalaCardBenefitsParam param) {
@@ -56,7 +54,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')")
    @OperationLog
    @ApiOperation("根据id查询会员权益")
    @GetMapping("/{id}")
    public ApiResult<HualalaCardBenefits> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:save')")
    @OperationLog
    @ApiOperation("添加会员权益")
    @PostMapping()
    public ApiResult<?> save(@RequestBody HualalaCardBenefits hualalaCardBenefits) {
@@ -77,7 +73,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:update')")
    @OperationLog
    @ApiOperation("修改会员权益")
    @PutMapping()
    public ApiResult<?> update(@RequestBody HualalaCardBenefits hualalaCardBenefits) {
@@ -88,7 +83,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:remove')")
    @OperationLog
    @ApiOperation("删除会员权益")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -99,7 +93,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:save')")
    @OperationLog
    @ApiOperation("批量添加会员权益")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<HualalaCardBenefits> list) {
@@ -110,7 +103,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:update')")
    @OperationLog
    @ApiOperation("批量修改会员权益")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCardBenefits> batchParam) {
@@ -121,7 +113,6 @@ public class HualalaCardBenefitsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:remove')")
    @OperationLog
    @ApiOperation("批量删除会员权益")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class HualalaCardController extends BaseController {
    private HualalaCardService hualalaCardService;
    @PreAuthorize("hasAuthority('apps:hualalaCard:list')")
    @OperationLog
    @ApiOperation("分页查询")
    @GetMapping("/page")
    public ApiResult<PageResult<HualalaCard>> page(HualalaCardParam param) {
@@ -44,7 +43,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:list')")
    @OperationLog
    @ApiOperation("查询全部")
    @GetMapping()
    public ApiResult<List<HualalaCard>> list(HualalaCardParam param) {
@@ -56,7 +54,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:list')")
    @OperationLog
    @ApiOperation("根据id查询")
    @GetMapping("/{id}")
    public ApiResult<HualalaCard> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:save')")
    @OperationLog
    @ApiOperation("添加")
    @PostMapping()
    public ApiResult<?> save(@RequestBody HualalaCard hualalaCard) {
@@ -83,7 +79,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:update')")
    @OperationLog
    @ApiOperation("修改")
    @PutMapping()
    public ApiResult<?> update(@RequestBody HualalaCard hualalaCard) {
@@ -94,7 +89,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:remove')")
    @OperationLog
    @ApiOperation("删除")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,7 +99,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:save')")
    @OperationLog
    @ApiOperation("批量添加")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<HualalaCard> list) {
@@ -116,7 +109,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:update')")
    @OperationLog
    @ApiOperation("批量修改")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCard> batchParam) {
@@ -127,7 +119,6 @@ public class HualalaCardController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCard:remove')")
    @OperationLog
    @ApiOperation("批量删除")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class HualalaCartFoodController extends BaseController {
    private HualalaCartFoodService hualalaCartFoodService;
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')")
    @OperationLog
    @ApiOperation("分页查询购物车商品")
    @GetMapping("/page")
    public ApiResult<PageResult<HualalaCartFood>> page(HualalaCartFoodParam param) {
@@ -44,7 +43,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')")
    @OperationLog
    @ApiOperation("查询全部购物车商品")
    @GetMapping()
    public ApiResult<List<HualalaCartFood>> list(HualalaCartFoodParam param) {
@@ -56,7 +54,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')")
    @OperationLog
    @ApiOperation("根据id查询购物车商品")
    @GetMapping("/{id}")
    public ApiResult<HualalaCartFood> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:save')")
    @OperationLog
    @ApiOperation("添加购物车商品")
    @PostMapping()
    public ApiResult<?> save(@RequestBody HualalaCartFood hualalaCartFood) {
@@ -77,7 +73,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:update')")
    @OperationLog
    @ApiOperation("修改购物车商品")
    @PutMapping()
    public ApiResult<?> update(@RequestBody HualalaCartFood hualalaCartFood) {
@@ -88,7 +83,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:remove')")
    @OperationLog
    @ApiOperation("删除购物车商品")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -99,7 +93,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:save')")
    @OperationLog
    @ApiOperation("批量添加购物车商品")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<HualalaCartFood> list) {
@@ -110,7 +103,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:update')")
    @OperationLog
    @ApiOperation("批量修改购物车商品")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCartFood> batchParam) {
@@ -121,7 +113,6 @@ public class HualalaCartFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaCartFood:remove')")
    @OperationLog
    @ApiOperation("批量删除购物车商品")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class HualalaFoodCategoryController extends BaseController {
    private HualalaFoodCategoryService hualalaFoodCategoryService;
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')")
    @OperationLog
    @ApiOperation("分页查询菜品分类")
    @GetMapping("/page")
    public ApiResult<PageResult<HualalaFoodCategory>> page(HualalaFoodCategoryParam param) {
@@ -44,7 +43,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')")
    @OperationLog
    @ApiOperation("查询全部菜品分类")
    @GetMapping()
    public ApiResult<List<HualalaFoodCategory>> list(HualalaFoodCategoryParam param) {
@@ -56,7 +54,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')")
    @OperationLog
    @ApiOperation("根据id查询菜品分类")
    @GetMapping("/{id}")
    public ApiResult<HualalaFoodCategory> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:save')")
    @OperationLog
    @ApiOperation("添加菜品分类")
    @PostMapping()
    public ApiResult<?> save(@RequestBody HualalaFoodCategory hualalaFoodCategory) {
@@ -77,7 +73,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:update')")
    @OperationLog
    @ApiOperation("修改菜品分类")
    @PutMapping()
    public ApiResult<?> update(@RequestBody HualalaFoodCategory hualalaFoodCategory) {
@@ -88,7 +83,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:remove')")
    @OperationLog
    @ApiOperation("删除菜品分类")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -99,7 +93,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:save')")
    @OperationLog
    @ApiOperation("批量添加菜品分类")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<HualalaFoodCategory> list) {
@@ -110,7 +103,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:update')")
    @OperationLog
    @ApiOperation("批量修改菜品分类")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaFoodCategory> batchParam) {
@@ -121,7 +113,6 @@ public class HualalaFoodCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:remove')")
    @OperationLog
    @ApiOperation("批量删除菜品分类")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class HualalaFoodController extends BaseController {
    private HualalaFoodService hualalaFoodService;
    @PreAuthorize("hasAuthority('apps:hualalaFood:list')")
    @OperationLog
    @ApiOperation("分页查询菜品分类")
    @GetMapping("/page")
    public ApiResult<PageResult<HualalaFood>> page(HualalaFoodParam param) {
@@ -44,7 +43,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:list')")
    @OperationLog
    @ApiOperation("查询全部菜品分类")
    @GetMapping()
    public ApiResult<List<HualalaFood>> list(HualalaFoodParam param) {
@@ -56,7 +54,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:list')")
    @OperationLog
    @ApiOperation("根据id查询菜品分类")
    @GetMapping("/{id}")
    public ApiResult<HualalaFood> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:save')")
    @OperationLog
    @ApiOperation("添加菜品分类")
    @PostMapping()
    public ApiResult<?> save(@RequestBody HualalaFood hualalaFood) {
@@ -77,7 +73,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:update')")
    @OperationLog
    @ApiOperation("修改菜品分类")
    @PutMapping()
    public ApiResult<?> update(@RequestBody HualalaFood hualalaFood) {
@@ -88,7 +83,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:remove')")
    @OperationLog
    @ApiOperation("删除菜品分类")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -99,7 +93,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:save')")
    @OperationLog
    @ApiOperation("批量添加菜品分类")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<HualalaFood> list) {
@@ -110,7 +103,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:update')")
    @OperationLog
    @ApiOperation("批量修改菜品分类")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaFood> batchParam) {
@@ -121,7 +113,6 @@ public class HualalaFoodController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaFood:remove')")
    @OperationLog
    @ApiOperation("批量删除菜品分类")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class HualalaShopController extends BaseController {
    private HualalaShopService hualalaShopService;
    @PreAuthorize("hasAuthority('apps:hualalaShop:list')")
    @OperationLog
    @ApiOperation("分页查询哗啦啦门店管理")
    @GetMapping("/page")
    public ApiResult<PageResult<HualalaShop>> page(HualalaShopParam param) {
@@ -44,7 +43,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:list')")
    @OperationLog
    @ApiOperation("查询全部哗啦啦门店管理")
    @GetMapping()
    public ApiResult<List<HualalaShop>> list(HualalaShopParam param) {
@@ -56,7 +54,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:list')")
    @OperationLog
    @ApiOperation("根据id查询哗啦啦门店管理")
    @GetMapping("/{id}")
    public ApiResult<HualalaShop> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:save')")
    @OperationLog
    @ApiOperation("添加哗啦啦门店管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody HualalaShop hualalaShop) {
@@ -77,7 +73,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:update')")
    @OperationLog
    @ApiOperation("修改哗啦啦门店管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody HualalaShop hualalaShop) {
@@ -88,7 +83,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:remove')")
    @OperationLog
    @ApiOperation("删除哗啦啦门店管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -99,7 +93,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:save')")
    @OperationLog
    @ApiOperation("批量添加哗啦啦门店管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<HualalaShop> list) {
@@ -110,7 +103,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:update')")
    @OperationLog
    @ApiOperation("批量修改哗啦啦门店管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaShop> batchParam) {
@@ -121,7 +113,6 @@ public class HualalaShopController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:hualalaShop:remove')")
    @OperationLog
    @ApiOperation("批量删除哗啦啦门店管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class LinkController extends BaseController {
    private LinkService linkService;
    @PreAuthorize("hasAuthority('apps:link:list')")
    @OperationLog
    @ApiOperation("分页查询常用链接推荐记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Link>> page(LinkParam param) {
@@ -44,7 +43,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:list')")
    @OperationLog
    @ApiOperation("查询全部常用链接推荐记录表")
    @GetMapping()
    public ApiResult<List<Link>> list(LinkParam param) {
@@ -56,7 +54,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:list')")
    @OperationLog
    @ApiOperation("根据id查询常用链接推荐记录表")
    @GetMapping("/{id}")
    public ApiResult<Link> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:save')")
    @OperationLog
    @ApiOperation("添加常用链接推荐记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Link link) {
@@ -83,7 +79,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:update')")
    @OperationLog
    @ApiOperation("修改常用链接推荐记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Link link) {
@@ -94,7 +89,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:remove')")
    @OperationLog
    @ApiOperation("删除常用链接推荐记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,7 +99,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:save')")
    @OperationLog
    @ApiOperation("批量添加常用链接推荐记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Link> list) {
@@ -116,7 +109,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:update')")
    @OperationLog
    @ApiOperation("批量修改常用链接推荐记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Link> batchParam) {
@@ -127,7 +119,6 @@ public class LinkController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:link:remove')")
    @OperationLog
    @ApiOperation("批量删除常用链接推荐记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -38,7 +38,6 @@ public class TestDataController extends BaseController {
    private TestDataService testDataService;
    @PreAuthorize("hasAuthority('apps:testData:list')")
    @OperationLog
    @ApiOperation("分页查询测试数据表")
    @GetMapping("/page")
    public ApiResult<PageResult<TestData>> page(TestDataParam param) {
@@ -50,7 +49,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:list')")
    @OperationLog
    @ApiOperation("查询全部测试数据表")
    @GetMapping()
    public ApiResult<List<TestData>> list(TestDataParam param) {
@@ -62,7 +60,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:list')")
    @OperationLog
    @ApiOperation("根据id查询测试数据表")
    @GetMapping("/{id}")
    public ApiResult<TestData> get(@PathVariable("id") Integer id) {
@@ -72,7 +69,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:save')")
    @OperationLog
    @ApiOperation("添加测试数据表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody TestData testData) {
@@ -83,7 +79,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:update')")
    @OperationLog
    @ApiOperation("修改测试数据表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody TestData testData) {
@@ -94,7 +89,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:remove')")
    @OperationLog
    @ApiOperation("删除测试数据表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,7 +99,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:save')")
    @OperationLog
    @ApiOperation("批量添加测试数据表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<TestData> list) {
@@ -116,7 +109,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:update')")
    @OperationLog
    @ApiOperation("批量修改测试数据表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<TestData> batchParam) {
@@ -127,7 +119,6 @@ public class TestDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:testData:remove')")
    @OperationLog
    @ApiOperation("批量删除测试数据表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -31,8 +31,6 @@ public class ArticleCategoryController extends BaseController {
    @Resource
    private ArticleCategoryService articleCategoryService;
    @PreAuthorize("hasAuthority('cms:articleCategory:list')")
    @OperationLog
    @ApiOperation("分页查询文章分类表")
    @GetMapping("/page")
    public ApiResult<PageResult<ArticleCategory>> page(ArticleCategoryParam param) {
@@ -44,8 +42,6 @@ public class ArticleCategoryController extends BaseController {
        //return success(articleCategoryService.pageRel(param));
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:list')")
    @OperationLog
    @ApiOperation("查询全部文章分类表")
    @GetMapping()
    public ApiResult<List<ArticleCategory>> list(ArticleCategoryParam param) {
@@ -58,7 +54,6 @@ public class ArticleCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:list')")
    @OperationLog
    @ApiOperation("根据id查询文章分类表")
    @GetMapping("/{id}")
    public ApiResult<ArticleCategory> get(@PathVariable("id") Integer id) {
@@ -67,8 +62,6 @@ public class ArticleCategoryController extends BaseController {
        //return success(articleCategoryService.getByIdRel(id));
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:save')")
    @OperationLog
    @ApiOperation("添加文章分类表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody ArticleCategory articleCategory) {
@@ -83,8 +76,6 @@ public class ArticleCategoryController extends BaseController {
        return fail("添加失败");
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:update')")
    @OperationLog
    @ApiOperation("修改文章分类表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody ArticleCategory articleCategory) {
@@ -94,8 +85,6 @@ public class ArticleCategoryController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:remove')")
    @OperationLog
    @ApiOperation("删除文章分类表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,8 +94,6 @@ public class ArticleCategoryController extends BaseController {
        return fail("删除失败");
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:save')")
    @OperationLog
    @ApiOperation("批量添加文章分类表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<ArticleCategory> list) {
@@ -116,8 +103,6 @@ public class ArticleCategoryController extends BaseController {
        return fail("添加失败");
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:update')")
    @OperationLog
    @ApiOperation("批量修改文章分类表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<ArticleCategory> batchParam) {
@@ -127,8 +112,6 @@ public class ArticleCategoryController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:articleCategory:remove')")
    @OperationLog
    @ApiOperation("批量删除文章分类表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -40,8 +40,6 @@ public class ArticleCommentController extends BaseController {
  private ClientCache clientCache;
    @PreAuthorize("hasAuthority('cms:articleComment:list')")
    @OperationLog
    @ApiOperation("获取未读评论数")
    @GetMapping("/unread")
    public ApiResult<Integer> page() {
@@ -49,8 +47,6 @@ public class ArticleCommentController extends BaseController {
        return success(articleCommentService.getUserUnReadCount(loginUser.getUserId()));
    }
    @PreAuthorize("hasAuthority('cms:articleComment:list')")
    @OperationLog
    @ApiOperation("分页查询文章评论表")
    @GetMapping("/page")
    public ApiResult<PageResult<ArticleComment>> page(ArticleCommentParam param) {
@@ -63,8 +59,6 @@ public class ArticleCommentController extends BaseController {
        return success(articleCommentService.pageRel(param));
    }
    @PreAuthorize("hasAuthority('cms:articleComment:list')")
    @OperationLog
    @ApiOperation("查询全部文章评论表")
    @GetMapping()
    public ApiResult<List<ArticleComment>> list(ArticleCommentParam param) {
@@ -72,8 +66,6 @@ public class ArticleCommentController extends BaseController {
        return success(articleCommentService.listRel(param));
    }
    @PreAuthorize("hasAuthority('cms:articleComment:list')")
    @OperationLog
    @ApiOperation("根据id查询文章评论表")
    @GetMapping("/{id}")
    public ApiResult<PageResult<Article>> get(@PathVariable("id") Integer id) {
@@ -87,8 +79,6 @@ public class ArticleCommentController extends BaseController {
        return success(result);
    }
    @PreAuthorize("hasAuthority('cms:articleComment:save')")
    @OperationLog
    @ApiOperation("添加文章评论表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody ArticleComment articleComment) {
@@ -112,8 +102,6 @@ public class ArticleCommentController extends BaseController {
        return fail("发表失败");
    }
    @PreAuthorize("hasAuthority('cms:articleComment:update')")
    @OperationLog
    @ApiOperation("修改文章评论表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody ArticleComment articleComment) {
@@ -123,8 +111,6 @@ public class ArticleCommentController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:articleComment:remove')")
    @OperationLog
    @ApiOperation("删除文章评论表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -134,8 +120,6 @@ public class ArticleCommentController extends BaseController {
        return fail("删除失败");
    }
    @PreAuthorize("hasAuthority('cms:articleComment:save')")
    @OperationLog
    @ApiOperation("批量添加文章评论表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<ArticleComment> list) {
@@ -145,8 +129,6 @@ public class ArticleCommentController extends BaseController {
        return fail("添加失败");
    }
    @PreAuthorize("hasAuthority('cms:articleComment:update')")
    @OperationLog
    @ApiOperation("批量修改文章评论表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<ArticleComment> batchParam) {
@@ -156,8 +138,6 @@ public class ArticleCommentController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:articleComment:remove')")
    @OperationLog
    @ApiOperation("批量删除文章评论表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -30,8 +30,6 @@ public class ArticleController extends BaseController {
    @Resource
    private ArticleService articleService;
    @PreAuthorize("hasAuthority('cms:article:list')")
    @OperationLog
    @ApiOperation("分页查询文章记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Article>> page(ArticleParam param) {
@@ -46,8 +44,6 @@ public class ArticleController extends BaseController {
        return success(articleService.pageRel(param));
    }
    @PreAuthorize("hasAuthority('cms:article:list')")
    @OperationLog
    @ApiOperation("查询全部文章记录表")
    @GetMapping()
    public ApiResult<List<Article>> list(ArticleParam param) {
@@ -55,8 +51,6 @@ public class ArticleController extends BaseController {
        return success(articleService.listRel(param));
    }
    @PreAuthorize("hasAuthority('cms:article:list')")
    @OperationLog
    @ApiOperation("根据id查询文章记录表")
    @GetMapping("/{id}")
    public ApiResult<Article> get(@PathVariable("id") Integer id) {
@@ -68,8 +62,6 @@ public class ArticleController extends BaseController {
        return success(article);
    }
    @PreAuthorize("hasAuthority('cms:article:save')")
    @OperationLog
    @ApiOperation("添加文章记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Article article) {
@@ -85,7 +77,6 @@ public class ArticleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:article:update')")
    @OperationLog
    @ApiOperation("修改文章记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Article article) {
@@ -95,8 +86,6 @@ public class ArticleController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:article:remove')")
    @OperationLog
    @ApiOperation("删除文章记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -106,8 +95,6 @@ public class ArticleController extends BaseController {
        return fail("删除失败");
    }
    @PreAuthorize("hasAuthority('cms:article:save')")
    @OperationLog
    @ApiOperation("批量添加文章记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Article> list) {
@@ -117,8 +104,6 @@ public class ArticleController extends BaseController {
        return fail("添加失败");
    }
    @PreAuthorize("hasAuthority('cms:article:update')")
    @OperationLog
    @ApiOperation("批量修改文章记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Article> batchParam) {
@@ -128,8 +113,6 @@ public class ArticleController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:article:remove')")
    @OperationLog
    @ApiOperation("批量删除文章记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -35,8 +35,6 @@ public class ArticleLikeController extends BaseController {
    @Resource
    private ArticleService articleService;
    @PreAuthorize("hasAuthority('cms:articleLike:list')")
    @OperationLog
    @ApiOperation("分页查询点赞文章")
    @GetMapping("/page")
    public ApiResult<PageResult<ArticleLike>> page(ArticleLikeParam param) {
@@ -47,8 +45,6 @@ public class ArticleLikeController extends BaseController {
        return success(articleLikeService.pageRel(param));
    }
    @PreAuthorize("hasAuthority('cms:articleLike:list')")
    @OperationLog
    @ApiOperation("查询全部点赞文章")
    @GetMapping()
    public ApiResult<List<ArticleLike>> list(ArticleLikeParam param) {
@@ -56,8 +52,6 @@ public class ArticleLikeController extends BaseController {
        return success(articleLikeService.listRel(param));
    }
    @PreAuthorize("hasAuthority('cms:articleLike:list')")
    @OperationLog
    @ApiOperation("根据id查询点赞文章")
    @GetMapping("/{id}")
    public ApiResult<ArticleLike> get(@PathVariable("id") Integer id) {
@@ -104,8 +98,6 @@ public class ArticleLikeController extends BaseController {
        }
    }
    @PreAuthorize("hasAuthority('cms:articleLike:update')")
    @OperationLog
    @ApiOperation("修改点赞文章")
    @PutMapping()
    public ApiResult<?> update(@RequestBody ArticleLike articleLike) {
@@ -115,8 +107,6 @@ public class ArticleLikeController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:articleLike:remove')")
    @OperationLog
    @ApiOperation("删除点赞文章")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -126,8 +116,6 @@ public class ArticleLikeController extends BaseController {
        return fail("删除失败");
    }
    @PreAuthorize("hasAuthority('cms:articleLike:save')")
    @OperationLog
    @ApiOperation("批量添加点赞文章")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<ArticleLike> list) {
@@ -137,8 +125,6 @@ public class ArticleLikeController extends BaseController {
        return fail("添加失败");
    }
    @PreAuthorize("hasAuthority('cms:articleLike:update')")
    @OperationLog
    @ApiOperation("批量修改点赞文章")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<ArticleLike> batchParam) {
@@ -148,8 +134,6 @@ public class ArticleLikeController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:articleLike:remove')")
    @OperationLog
    @ApiOperation("批量删除点赞文章")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -31,8 +31,6 @@ public class DocsController extends BaseController {
    @Resource
    private DocsService docsService;
    @PreAuthorize("hasAuthority('cms:docs:list')")
    @OperationLog
    @ApiOperation("分页查询文档管理记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Docs>> page(DocsParam param) {
@@ -43,8 +41,6 @@ public class DocsController extends BaseController {
 //        return success(docsService.pageRel(param));
    }
    @PreAuthorize("hasAuthority('cms:docs:list')")
    @OperationLog
    @ApiOperation("查询全部文档管理记录表")
    @GetMapping()
    public ApiResult<List<Docs>> list(DocsParam param) {
@@ -55,8 +51,6 @@ public class DocsController extends BaseController {
        return success(docsService.listRel(param));
    }
    @PreAuthorize("hasAuthority('cms:docs:list')")
    @OperationLog
    @ApiOperation("根据id查询文档管理记录表")
    @GetMapping("/{id}")
    public ApiResult<Docs> get(@PathVariable("id") Integer id) {
@@ -65,8 +59,6 @@ public class DocsController extends BaseController {
        //return success(docsService.getByIdRel(id));
    }
    @PreAuthorize("hasAuthority('cms:docs:save')")
    @OperationLog
    @ApiOperation("添加文档管理记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Docs docs) {
@@ -81,8 +73,6 @@ public class DocsController extends BaseController {
        return fail("添加失败");
    }
    @PreAuthorize("hasAuthority('cms:docs:update')")
    @OperationLog
    @ApiOperation("修改文档管理记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Docs docs) {
@@ -92,8 +82,6 @@ public class DocsController extends BaseController {
        return fail("保存失败");
    }
    @PreAuthorize("hasAuthority('cms:docs:remove')")
    @OperationLog
    @ApiOperation("删除文档管理记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -103,8 +91,6 @@ public class DocsController extends BaseController {
        return fail("删除失败");
    }
    @PreAuthorize("hasAuthority('cms:docs:save')")
    @OperationLog
    @ApiOperation("批量添加文档管理记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Docs> list) {
@@ -114,8 +100,6 @@ public class DocsController extends BaseController {
        return fail("添加失败");
    }
    @PreAuthorize("hasAuthority('cms:docs:update')")
    @OperationLog
    @ApiOperation("批量修改文档管理记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Docs> batchParam) {
@@ -125,8 +109,6 @@ public class DocsController extends BaseController {
        return fail("修改失败");
    }
    @PreAuthorize("hasAuthority('cms:docs:remove')")
    @OperationLog
    @ApiOperation("批量删除文档管理记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -152,6 +152,7 @@ public class OperationLogAspect {
        if (subject != null) {
            Object object = subject.getPrincipal();
            if (object instanceof User) {
              System.out.println("(User) object = " + (User) object);
                return (User) object;
            }
        }
@@ -23,8 +23,8 @@ public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
    @Override
    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
            throws IOException, ServletException {
-        CommonUtil.responseError(response, Constants.UNAUTHENTICATED_CODE, Constants.UNAUTHENTICATED_MSG,
+//        CommonUtil.responseError(response, Constants.UNAUTHENTICATED_CODE, Constants.UNAUTHENTICATED_MSG,
-                e.getMessage());
+//                e.getMessage());
    }
 }
@@ -1,12 +1,15 @@
 package com.gxwebsoft.common.core.security;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.gxwebsoft.common.core.Constants;
 import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.system.entity.LoginRecord;
+import com.gxwebsoft.common.core.utils.JSONUtil;
 import com.gxwebsoft.common.system.entity.Menu;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.entity.UserInfo;
 import com.gxwebsoft.common.system.service.LoginRecordService;
 import com.gxwebsoft.common.system.service.UserService;
 import io.jsonwebtoken.Claims;
@@ -23,7 +26,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -35,51 +38,72 @@ import java.util.stream.Collectors;
 */
@Component
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
-    @Resource
+  @Resource
-    private ConfigProperties configProperties;
+  private ConfigProperties configProperties;
-    @Resource
+  @Resource
-    private UserService userService;
+  private UserService userService;
-    @Resource
+  @Resource
-    private LoginRecordService loginRecordService;
+  private LoginRecordService loginRecordService;
  @Override
  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
    throws ServletException, IOException {
    String access_token = JwtUtil.getAccessToken(request);
    if (StrUtil.isNotBlank(access_token)) {
      try {
        // 解析token
        Claims claims = JwtUtil.parseToken(access_token, configProperties.getTokenKey());
        JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims);
        User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId());
        if (user == null) {
          // 请求主服务器获取用户信息
          HashMap<String, Object> map = new HashMap<>();
          map.put("username", jwtSubject.getUsername());
          map.put("tenantId", jwtSubject.getTenantId());
          // 链式构建请求
          String result = HttpRequest.post("https://server.gxwebsoft.com/api/auth/user")
            .header("Authorization", access_token)
            .header("Tenantid", jwtSubject.getTenantId().toString())
            .body(JSONUtil.toJSONString(map))//表单内容
            .timeout(20000)//超时，毫秒
            .execute().body();
          JSONObject jsonObject = JSONObject.parseObject(result);
          if(jsonObject.getString("code").equals("401")){
            throw new UsernameNotFoundException("Username not found");
          }
          final String data = jsonObject.getString("data");
          final UserInfo userInfo = JSONObject.parseObject(data, UserInfo.class);
          System.out.println("userInfo = " + userInfo);
          List<Menu> authorities = userInfo.getAuthorities().stream()
            .filter(m -> StrUtil.isNotBlank(m.getAuthority())).collect(Collectors.toList());
          UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
            user, null, authorities);
          SecurityContextHolder.getContext().setAuthentication(authentication);
          // token将要过期签发新token, 防止突然退出登录
 //          long expiration = (claims.getExpiration().getTime() - new Date().getTime()) / 1000 / 60;
 //          if (expiration < configProperties.getTokenRefreshTime()) {
 //            String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(),
 //              configProperties.getTokenKey());
 //            response.addHeader(Constants.TOKEN_HEADER_NAME, token);
 //            loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REFRESH, null,
 //              user.getTenantId(), request);
 //          }
    @Override
    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
            throws ServletException, IOException {
        String access_token = JwtUtil.getAccessToken(request);
        if (StrUtil.isNotBlank(access_token)) {
            try {
                // 解析token
                Claims claims = JwtUtil.parseToken(access_token, configProperties.getTokenKey());
                JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims);
                User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId());
                if (user == null) {
                    throw new UsernameNotFoundException("Username not found");
                }
                List<Menu> authorities = user.getAuthorities().stream()
                        .filter(m -> StrUtil.isNotBlank(m.getAuthority())).collect(Collectors.toList());
                UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
                        user, null, authorities);
                SecurityContextHolder.getContext().setAuthentication(authentication);
                // token将要过期签发新token, 防止突然退出登录
                long expiration = (claims.getExpiration().getTime() - new Date().getTime()) / 1000 / 60;
                if (expiration < configProperties.getTokenRefreshTime()) {
                    String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(),
                            configProperties.getTokenKey());
                    response.addHeader(Constants.TOKEN_HEADER_NAME, token);
                    loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REFRESH, null,
                            user.getTenantId(), request);
                }
            } catch (ExpiredJwtException e) {
                CommonUtil.responseError(response, Constants.TOKEN_EXPIRED_CODE, Constants.TOKEN_EXPIRED_MSG,
                        e.getMessage());
                return;
            } catch (Exception e) {
                CommonUtil.responseError(response, Constants.BAD_CREDENTIALS_CODE, Constants.BAD_CREDENTIALS_MSG,
                        e.toString());
                return;
            }
        }
-        chain.doFilter(request, response);
+
      } catch (ExpiredJwtException e) {
        CommonUtil.responseError(response, Constants.TOKEN_EXPIRED_CODE, Constants.TOKEN_EXPIRED_MSG,
          e.getMessage());
        return;
      } catch (Exception e) {
        CommonUtil.responseError(response, Constants.BAD_CREDENTIALS_CODE, Constants.BAD_CREDENTIALS_MSG,
          e.toString());
        return;
      }
    }
    chain.doFilter(request, response);
  }
 }
@@ -32,7 +32,6 @@ public class AccessKeyController extends BaseController {
    private CacheClient cacheClient;
    @PreAuthorize("hasAuthority('sys:accessKey:list')")
    @OperationLog
    @ApiOperation("分页查询访问凭证管理")
    @GetMapping("/page")
    public ApiResult<PageResult<AccessKey>> page(AccessKeyParam param) {
@@ -54,7 +53,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:list')")
    @OperationLog
    @ApiOperation("查询全部访问凭证管理")
    @GetMapping()
    public ApiResult<List<AccessKey>> list(AccessKeyParam param) {
@@ -66,7 +64,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:list')")
    @OperationLog
    @ApiOperation("根据id查询访问凭证管理")
    @GetMapping("/{id}")
    public ApiResult<AccessKey> get(@PathVariable("id") Integer id) {
@@ -76,7 +73,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:list')")
    @OperationLog
    @ApiOperation("添加访问凭证管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody AccessKey accessKey) {
@@ -93,7 +89,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:update')")
    @OperationLog
    @ApiOperation("修改访问凭证管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody AccessKey accessKey) {
@@ -104,7 +99,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:remove')")
    @OperationLog
    @ApiOperation("删除访问凭证管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -115,7 +109,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:save')")
    @OperationLog
    @ApiOperation("批量添加访问凭证管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<AccessKey> list) {
@@ -126,7 +119,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:update')")
    @OperationLog
    @ApiOperation("批量修改访问凭证管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<AccessKey> batchParam) {
@@ -137,7 +129,6 @@ public class AccessKeyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:accessKey:remove')")
    @OperationLog
    @ApiOperation("批量删除访问凭证管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -92,7 +92,6 @@ public class CacheController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:cache:save')")
    @OperationLog
    @ApiOperation("删除缓存")
    @DeleteMapping("/{key}")
    public ApiResult<?> remove(@PathVariable("key") String key) {
@@ -40,7 +40,6 @@ public class CompanyController extends BaseController {
    private FileRecordService fileRecordService;
    @PreAuthorize("hasAuthority('sys:company:list')")
    @OperationLog
    @ApiOperation("分页查询企业信息")
    @GetMapping("/page")
    public ApiResult<PageResult<Company>> page(CompanyParam param) {
@@ -49,7 +48,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:list')")
    @OperationLog
    @ApiOperation("查询全部企业信息")
    @GetMapping()
    public ApiResult<List<Company>> list(CompanyParam param) {
@@ -58,7 +56,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:list')")
    @OperationLog
    @ApiOperation("根据id查询企业信息")
    @GetMapping("/{id}")
    public ApiResult<Company> get(@PathVariable("id") Integer id) {
@@ -67,7 +64,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:profile')")
    @OperationLog
    @ApiOperation("添加企业信息")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Company company) {
@@ -83,7 +79,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:profile')")
    @OperationLog
    @ApiOperation("修改企业信息")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Company company) {
@@ -95,7 +90,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:remove')")
    @OperationLog
    @ApiOperation("删除企业信息")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -106,7 +100,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:profile')")
    @OperationLog
    @ApiOperation("批量添加企业信息")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Company> list) {
@@ -117,7 +110,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:update')")
    @OperationLog
    @ApiOperation("批量修改企业信息")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Company> batchParam) {
@@ -128,7 +120,6 @@ public class CompanyController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:company:remove')")
    @OperationLog
    @ApiOperation("批量删除企业信息")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -38,7 +38,6 @@ public class DictController extends BaseController {
    private DictDataService dictDataService;
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("分页查询字典")
    @GetMapping("/page")
    public ApiResult<PageResult<Dict>> page(DictParam param) {
@@ -48,7 +47,6 @@ public class DictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("查询全部字典")
    @GetMapping()
    public ApiResult<List<Dict>> list(DictParam param) {
@@ -58,7 +56,6 @@ public class DictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("查询全部字典")
    @GetMapping("/tree")
    public ApiResult<?> tree() {
@@ -83,7 +80,6 @@ public class DictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("根据id查询字典")
    @GetMapping("/{id}")
    public ApiResult<Dict> get(@PathVariable("id") Integer id) {
@@ -109,7 +105,6 @@ public class DictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:update')")
    @OperationLog
    @ApiOperation("修改字典")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Dict dict) {
@@ -130,7 +125,6 @@ public class DictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("删除字典")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -141,7 +135,6 @@ public class DictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("批量添加字典")
    @PostMapping("/batch")
    public ApiResult<List<String>> saveBatch(@RequestBody List<Dict> list) {
@@ -172,7 +165,6 @@ public class DictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("批量删除字典")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -30,7 +30,6 @@ public class DictDataController extends BaseController {
    private DictDataService dictDataService;
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("分页查询字典数据")
    @GetMapping("/page")
    public ApiResult<PageResult<DictData>> page(DictDataParam param) {
@@ -38,7 +37,6 @@ public class DictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("查询全部字典数据")
    @GetMapping()
    public ApiResult<List<DictData>> list(DictDataParam param) {
@@ -46,7 +44,6 @@ public class DictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("根据id查询字典数据")
    @GetMapping("/{id}")
    public ApiResult<DictData> get(@PathVariable("id") Integer id) {
@@ -54,7 +51,6 @@ public class DictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("添加字典数据")
    @PostMapping()
    public ApiResult<?> add(@RequestBody DictData dictData) {
@@ -75,7 +71,6 @@ public class DictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:update')")
    @OperationLog
    @ApiOperation("修改字典数据")
    @PutMapping()
    public ApiResult<?> update(@RequestBody DictData dictData) {
@@ -98,7 +93,6 @@ public class DictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("删除字典数据")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -109,7 +103,6 @@ public class DictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("批量添加字典数据")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<DictData> dictDataList) {
@@ -120,7 +113,6 @@ public class DictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("批量删除字典数据")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -33,7 +33,6 @@ public class DictionaryController extends BaseController {
    private DictionaryService dictionaryService;
    @PreAuthorize("hasAuthority('sys:dictionary:list')")
    @OperationLog
    @ApiOperation("分页查询字典")
    @GetMapping("/page")
    public ApiResult<PageResult<Dictionary>> page(DictionaryParam param) {
@@ -43,7 +42,6 @@ public class DictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:list')")
    @OperationLog
    @ApiOperation("查询全部字典")
    @GetMapping()
    public ApiResult<List<Dictionary>> list(DictionaryParam param) {
@@ -53,7 +51,6 @@ public class DictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:list')")
    @OperationLog
    @ApiOperation("根据id查询字典")
    @GetMapping("/{id}")
    public ApiResult<Dictionary> get(@PathVariable("id") Integer id) {
@@ -79,7 +76,6 @@ public class DictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:update')")
    @OperationLog
    @ApiOperation("修改字典")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Dictionary dictionary) {
@@ -100,7 +96,6 @@ public class DictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
    @OperationLog
    @ApiOperation("删除字典")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -111,7 +106,6 @@ public class DictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:save')")
    @OperationLog
    @ApiOperation("批量添加字典")
    @PostMapping("/batch")
    public ApiResult<List<String>> saveBatch(@RequestBody List<Dictionary> list) {
@@ -142,7 +136,6 @@ public class DictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
    @OperationLog
    @ApiOperation("批量删除字典")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -28,7 +28,6 @@ public class DictionaryDataController extends BaseController {
    private DictionaryDataService dictionaryDataService;
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("分页查询字典数据")
    @GetMapping("/page")
    public ApiResult<PageResult<DictionaryData>> page(DictionaryDataParam param) {
@@ -36,7 +35,6 @@ public class DictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("查询全部字典数据")
    @GetMapping()
    public ApiResult<List<DictionaryData>> list(DictionaryDataParam param) {
@@ -44,7 +42,6 @@ public class DictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("根据id查询字典数据")
    @GetMapping("/{id}")
    public ApiResult<DictionaryData> get(@PathVariable("id") Integer id) {
@@ -52,7 +49,6 @@ public class DictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("添加字典数据")
    @PostMapping()
    public ApiResult<?> add(@RequestBody DictionaryData dictionaryData) {
@@ -73,7 +69,6 @@ public class DictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:update')")
    @OperationLog
    @ApiOperation("修改字典数据")
    @PutMapping()
    public ApiResult<?> update(@RequestBody DictionaryData dictionaryData) {
@@ -96,7 +91,6 @@ public class DictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("删除字典数据")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -107,7 +101,6 @@ public class DictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("批量添加字典数据")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<DictionaryData> dictDataList) {
@@ -118,7 +111,6 @@ public class DictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("批量删除字典数据")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -30,7 +30,6 @@ public class EmailController extends BaseController {
    private EmailRecordService emailRecordService;
    @PreAuthorize("hasAuthority('sys:email:send')")
    @OperationLog
    @ApiOperation("发送邮件")
    @PostMapping()
    public ApiResult<?> send(@RequestBody EmailRecord emailRecord) {
@@ -47,7 +47,6 @@ public class FileController extends BaseController {
    private FileRecordService fileRecordService;
    @PreAuthorize("hasAuthority('sys:file:upload')")
    @OperationLog
    @ApiOperation("上传文件")
    @PostMapping("/upload")
    public ApiResult<FileRecord> upload(@RequestParam MultipartFile file, HttpServletRequest request) {
@@ -90,7 +89,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:upload')")
    @OperationLog
    @ApiOperation("上传base64文件")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "base64", value = "base64", required = true, dataType = "string", dataTypeClass = String.class),
@@ -121,7 +119,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:upload')")
    @OperationLog
    @ApiOperation("上传图片")
    @PostMapping("/image")
    public HashMap<String, Object> image(@RequestParam MultipartFile file, HttpServletRequest request) {
@@ -164,7 +161,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:list')")
    @OperationLog
    @ApiOperation("根据id查询文件")
    @GetMapping("/{id}")
    public ApiResult<FileRecord> get(@PathVariable("id") Integer id) {
@@ -200,7 +196,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:remove')")
    @OperationLog
    @ApiOperation("删除文件")
    @DeleteMapping("/remove/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -218,7 +213,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:remove')")
    @OperationLog
    @ApiOperation("批量删除文件")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class)
@@ -241,7 +235,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:list')")
    @OperationLog
    @ApiOperation("分页查询文件")
    @GetMapping("/page")
    public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
@@ -265,7 +258,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:list')")
    @OperationLog
    @ApiOperation("查询全部文件")
    @GetMapping("/list")
    public ApiResult<List<FileRecord>> list(FileRecordParam param, HttpServletRequest request) {
@@ -320,7 +312,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:upload')")
    @OperationLog
    @ApiOperation("添加文件")
    @PostMapping()
    public ApiResult<?> save(@RequestBody FileRecord fileRecord) {
@@ -331,7 +322,6 @@ public class FileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:file:update')")
    @OperationLog
    @ApiOperation("修改文件")
    @PutMapping()
    public ApiResult<?> update(@RequestBody FileRecord fileRecord) {
@@ -32,7 +32,6 @@ public class LoginRecordController extends BaseController {
    private LoginRecordService loginRecordService;
    @PreAuthorize("hasAuthority('sys:login-record:list')")
    @OperationLog
    @ApiOperation("分页查询登录日志")
    @GetMapping("/page")
    public ApiResult<PageResult<LoginRecord>> page(LoginRecordParam param) {
@@ -40,7 +39,6 @@ public class LoginRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:login-record:list')")
    @OperationLog
    @ApiOperation("查询全部登录日志")
    @GetMapping()
    public ApiResult<List<LoginRecord>> list(LoginRecordParam param) {
@@ -48,7 +46,6 @@ public class LoginRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:login-record:list')")
    @OperationLog
    @ApiOperation("根据id查询登录日志")
    @GetMapping("/{id}")
    public ApiResult<LoginRecord> get(@PathVariable("id") Integer id) {
@@ -186,7 +186,6 @@ public class MainController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:user')")
    @OperationLog
    @ApiOperation("修改个人信息")
    @PutMapping("/auth/user")
    public ApiResult<User> updateInfo(@RequestBody User user) {
@@ -204,7 +203,6 @@ public class MainController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:password')")
    @OperationLog
    @ApiOperation("修改自己密码")
    @PutMapping("/auth/password")
    public ApiResult<?> updatePassword(@RequestBody UpdatePasswordParam param) {
@@ -296,7 +294,6 @@ public class MainController extends BaseController {
    return fail("发送失败");
  }
    @OperationLog
    @ApiOperation("重置密码")
    @PutMapping("/password")
    public ApiResult<?> resetPassword(@RequestBody User user) {
@@ -32,7 +32,6 @@ public class MenuController extends BaseController {
    private PlugService plugService;
    @PreAuthorize("hasAuthority('sys:menu:list')")
    @OperationLog
    @ApiOperation("分页查询菜单")
    @GetMapping("/page")
    public ApiResult<PageResult<Menu>> page(MenuParam param) {
@@ -42,7 +41,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:list')")
    @OperationLog
    @ApiOperation("查询全部菜单")
    @GetMapping()
    public ApiResult<List<Menu>> list(MenuParam param) {
@@ -52,7 +50,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:list')")
    @OperationLog
    @ApiOperation("根据id查询菜单")
    @GetMapping("/{id}")
    public ApiResult<Menu> get(@PathVariable("id") Integer id) {
@@ -60,7 +57,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:save')")
    @OperationLog
    @ApiOperation("添加菜单")
    @PostMapping()
    public ApiResult<?> add(@RequestBody Menu menu) {
@@ -74,7 +70,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:update')")
    @OperationLog
    @ApiOperation("修改菜单")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Menu menu) {
@@ -85,7 +80,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:remove')")
    @OperationLog
    @ApiOperation("删除菜单")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -96,7 +90,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:save')")
    @OperationLog
    @ApiOperation("批量添加菜单")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Menu> menus) {
@@ -107,7 +100,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:update')")
    @OperationLog
    @ApiOperation("批量修改菜单")
    @PutMapping("/batch")
    public ApiResult<?> updateBatch(@RequestBody BatchParam<Menu> batchParam) {
@@ -118,7 +110,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:remove')")
    @OperationLog
    @ApiOperation("批量删除菜单")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -129,7 +120,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:update')")
    @OperationLog
    @ApiOperation("菜单克隆")
    @PostMapping("/clone")
    public ApiResult<?> onClone(@RequestBody MenuParam param){
@@ -140,7 +130,6 @@ public class MenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:menu:update')")
    @OperationLog
    @ApiOperation("安装插件")
    @GetMapping("/install/{id}")
    public ApiResult<?> install(@PathVariable("id") Integer id){
@@ -42,7 +42,6 @@ public class OperationRecordController extends BaseController {
     * 查询全部操作日志
     */
    @PreAuthorize("hasAuthority('sys:operation-record:list')")
    @OperationLog
    @ApiOperation("查询全部操作日志")
    @GetMapping()
    public ApiResult<List<OperationRecord>> list(OperationRecordParam param) {
@@ -28,7 +28,6 @@ public class OrganizationController extends BaseController {
    private OrganizationService organizationService;
    @PreAuthorize("hasAuthority('sys:org:list')")
    @OperationLog
    @ApiOperation("分页查询组织机构")
    @GetMapping("/page")
    public ApiResult<PageResult<Organization>> page(OrganizationParam param) {
@@ -36,7 +35,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:list')")
    @OperationLog
    @ApiOperation("查询全部组织机构")
    @GetMapping()
    public ApiResult<List<Organization>> list(OrganizationParam param) {
@@ -44,7 +42,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:list')")
    @OperationLog
    @ApiOperation("根据id查询组织机构")
    @GetMapping("/{id}")
    public ApiResult<Organization> get(@PathVariable("id") Integer id) {
@@ -52,7 +49,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:save')")
    @OperationLog
    @ApiOperation("添加组织机构")
    @PostMapping()
    public ApiResult<?> add(@RequestBody Organization organization) {
@@ -71,7 +67,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:update')")
    @OperationLog
    @ApiOperation("修改组织机构")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Organization organization) {
@@ -93,7 +88,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:remove')")
    @OperationLog
    @ApiOperation("删除组织机构")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -104,7 +98,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:save')")
    @OperationLog
    @ApiOperation("批量添加组织机构")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Organization> organizationList) {
@@ -115,7 +108,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:update')")
    @OperationLog
    @ApiOperation("批量修改组织机构")
    @PutMapping("/batch")
    public ApiResult<?> updateBatch(@RequestBody BatchParam<Organization> batchParam) {
@@ -126,7 +118,6 @@ public class OrganizationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:org:remove')")
    @OperationLog
    @ApiOperation("批量删除组织机构")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -36,7 +36,6 @@ public class PlugController extends BaseController {
    private MenuService menuService;
    @PreAuthorize("hasAuthority('sys:plug:list')")
    @OperationLog
    @ApiOperation("分页查询插件扩展")
    @GetMapping("/page")
    public ApiResult<PageResult<Plug>> page(PlugParam param) {
@@ -49,7 +48,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:list')")
    @OperationLog
    @ApiOperation("查询全部插件扩展")
    @GetMapping()
    public ApiResult<List<Plug>> list(PlugParam param) {
@@ -58,7 +56,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:list')")
    @OperationLog
    @ApiOperation("根据id查询插件扩展")
    @GetMapping("/{id}")
    public ApiResult<Plug> get(@PathVariable("id") Integer id) {
@@ -67,7 +64,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:save')")
    @OperationLog
    @ApiOperation("添加插件扩展")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Plug plug) {
@@ -83,7 +79,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:update')")
    @OperationLog
    @ApiOperation("修改插件扩展")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Plug plug) {
@@ -94,7 +89,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:remove')")
    @OperationLog
    @ApiOperation("删除插件扩展")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -105,7 +99,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:save')")
    @OperationLog
    @ApiOperation("批量添加插件扩展")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Plug> list) {
@@ -116,7 +109,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:update')")
    @OperationLog
    @ApiOperation("批量修改插件扩展")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Plug> batchParam) {
@@ -127,7 +119,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:remove')")
    @OperationLog
    @ApiOperation("批量删除插件扩展")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -138,7 +129,6 @@ public class PlugController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:plug:save')")
    @OperationLog
    @ApiOperation("发布插件")
    @PostMapping("/plug")
    public ApiResult<?> plug(@RequestBody Plug plug){
@@ -33,7 +33,6 @@ public class RoleController extends BaseController {
    private RoleService roleService;
    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @ApiOperation("分页查询角色")
    @GetMapping("/page")
    public ApiResult<PageResult<Role>> page(RoleParam param) {
@@ -42,7 +41,6 @@ public class RoleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @ApiOperation("查询全部角色")
    @GetMapping()
    public ApiResult<List<Role>> list(RoleParam param) {
@@ -51,7 +49,6 @@ public class RoleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @ApiOperation("根据id查询角色")
    @GetMapping("/{id}")
    public ApiResult<Role> get(@PathVariable("id") Integer id) {
@@ -59,7 +56,6 @@ public class RoleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:save')")
    @OperationLog
    @ApiOperation("添加角色")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Role role) {
@@ -76,7 +72,6 @@ public class RoleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:update')")
    @OperationLog
    @ApiOperation("修改角色")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Role role) {
@@ -97,7 +92,6 @@ public class RoleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:remove')")
    @OperationLog
    @ApiOperation("删除角色")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -108,7 +102,6 @@ public class RoleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:save')")
    @OperationLog
    @ApiOperation("批量添加角色")
    @PostMapping("/batch")
    public ApiResult<List<String>> saveBatch(@RequestBody List<Role> list) {
@@ -139,7 +132,6 @@ public class RoleController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:remove')")
    @OperationLog
    @ApiOperation("批量删除角色")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -36,7 +36,6 @@ public class RoleMenuController extends BaseController {
    private MenuService menuService;
    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @ApiOperation("查询角色菜单")
    @GetMapping("/{id}")
    public ApiResult<List<Menu>> list(@PathVariable("id") Integer roleId) {
@@ -51,7 +50,6 @@ public class RoleMenuController extends BaseController {
    @Transactional(rollbackFor = {Exception.class})
    @PreAuthorize("hasAuthority('sys:role:update')")
    @OperationLog
    @ApiOperation("修改角色菜单")
    @PutMapping("/{id}")
    public ApiResult<?> update(@PathVariable("id") Integer roleId, @RequestBody List<Integer> menuIds) {
@@ -72,7 +70,6 @@ public class RoleMenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:update')")
    @OperationLog
    @ApiOperation("添加角色菜单")
    @PostMapping("/{id}")
    public ApiResult<?> addRoleAuth(@PathVariable("id") Integer roleId, @RequestBody Integer menuId) {
@@ -86,7 +83,6 @@ public class RoleMenuController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:role:update')")
    @OperationLog
    @ApiOperation("移除角色菜单")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer roleId, @RequestBody Integer menuId) {
@@ -37,7 +37,6 @@ public class SettingController extends BaseController {
    private RedisUtil redisUtil;
    @PreAuthorize("hasAuthority('sys:setting:save')")
    @OperationLog
    @ApiOperation("分页查询系统设置")
    @GetMapping("/page")
    public ApiResult<PageResult<Setting>> page(SettingParam param) {
@@ -49,7 +48,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:save')")
    @OperationLog
    @ApiOperation("查询全部系统设置")
    @GetMapping()
    public ApiResult<List<Setting>> list(SettingParam param) {
@@ -61,7 +59,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:save')")
    @OperationLog
    @ApiOperation("根据id查询系统设置")
    @GetMapping("/{id}")
    public ApiResult<Setting> get(@PathVariable("id") Integer id) {
@@ -71,7 +68,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:save')")
    @OperationLog
    @ApiOperation("添加系统设置")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Setting setting) {
@@ -82,7 +78,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:save')")
    @OperationLog
    @ApiOperation("修改系统设置")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Setting setting) {
@@ -113,7 +108,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:remove')")
    @OperationLog
    @ApiOperation("删除系统设置")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -124,7 +118,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:save')")
    @OperationLog
    @ApiOperation("批量添加系统设置")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Setting> list) {
@@ -135,7 +128,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:update')")
    @OperationLog
    @ApiOperation("批量修改系统设置")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Setting> batchParam) {
@@ -146,7 +138,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:remove')")
    @OperationLog
    @ApiOperation("批量删除系统设置")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -157,7 +148,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:data')")
    @OperationLog
    @ApiOperation("查询租户设置信息")
    @GetMapping("/data")
    public ApiResult<?> data() {
@@ -165,7 +155,6 @@ public class SettingController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:setting:save')")
    @OperationLog
    @ApiOperation("更新主题皮肤")
    @PutMapping("/theme")
    public ApiResult<?> theme(@RequestBody Setting setting) {
@@ -45,7 +45,6 @@ public class TenantController extends BaseController {
    private RoleMenuService roleMenuService;
    @PreAuthorize("hasAuthority('sys:tenant:list')")
    @OperationLog
    @ApiOperation("分页查询租户")
    @GetMapping("/page")
    public ApiResult<PageResult<Tenant>> page(TenantParam param) {
@@ -54,7 +53,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:list')")
    @OperationLog
    @ApiOperation("查询全部租户")
    @GetMapping()
    public ApiResult<List<Tenant>> list(TenantParam param) {
@@ -63,7 +61,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:list')")
    @OperationLog
    @ApiOperation("根据id查询租户")
    @GetMapping("/{id}")
    public ApiResult<Tenant> get(@PathVariable("id") Integer id) {
@@ -72,7 +69,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:save')")
    @OperationLog
    @ApiOperation("添加租户")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Tenant tenant) {
@@ -84,7 +80,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:update')")
    @OperationLog
    @ApiOperation("修改租户")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Tenant tenant) {
@@ -95,7 +90,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:remove')")
    @OperationLog
    @ApiOperation("删除租户")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -106,7 +100,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:save')")
    @OperationLog
    @ApiOperation("批量添加租户")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Tenant> list) {
@@ -117,7 +110,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:update')")
    @OperationLog
    @ApiOperation("批量修改租户")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Tenant> batchParam) {
@@ -128,7 +120,6 @@ public class TenantController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:tenant:remove')")
    @OperationLog
    @ApiOperation("批量删除租户")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -64,7 +64,6 @@ public class UserController extends BaseController {
    private UserProfileService userProfileService;
    @PreAuthorize("hasAuthority('sys:user:list')")
    @OperationLog
    @ApiOperation("分页查询用户")
    @GetMapping("/page")
    public ApiResult<PageResult<User>> page(UserParam param) {
@@ -72,7 +71,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:list')")
    @OperationLog
    @ApiOperation("查询全部用户")
    @GetMapping()
    public ApiResult<List<User>> list(UserParam param) {
@@ -80,7 +78,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:list')")
    @OperationLog
    @ApiOperation("根据id查询用户")
    @GetMapping("/{id}")
    public ApiResult<User> get(@PathVariable("id") Integer id) {
@@ -88,7 +85,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:save')")
    @OperationLog
    @ApiOperation("添加用户")
    @PostMapping()
    public ApiResult<?> add(@RequestBody User user) {
@@ -101,7 +97,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("修改用户")
    @PutMapping()
    public ApiResult<?> update(@RequestBody User user) {
@@ -123,7 +118,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:remove')")
    @OperationLog
    @ApiOperation("删除用户")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -136,7 +130,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("批量修改用户")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<User> batchParam) {
@@ -147,7 +140,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:remove')")
    @OperationLog
    @ApiOperation("批量删除用户")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class)
@@ -166,7 +158,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("修改用户状态")
    @PutMapping("/status")
    public ApiResult<?> updateStatus(@RequestBody User user) {
@@ -183,7 +174,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("修改推荐状态")
    @PutMapping("/recommend")
    public ApiResult<?> updateRecommend(@RequestBody User user) {
@@ -202,7 +192,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("批量修改用户状态")
    @PutMapping("/status/batch")
    public ApiResult<?> updateStatusBatch(@RequestBody BatchParam<Integer> batchParam) {
@@ -218,7 +207,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("重置密码")
    @PutMapping("/password")
    public ApiResult<?> resetPassword(@RequestBody User user) {
@@ -236,7 +224,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("批量重置密码")
    @PutMapping("/password/batch")
    public ApiResult<?> resetPasswordBatch(@RequestBody BatchParam<String> batchParam) {
@@ -256,7 +243,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:list')")
    @OperationLog
    @ApiOperation("检查用户是否存在")
    @GetMapping("/existence")
    public ApiResult<?> existence(ExistenceParam<User> param) {
@@ -270,7 +256,6 @@ public class UserController extends BaseController {
     * excel导入用户
     */
    @PreAuthorize("hasAuthority('sys:user:save')")
    @OperationLog
    @ApiOperation("导入用户")
    @Transactional(rollbackFor = {Exception.class})
    @PostMapping("/import")
@@ -350,7 +335,6 @@ public class UserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:list')")
    @OperationLog
    @ApiOperation("统计用户余额")
    @GetMapping("/countUserBalance")
    public ApiResult<?> countUserBalance(User param) {
@@ -34,7 +34,6 @@ public class UserFileController extends BaseController {
    @Resource
    private UserFileService userFileService;
    @OperationLog
    @ApiOperation("分页查询用户文件")
    @GetMapping("/page")
    public ApiResult<PageResult<UserFile>> page(UserFileParam param, HttpServletRequest request) {
@@ -56,7 +55,6 @@ public class UserFileController extends BaseController {
        return success(records, result.getTotal());
    }
    @OperationLog
    @ApiOperation("查询全部用户文件")
    @GetMapping()
    public ApiResult<List<UserFile>> list(UserFileParam param, HttpServletRequest request) {
@@ -78,7 +76,6 @@ public class UserFileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:user')")
    @OperationLog
    @ApiOperation("添加用户文件")
    @PostMapping()
    public ApiResult<?> save(@RequestBody UserFile userFile) {
@@ -101,7 +98,6 @@ public class UserFileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:user')")
    @OperationLog
    @ApiOperation("修改用户文件")
    @PutMapping()
    public ApiResult<?> update(@RequestBody UserFile userFile) {
@@ -136,7 +132,6 @@ public class UserFileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:user')")
    @OperationLog
    @ApiOperation("删除用户文件")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -149,7 +144,6 @@ public class UserFileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:user')")
    @OperationLog
    @ApiOperation("批量删除用户文件")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -0,0 +1,267 @@
 package com.gxwebsoft.common.system.entity;
 import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gxwebsoft.love.entity.UserPlanEquity;
 import com.gxwebsoft.love.entity.UserProfile;
 import com.gxwebsoft.oa.entity.App;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.security.core.userdetails.UserDetails;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 /**
 * 用户
 *
 * @author WebSoft
 * @since 2018-12-24 16:10:13
 */
@Data
@ApiModel(description = "用户")
@TableName("sys_user")
 public class UserInfo {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("用户id")
    @TableId(type = IdType.AUTO)
    private Integer userId;
    @ApiModelProperty("用户类型, 0普通用户 6开发者 10企业用户")
    private Integer type;
    @ApiModelProperty("用户编码")
    private String userCode;
    @ApiModelProperty("账号")
    private String username;
    @ApiModelProperty("密码")
    private String password;
    @ApiModelProperty("昵称")
    private String nickname;
    @ApiModelProperty("头像")
    private String avatar;
    @ApiModelProperty("头像")
    private String bgImage;
    @ApiModelProperty("性别, 字典标识")
    private String sex;
    @ApiModelProperty("手机号")
    private String phone;
    @ApiModelProperty("邮箱")
    private String email;
    @ApiModelProperty("职务")
    private String position;
    @ApiModelProperty("邮箱是否验证, 0否, 1是")
    private Integer emailVerified;
    @ApiModelProperty("别名")
    private String alias;
    @ApiModelProperty("真实姓名")
    private String realName;
    @ApiModelProperty("身份证号")
    private String idCard;
    @ApiModelProperty("出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date birthday;
    @ApiModelProperty(value = "年龄")
    private Integer age;
    @ApiModelProperty("所在国家")
    private String country;
    @ApiModelProperty(value = "所在省份")
    private String province;
    @ApiModelProperty(value = "所在城市")
    private String city;
    @ApiModelProperty(value = "所在辖区")
    private String region;
    @ApiModelProperty("街道地址")
    private String address;
    @ApiModelProperty(value = "经度")
    private String longitude;
    @ApiModelProperty(value = "纬度")
    private String latitude;
    @ApiModelProperty("用户可用余额")
    private BigDecimal balance;
    @ApiModelProperty("用户可用积分")
    private Integer points;
    @ApiModelProperty("用户总支付的金额")
    private String payMoney;
    @ApiModelProperty("实际消费的金额(不含退款)")
    private String expendMoney;
    @ApiModelProperty("会员等级ID")
    private Integer gradeId;
    @ApiModelProperty("个人简介")
    private String introduction;
    @ApiModelProperty("机构ID")
    private Integer organizationId;
    @ApiModelProperty("客户ID")
    private Integer customerId;
    @ApiModelProperty("企业ID")
    private Integer companyId;
    @ApiModelProperty("注册来源客户端")
    private String platform;
    @ApiModelProperty("兴趣爱好")
    private String interest;
    @ApiModelProperty("身高")
    private String height;
    @ApiModelProperty("体重")
    private String weight;
    @ApiModelProperty("学历")
    private String education;
    @ApiModelProperty("月薪")
    private String monthlyPay;
    @ApiModelProperty("是否下线会员")
    private Integer offline;
    @ApiModelProperty("关注数")
    private Integer followers;
    @ApiModelProperty("粉丝数")
    private Integer fans;
    @ApiModelProperty("获赞数")
    private Integer likes;
    @ApiModelProperty("评论数")
    private Integer commentNumbers;
    @ApiModelProperty("是否推荐")
    private Integer recommend;
    @ApiModelProperty("备注")
    private String comments;
    @ApiModelProperty("状态, 0正常, 1冻结")
    private Integer status;
    @ApiModelProperty("是否删除, 0否, 1是")
    @TableLogic
    private Integer deleted;
    @ApiModelProperty(value = "租户id")
    private Integer tenantId;
    @ApiModelProperty(value = "租户名称")
    @TableField(exist = false)
    private String tenantName;
    @ApiModelProperty(value = "最后结算时间")
    private Date settlementTime;
    @ApiModelProperty("注册时间")
    private Date createTime;
    @ApiModelProperty("修改时间")
    private Date updateTime;
    @ApiModelProperty("公司名称")
    private String companyName;
    @ApiModelProperty("是否已实名认证")
    private Integer certification;
    @ApiModelProperty("机构名称")
    @TableField(exist = false)
    private String organizationName;
    @ApiModelProperty("性别名称")
    @TableField(exist = false)
    private String sexName;
    @ApiModelProperty("会员等级")
    @TableField(exist = false)
    private String gradeName;
    @ApiModelProperty("默认注册的角色ID")
    @TableField(exist = false)
    private Integer roleId;
    @ApiModelProperty("角色列表")
    @TableField(exist = false)
    private List<Object> roles;
    @ApiModelProperty("权限列表")
    @TableField(exist = false)
    private List<Menu> authorities;
    @ApiModelProperty("微信凭证")
    @TableField(exist = false)
    private String code;
    @ApiModelProperty("推荐人ID")
    @TableField(exist = false)
    private Integer dealerId;
    @ApiModelProperty("微信openid")
    @TableField(exist = false)
    private String openid;
    @ApiModelProperty("微信unionid")
    @TableField(exist = false)
    private String unionid;
    @ApiModelProperty("所属商户的编号")
    @TableField(exist = false)
    private String merchantCode;
    @ApiModelProperty("所属商户名称")
    @TableField(exist = false)
    private String merchantName;
    @ApiModelProperty("ico文件")
    @TableField(exist = false)
    private String logo;
    @ApiModelProperty("创建的应用数量")
    @TableField(exist = false)
    private Double apps;
    @ApiModelProperty("租户设置信息")
    @TableField(exist = false)
    private String setting;
    @ApiModelProperty("手机号(脱敏)")
    @TableField(exist = false)
    private String mobile;
 }
@@ -41,7 +41,6 @@ public class InfoController extends BaseController {
    private ViewsLogService viewsLogService;
    @PreAuthorize("hasAuthority('house:info:list')")
    @OperationLog
    @ApiOperation("分页查询房源信息表")
    @GetMapping("/page")
    public ApiResult<PageResult<Info>> page(InfoParam param) {
@@ -50,7 +49,6 @@ public class InfoController extends BaseController {
        return success(infoService.pageRel(param));
    }
    @OperationLog
    @ApiOperation("查询全部房源信息表")
    @GetMapping()
    public ApiResult<List<Info>> list(InfoParam param) {
@@ -58,7 +56,6 @@ public class InfoController extends BaseController {
        return success(infoService.listRel(param));
    }
    @OperationLog
    @ApiOperation("根据id查询房源信息表")
    @GetMapping("/{id}")
    public ApiResult<Info> get(@PathVariable("id") Integer id) {
@@ -81,7 +78,6 @@ public class InfoController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:info:save')")
    @OperationLog
    @ApiOperation("添加房源信息表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Info info) {
@@ -97,7 +93,6 @@ public class InfoController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:info:update')")
    @OperationLog
    @ApiOperation("修改房源信息表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Info info) {
@@ -108,7 +103,6 @@ public class InfoController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:info:remove')")
    @OperationLog
    @ApiOperation("删除房源信息表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -119,7 +113,6 @@ public class InfoController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:info:save')")
    @OperationLog
    @ApiOperation("批量添加房源信息表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Info> list) {
@@ -130,7 +123,6 @@ public class InfoController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:info:update')")
    @OperationLog
    @ApiOperation("批量修改房源信息表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Info> batchParam) {
@@ -141,7 +133,6 @@ public class InfoController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:info:remove')")
    @OperationLog
    @ApiOperation("批量删除房源信息表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -31,7 +31,6 @@ public class LikeLogController extends BaseController {
    @Resource
    private LikeLogService likeLogService;
    @OperationLog
    @ApiOperation("分页查询会员套餐权益表")
    @GetMapping("/page")
    public ApiResult<PageResult<LikeLog>> page(LikeLogParam param) {
@@ -42,7 +41,6 @@ public class LikeLogController extends BaseController {
        //return success(likeLogService.pageRel(param));
    }
    @OperationLog
    @ApiOperation("查询全部会员套餐权益表")
    @GetMapping()
    public ApiResult<List<LikeLog>> list(LikeLogParam param) {
@@ -55,7 +53,6 @@ public class LikeLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:likeLog:list')")
    @OperationLog
    @ApiOperation("根据id查询会员套餐权益表")
    @GetMapping("/{id}")
    public ApiResult<LikeLog> get(@PathVariable("id") Integer id) {
@@ -64,7 +61,6 @@ public class LikeLogController extends BaseController {
        //return success(likeLogService.getByIdRel(id));
    }
    @OperationLog
    @ApiOperation("添加会员套餐权益表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody LikeLog likeLog) {
@@ -78,7 +74,6 @@ public class LikeLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:likeLog:update')")
    @OperationLog
    @ApiOperation("修改会员套餐权益表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody LikeLog likeLog) {
@@ -89,7 +84,6 @@ public class LikeLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:likeLog:remove')")
    @OperationLog
    @ApiOperation("删除会员套餐权益表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -100,7 +94,6 @@ public class LikeLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:likeLog:save')")
    @OperationLog
    @ApiOperation("批量添加会员套餐权益表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<LikeLog> list) {
@@ -111,7 +104,6 @@ public class LikeLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:likeLog:update')")
    @OperationLog
    @ApiOperation("批量修改会员套餐权益表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<LikeLog> batchParam) {
@@ -122,7 +114,6 @@ public class LikeLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:likeLog:remove')")
    @OperationLog
    @ApiOperation("批量删除会员套餐权益表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -33,7 +33,6 @@ public class ReservationController extends BaseController {
    private ReservationService reservationService;
    @PreAuthorize("hasAuthority('house:reservation:list')")
    @OperationLog
    @ApiOperation("分页查询预约记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Reservation>> page(ReservationParam param) {
@@ -42,7 +41,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:list')")
    @OperationLog
    @ApiOperation("查询全部预约记录表")
    @GetMapping()
    public ApiResult<List<Reservation>> list(ReservationParam param) {
@@ -51,7 +49,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:list')")
    @OperationLog
    @ApiOperation("根据id查询预约记录表")
    @GetMapping("/{id}")
    public ApiResult<Reservation> get(@PathVariable("id") Integer id) {
@@ -60,7 +57,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:save')")
    @OperationLog
    @ApiOperation("添加预约记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Reservation reservation) {
@@ -79,7 +75,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:update')")
    @OperationLog
    @ApiOperation("修改预约记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Reservation reservation) {
@@ -90,7 +85,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:remove')")
    @OperationLog
    @ApiOperation("删除预约记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -101,7 +95,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:save')")
    @OperationLog
    @ApiOperation("批量添加预约记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Reservation> list) {
@@ -112,7 +105,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:update')")
    @OperationLog
    @ApiOperation("批量修改预约记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Reservation> batchParam) {
@@ -123,7 +115,6 @@ public class ReservationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:reservation:remove')")
    @OperationLog
    @ApiOperation("批量删除预约记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class ViewsLogController extends BaseController {
    private ViewsLogService viewsLogService;
    @PreAuthorize("hasAuthority('house:viewsLog:list')")
    @OperationLog
    @ApiOperation("分页查询会员套餐权益表")
    @GetMapping("/page")
    public ApiResult<PageResult<ViewsLog>> page(ViewsLogParam param) {
@@ -44,7 +43,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:list')")
    @OperationLog
    @ApiOperation("查询全部会员套餐权益表")
    @GetMapping()
    public ApiResult<List<ViewsLog>> list(ViewsLogParam param) {
@@ -56,7 +54,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:list')")
    @OperationLog
    @ApiOperation("根据id查询会员套餐权益表")
    @GetMapping("/{id}")
    public ApiResult<ViewsLog> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:save')")
    @OperationLog
    @ApiOperation("添加会员套餐权益表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody ViewsLog viewsLog) {
@@ -82,7 +78,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:update')")
    @OperationLog
    @ApiOperation("修改会员套餐权益表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody ViewsLog viewsLog) {
@@ -93,7 +88,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:remove')")
    @OperationLog
    @ApiOperation("删除会员套餐权益表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -104,7 +98,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:save')")
    @OperationLog
    @ApiOperation("批量添加会员套餐权益表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<ViewsLog> list) {
@@ -115,7 +108,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:update')")
    @OperationLog
    @ApiOperation("批量修改会员套餐权益表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<ViewsLog> batchParam) {
@@ -126,7 +118,6 @@ public class ViewsLogController extends BaseController {
    }
    @PreAuthorize("hasAuthority('house:viewsLog:remove')")
    @OperationLog
    @ApiOperation("批量删除会员套餐权益表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -44,7 +44,6 @@ public class CertificateController extends BaseController {
    private UserService userService;
    @PreAuthorize("hasAuthority('love:certificate:list')")
    @OperationLog
    @ApiOperation("分页查询证件管理记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Certificate>> page(CertificateParam param) {
@@ -53,7 +52,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:list')")
    @OperationLog
    @ApiOperation("查询全部证件管理记录表")
    @GetMapping()
    public ApiResult<List<Certificate>> list(CertificateParam param) {
@@ -62,7 +60,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:list')")
    @OperationLog
    @ApiOperation("根据id查询证件管理记录表")
    @GetMapping("/{id}")
    public ApiResult<Certificate> get(@PathVariable("id") Integer id) {
@@ -71,7 +68,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:save')")
    @OperationLog
    @ApiOperation("添加证件管理记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Certificate certificate) {
@@ -142,7 +138,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:update')")
    @OperationLog
    @ApiOperation("修改证件管理记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Certificate certificate) {
@@ -153,7 +148,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:remove')")
    @OperationLog
    @ApiOperation("删除证件管理记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -164,7 +158,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:save')")
    @OperationLog
    @ApiOperation("批量添加证件管理记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Certificate> list) {
@@ -175,7 +168,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:update')")
    @OperationLog
    @ApiOperation("批量修改证件管理记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Certificate> batchParam) {
@@ -186,7 +178,6 @@ public class CertificateController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:certificate:remove')")
    @OperationLog
    @ApiOperation("批量删除证件管理记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -51,7 +51,6 @@ public class ChatConversationController extends BaseController {
    @PreAuthorize("hasAuthority('love:chatConversation:list')")
    @OperationLog
    @ApiOperation("分页查询聊天消息表")
    @GetMapping("/page")
    public ApiResult<PageResult<ChatConversationVO>> page(ChatConversationParam param) {
@@ -63,7 +62,6 @@ public class ChatConversationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatConversation:list')")
    @OperationLog
    @ApiOperation("查询全部聊天消息表")
    @GetMapping()
    public ApiResult<List<ChatConversation>> list(ChatConversationParam param) {
@@ -75,7 +73,6 @@ public class ChatConversationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatConversation:list')")
    @OperationLog
    @ApiOperation("根据id查询聊天消息表")
    @GetMapping("/{id}")
    public ApiResult<ChatConversation> get(@PathVariable("id") Integer id) {
@@ -85,7 +82,6 @@ public class ChatConversationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatConversation:save')")
    @OperationLog
    @ApiOperation("添加聊天消息表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody ChatConversation chatConversation) {
@@ -101,7 +97,6 @@ public class ChatConversationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatConversation:update')")
    @OperationLog
    @ApiOperation("修改聊天消息表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody ChatConversation chatConversation) {
@@ -111,7 +106,6 @@ public class ChatConversationController extends BaseController {
        return fail("修改失败");
    }
    @OperationLog
    @ApiOperation("删除聊天消息表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -122,7 +116,6 @@ public class ChatConversationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatConversation:save')")
    @OperationLog
    @ApiOperation("批量添加聊天消息表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<ChatConversation> list) {
@@ -133,7 +126,6 @@ public class ChatConversationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatConversation:update')")
    @OperationLog
    @ApiOperation("批量修改聊天消息表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<ChatConversation> batchParam) {
@@ -144,7 +136,6 @@ public class ChatConversationController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatConversation:remove')")
    @OperationLog
    @ApiOperation("批量删除聊天消息表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -35,7 +35,6 @@ public class ChatMessageController extends BaseController {
    @Resource
    private ClientCache clientCache;
    @OperationLog
    @ApiOperation("发送消息：app端使用")
    @PostMapping("/app/send")
    public ApiResult<?> sendMessage(@RequestBody ChatMessage message) {
@@ -45,7 +44,6 @@ public class ChatMessageController extends BaseController {
        return success(chatMessageService.sendMessage(message));
    }
    @OperationLog
    @ApiOperation("发送消息")
    @GetMapping("/app/list/{friendId}")
    public ApiResult<List<ChatMessage>> listApp(@PathVariable Integer friendId) {
@@ -54,7 +52,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:list')")
    @OperationLog
    @ApiOperation("分页查询聊天消息表")
    @GetMapping("/page")
    public ApiResult<PageResult<ChatMessage>> page(ChatMessageParam param) {
@@ -68,7 +65,6 @@ public class ChatMessageController extends BaseController {
    @PreAuthorize("hasAuthority('love:chatMessage:list')")
    @OperationLog
    @ApiOperation("查询全部聊天消息表")
    @GetMapping()
    public ApiResult<List<ChatMessage>> list(ChatMessageParam param) {
@@ -80,7 +76,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:list')")
    @OperationLog
    @ApiOperation("根据id查询聊天消息表")
    @GetMapping("/{id}")
    public ApiResult<ChatMessage> get(@PathVariable("id") Integer id) {
@@ -90,7 +85,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:save')")
    @OperationLog
    @ApiOperation("添加聊天消息表 管理员使用")
    @PostMapping()
    public ApiResult<?> save(@RequestBody ChatMessage message) {
@@ -105,7 +99,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:update')")
    @OperationLog
    @ApiOperation("修改聊天消息表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody ChatMessage chatMessage) {
@@ -116,7 +109,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:remove')")
    @OperationLog
    @ApiOperation("删除聊天消息表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -127,7 +119,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:save')")
    @OperationLog
    @ApiOperation("批量添加聊天消息表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<ChatMessage> list) {
@@ -138,7 +129,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:update')")
    @OperationLog
    @ApiOperation("批量修改聊天消息表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<ChatMessage> batchParam) {
@@ -149,7 +139,6 @@ public class ChatMessageController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:chatMessage:remove')")
    @OperationLog
    @ApiOperation("批量删除聊天消息表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -28,7 +28,6 @@ public class ProfitController extends BaseController {
    private ProfitService profitService;
    @PreAuthorize("hasAuthority('love:profit:list')")
    @OperationLog
    @ApiOperation("分页查询门店收益明细表")
    @GetMapping("/page")
    public ApiResult<PageResult<Profit>> page(ProfitParam param) {
@@ -37,7 +36,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:list')")
    @OperationLog
    @ApiOperation("查询全部门店收益明细表")
    @GetMapping()
    public ApiResult<List<Profit>> list(ProfitParam param) {
@@ -46,7 +44,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:list')")
    @OperationLog
    @ApiOperation("根据id查询门店收益明细表")
    @GetMapping("/{id}")
    public ApiResult<Profit> get(@PathVariable("id") Integer id) {
@@ -55,7 +52,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:save')")
    @OperationLog
    @ApiOperation("添加门店收益明细表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Profit profit) {
@@ -71,7 +67,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:update')")
    @OperationLog
    @ApiOperation("修改门店收益明细表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Profit profit) {
@@ -82,7 +77,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:remove')")
    @OperationLog
    @ApiOperation("删除门店收益明细表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -93,7 +87,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:save')")
    @OperationLog
    @ApiOperation("批量添加门店收益明细表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Profit> list) {
@@ -104,7 +97,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:update')")
    @OperationLog
    @ApiOperation("批量修改门店收益明细表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Profit> batchParam) {
@@ -115,7 +107,6 @@ public class ProfitController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:profit:remove')")
    @OperationLog
    @ApiOperation("批量删除门店收益明细表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -39,7 +39,6 @@ public class UserPlanController extends BaseController {
    private UserPlanIconService userPlanIconService;
    @PreAuthorize("hasAuthority('love:userPlan:list')")
    @OperationLog
    @ApiOperation("分页查询会员套餐管理表")
    @GetMapping("/page")
    public ApiResult<PageResult<UserPlan>> page(UserPlanParam param) {
@@ -48,7 +47,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:list')")
    @OperationLog
    @ApiOperation("查询全部会员套餐管理表")
    @GetMapping()
    public ApiResult<List<UserPlan>> list(UserPlanParam param) {
@@ -58,7 +56,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:list')")
    @OperationLog
    @ApiOperation("根据id查询会员套餐管理表")
    @GetMapping("/{id}")
    public ApiResult<UserPlan> get(@PathVariable("id") Integer id) {
@@ -67,7 +64,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:save')")
    @OperationLog
    @ApiOperation("添加会员套餐管理表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody UserPlan userPlan) {
@@ -92,7 +88,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:update')")
    @OperationLog
    @ApiOperation("修改会员套餐管理表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody UserPlan userPlan) {
@@ -121,7 +116,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:remove')")
    @OperationLog
    @ApiOperation("删除会员套餐管理表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -132,7 +126,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:save')")
    @OperationLog
    @ApiOperation("批量添加会员套餐管理表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<UserPlan> list) {
@@ -143,7 +136,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:update')")
    @OperationLog
    @ApiOperation("批量修改会员套餐管理表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlan> batchParam) {
@@ -154,7 +146,6 @@ public class UserPlanController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlan:remove')")
    @OperationLog
    @ApiOperation("批量删除会员套餐管理表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -34,7 +34,6 @@ public class UserPlanEquityController extends BaseController {
    private UserPlanEquityService userPlanEquityService;
    @PreAuthorize("hasAuthority('love:userPlanEquity:list')")
    @OperationLog
    @ApiOperation("分页查询会员套餐管理表")
    @GetMapping("/page")
    public ApiResult<PageResult<UserPlanEquity>> page(UserPlanEquityParam param) {
@@ -57,7 +56,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:list')")
    @OperationLog
    @ApiOperation("查询全部会员套餐管理表")
    @GetMapping()
    public ApiResult<List<UserPlanEquity>> list(UserPlanEquityParam param) {
@@ -66,7 +64,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:list')")
    @OperationLog
    @ApiOperation("根据id查询会员套餐管理表")
    @GetMapping("/{id}")
    public ApiResult<UserPlanEquity> get(@PathVariable("id") Integer id) {
@@ -75,7 +72,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:save')")
    @OperationLog
    @ApiOperation("添加会员套餐管理表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody UserPlanEquity userPlanEquity) {
@@ -91,7 +87,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:update')")
    @OperationLog
    @ApiOperation("修改会员套餐管理表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody UserPlanEquity userPlanEquity) {
@@ -102,7 +97,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:remove')")
    @OperationLog
    @ApiOperation("删除会员套餐管理表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -113,7 +107,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:save')")
    @OperationLog
    @ApiOperation("批量添加会员套餐管理表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<UserPlanEquity> list) {
@@ -124,7 +117,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:update')")
    @OperationLog
    @ApiOperation("批量修改会员套餐管理表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlanEquity> batchParam) {
@@ -135,7 +127,6 @@ public class UserPlanEquityController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanEquity:remove')")
    @OperationLog
    @ApiOperation("批量删除会员套餐管理表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -27,7 +27,6 @@ public class UserPlanIconController extends BaseController {
    private UserPlanIconService userPlanIconService;
    @PreAuthorize("hasAuthority('love:userPlanIcon:list')")
    @OperationLog
    @ApiOperation("分页查询会员套餐权益表")
    @GetMapping("/page")
    public ApiResult<PageResult<UserPlanIcon>> page(UserPlanIconParam param) {
@@ -39,7 +38,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:list')")
    @OperationLog
    @ApiOperation("查询全部会员套餐权益表")
    @GetMapping()
    public ApiResult<List<UserPlanIcon>> list(UserPlanIconParam param) {
@@ -51,7 +49,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:list')")
    @OperationLog
    @ApiOperation("根据id查询会员套餐权益表")
    @GetMapping("/{id}")
    public ApiResult<UserPlanIcon> get(@PathVariable("id") Integer id) {
@@ -61,7 +58,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:save')")
    @OperationLog
    @ApiOperation("添加会员套餐权益表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody UserPlanIcon userPlanIcon) {
@@ -72,7 +68,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:update')")
    @OperationLog
    @ApiOperation("修改会员套餐权益表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody UserPlanIcon userPlanIcon) {
@@ -83,7 +78,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:remove')")
    @OperationLog
    @ApiOperation("删除会员套餐权益表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -94,7 +88,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:save')")
    @OperationLog
    @ApiOperation("批量添加会员套餐权益表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<UserPlanIcon> list) {
@@ -105,7 +98,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:update')")
    @OperationLog
    @ApiOperation("批量修改会员套餐权益表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlanIcon> batchParam) {
@@ -116,7 +108,6 @@ public class UserPlanIconController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanIcon:remove')")
    @OperationLog
    @ApiOperation("批量删除会员套餐权益表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -30,7 +30,6 @@ public class UserPlanPriceController extends BaseController {
    private UserPlanPriceService userPlanPriceService;
    @PreAuthorize("hasAuthority('love:userPlanPrice:list')")
    @OperationLog
    @ApiOperation("分页查询会员套餐定价表")
    @GetMapping("/page")
    public ApiResult<PageResult<UserPlanPrice>> page(UserPlanPriceParam param) {
@@ -39,7 +38,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:list')")
    @OperationLog
    @ApiOperation("查询全部会员套餐定价表")
    @GetMapping()
    public ApiResult<List<UserPlanPrice>> list(UserPlanPriceParam param) {
@@ -48,7 +46,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:list')")
    @OperationLog
    @ApiOperation("根据id查询会员套餐定价表")
    @GetMapping("/{id}")
    public ApiResult<UserPlanPrice> get(@PathVariable("id") Integer id) {
@@ -57,7 +54,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:save')")
    @OperationLog
    @ApiOperation("添加会员套餐定价表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody UserPlanPrice userPlanPrice) {
@@ -68,7 +64,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:update')")
    @OperationLog
    @ApiOperation("修改会员套餐定价表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody UserPlanPrice userPlanPrice) {
@@ -79,7 +74,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:remove')")
    @OperationLog
    @ApiOperation("删除会员套餐定价表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -90,7 +84,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:save')")
    @OperationLog
    @ApiOperation("批量添加会员套餐定价表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<UserPlanPrice> list) {
@@ -101,7 +94,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:update')")
    @OperationLog
    @ApiOperation("批量修改会员套餐定价表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlanPrice> batchParam) {
@@ -112,7 +104,6 @@ public class UserPlanPriceController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userPlanPrice:remove')")
    @OperationLog
    @ApiOperation("批量删除会员套餐定价表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -73,7 +73,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:user')")
    @OperationLog
    @ApiOperation("根据会员id查询详细资料")
    @GetMapping("/{id}")
    public ApiResult<UserProfile> get(@PathVariable("id") Integer id) {
@@ -96,7 +95,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("添加会员资料表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody UserProfile userProfile) {
@@ -112,7 +110,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:user:update')")
    @OperationLog
    @ApiOperation("修改会员资料表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody UserProfile userProfile) {
@@ -124,7 +121,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userProfile:remove')")
    @OperationLog
    @ApiOperation("删除会员资料表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -135,7 +131,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userProfile:save')")
    @OperationLog
    @ApiOperation("批量添加会员资料表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<UserProfile> list) {
@@ -146,7 +141,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userProfile:update')")
    @OperationLog
    @ApiOperation("批量修改会员资料表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserProfile> batchParam) {
@@ -157,7 +151,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userProfile:remove')")
    @OperationLog
    @ApiOperation("批量删除会员资料表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -168,7 +161,6 @@ public class UserProfileController extends BaseController {
    }
    @PreAuthorize("hasAuthority('love:userProfile:list')")
    @OperationLog
    @ApiOperation("根据会员id查询详细资料")
    @GetMapping("/detail/{id}")
    public ApiResult<UserProfile> detail(@PathVariable("id") Integer id) {
@@ -72,11 +72,11 @@ public class SocketIOConfig implements InitializingBean {
        config.setKeyStore(resourceAsStream);  // 设置证书文件
        config.setKeyStorePassword("123456");  // 设置证书密码
-    SocketIOServer server = new SocketIOServer(config);
+//    SocketIOServer server = new SocketIOServer(config);
-    //启动socket服务
+//    //启动socket服务
-    server.addListeners(socketIOHandler);
+//    server.addListeners(socketIOHandler);
-    server.start();
+//    server.start();
-    ClientCache.setSocketIOServer(server);
+//    ClientCache.setSocketIOServer(server);
-    logger.debug("Netty SocketIO启动：{}:{}",host,port);
+//    logger.debug("Netty SocketIO启动：{}:{}",host,port);
  }
 }
@@ -46,7 +46,6 @@ public class AppController extends BaseController {
    private StringRedisTemplate stringRedisTemplate;
    @PreAuthorize("hasAuthority('oa:app:list')")
    @OperationLog
    @ApiOperation("分页查询应用管理记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<App>> page(AppParam param) {
@@ -65,7 +64,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:list')")
    @OperationLog
    @ApiOperation("查询全部应用管理记录表")
    @GetMapping()
    public ApiResult<List<App>> list(AppParam param) {
@@ -74,7 +72,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:list')")
    @OperationLog
    @ApiOperation("根据id查询应用管理记录表")
    @GetMapping("/{id}")
    public ApiResult<App> get(@PathVariable("id") Integer id) {
@@ -83,7 +80,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:save')")
    @OperationLog
    @ApiOperation("添加应用管理记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody App app) {
@@ -104,7 +100,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:update')")
    @OperationLog
    @ApiOperation("修改应用管理记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody App app) {
@@ -115,7 +110,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:remove')")
    @OperationLog
    @ApiOperation("删除应用管理记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -126,7 +120,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:save')")
    @OperationLog
    @ApiOperation("批量添加应用管理记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<App> list) {
@@ -137,7 +130,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:update')")
    @OperationLog
    @ApiOperation("批量修改应用管理记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<App> batchParam) {
@@ -148,7 +140,6 @@ public class AppController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:app:remove')")
    @OperationLog
    @ApiOperation("批量删除应用管理记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -31,7 +31,6 @@ public class AppUserController extends BaseController {
    private AppUserService appUserService;
    @PreAuthorize("hasAuthority('oa:appUser:list')")
    @OperationLog
    @ApiOperation("分页查询应用成员")
    @GetMapping("/page")
    public ApiResult<PageResult<AppUser>> page(AppUserParam param) {
@@ -40,7 +39,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:list')")
    @OperationLog
    @ApiOperation("查询全部应用成员")
    @GetMapping()
    public ApiResult<List<AppUser>> list(AppUserParam param) {
@@ -52,7 +50,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:list')")
    @OperationLog
    @ApiOperation("根据id查询应用成员")
    @GetMapping("/{id}")
    public ApiResult<AppUser> get(@PathVariable("id") Integer id) {
@@ -61,7 +58,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:save')")
    @OperationLog
    @ApiOperation("添加应用成员")
    @PostMapping()
    public ApiResult<?> save(@RequestBody AppUser appUser) {
@@ -76,7 +72,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:update')")
    @OperationLog
    @ApiOperation("修改应用成员")
    @PutMapping()
    public ApiResult<?> update(@RequestBody AppUser appUser) {
@@ -87,7 +82,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:remove')")
    @OperationLog
    @ApiOperation("删除应用成员")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -98,7 +92,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:save')")
    @OperationLog
    @ApiOperation("批量添加应用成员")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<AppUser> list) {
@@ -109,7 +102,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:update')")
    @OperationLog
    @ApiOperation("批量修改应用成员")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<AppUser> batchParam) {
@@ -120,7 +112,6 @@ public class AppUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:appUser:remove')")
    @OperationLog
    @ApiOperation("批量删除应用成员")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -46,7 +46,6 @@ public class AssetsController extends BaseController {
    private BtUtil btUtil;
    @PreAuthorize("hasAuthority('oa:assets:list')")
    @OperationLog
    @ApiOperation("分页查询服务器资产记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Assets>> page(AssetsParam param) {
@@ -75,7 +74,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:list')")
    @OperationLog
    @ApiOperation("查询全部服务器资产记录表")
    @GetMapping()
    public ApiResult<List<Assets>> list(AssetsParam param) {
@@ -84,7 +82,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:list')")
    @OperationLog
    @ApiOperation("根据id查询服务器资产记录表")
    @GetMapping("/{id}")
    public ApiResult<Assets> get(@PathVariable("id") Integer id) {
@@ -99,7 +96,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:save')")
    @OperationLog
    @ApiOperation("添加服务器资产记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Assets assets) {
@@ -118,7 +114,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:update')")
    @OperationLog
    @ApiOperation("修改服务器资产记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Assets assets) {
@@ -129,7 +124,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:remove')")
    @OperationLog
    @ApiOperation("删除服务器资产记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -140,7 +134,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:save')")
    @OperationLog
    @ApiOperation("批量添加服务器资产记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Assets> list) {
@@ -151,7 +144,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:update')")
    @OperationLog
    @ApiOperation("批量修改服务器资产记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Assets> batchParam) {
@@ -162,7 +154,6 @@ public class AssetsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assets:remove')")
    @OperationLog
    @ApiOperation("批量删除服务器资产记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -34,7 +34,6 @@ public class AssetsUserController extends BaseController {
    private AssetsUserService assetsUserService;
    @PreAuthorize("hasAuthority('oa:assetsUser:list')")
    @OperationLog
    @ApiOperation("分页查询服务器成员管理")
    @GetMapping("/page")
    public ApiResult<PageResult<AssetsUser>> page(AssetsUserParam param) {
@@ -43,7 +42,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:list')")
    @OperationLog
    @ApiOperation("查询全部服务器成员管理")
    @GetMapping()
    public ApiResult<List<AssetsUser>> list(AssetsUserParam param) {
@@ -52,7 +50,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:list')")
    @OperationLog
    @ApiOperation("根据id查询服务器成员管理")
    @GetMapping("/{id}")
    public ApiResult<AssetsUser> get(@PathVariable("id") Integer id) {
@@ -61,7 +58,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:save')")
    @OperationLog
    @ApiOperation("添加服务器成员管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody AssetsUser assetsUser) {
@@ -76,7 +72,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:update')")
    @OperationLog
    @ApiOperation("修改服务器成员管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody AssetsUser assetsUser) {
@@ -87,7 +82,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:remove')")
    @OperationLog
    @ApiOperation("删除服务器成员管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -98,7 +92,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:save')")
    @OperationLog
    @ApiOperation("批量添加服务器成员管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<AssetsUser> list) {
@@ -109,7 +102,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:update')")
    @OperationLog
    @ApiOperation("批量修改服务器成员管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<AssetsUser> batchParam) {
@@ -120,7 +112,6 @@ public class AssetsUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:assetsUser:remove')")
    @OperationLog
    @ApiOperation("批量删除服务器成员管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -31,7 +31,6 @@ public class CustomerController extends BaseController {
    private CustomerService customerService;
    @PreAuthorize("hasAuthority('oa:customer:list')")
    @OperationLog
    @ApiOperation("分页查询客户管理记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Customer>> page(CustomerParam param) {
@@ -40,7 +39,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:list')")
    @OperationLog
    @ApiOperation("查询全部客户管理记录表")
    @GetMapping()
    public ApiResult<List<Customer>> list(CustomerParam param) {
@@ -49,7 +47,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:list')")
    @OperationLog
    @ApiOperation("根据id查询客户管理记录表")
    @GetMapping("/{id}")
    public ApiResult<Customer> get(@PathVariable("id") Integer id) {
@@ -58,7 +55,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:save')")
    @OperationLog
    @ApiOperation("添加客户管理记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Customer customer) {
@@ -74,7 +70,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:update')")
    @OperationLog
    @ApiOperation("修改客户管理记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Customer customer) {
@@ -85,7 +80,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:remove')")
    @OperationLog
    @ApiOperation("删除客户管理记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -96,7 +90,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:save')")
    @OperationLog
    @ApiOperation("批量添加客户管理记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Customer> list) {
@@ -107,7 +100,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:update')")
    @OperationLog
    @ApiOperation("批量修改客户管理记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Customer> batchParam) {
@@ -118,7 +110,6 @@ public class CustomerController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:customer:remove')")
    @OperationLog
    @ApiOperation("批量删除客户管理记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class NoticeController extends BaseController {
    private NoticeService noticeService;
    @PreAuthorize("hasAuthority('oa:notice:list')")
    @OperationLog
    @ApiOperation("分页查询消息记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Notice>> page(NoticeParam param) {
@@ -42,7 +41,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:list')")
    @OperationLog
    @ApiOperation("查询全部消息记录表")
    @GetMapping()
    public ApiResult<List<Notice>> list(NoticeParam param) {
@@ -52,7 +50,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:list')")
    @OperationLog
    @ApiOperation("根据id查询消息记录表")
    @GetMapping("/{id}")
    public ApiResult<Notice> get(@PathVariable("id") Integer id) {
@@ -62,7 +59,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:save')")
    @OperationLog
    @ApiOperation("添加消息记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Notice notice) {
@@ -78,7 +74,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:update')")
    @OperationLog
    @ApiOperation("修改消息记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Notice notice) {
@@ -89,7 +84,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:remove')")
    @OperationLog
    @ApiOperation("删除消息记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -100,7 +94,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:save')")
    @OperationLog
    @ApiOperation("批量添加消息记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Notice> list) {
@@ -111,7 +104,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:update')")
    @OperationLog
    @ApiOperation("批量修改消息记录表")
    @PutMapping("/batch")
    public ApiResult<?> updateBatch(@RequestBody List<Notice> list) {
@@ -122,7 +114,6 @@ public class NoticeController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:notice:remove')")
    @OperationLog
    @ApiOperation("批量删除消息记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class ProjectController extends BaseController {
    private ProjectService projectService;
    @PreAuthorize("hasAuthority('oa:project:list')")
    @OperationLog
    @ApiOperation("分页查询项目管理表")
    @GetMapping("/page")
    public ApiResult<PageResult<Project>> page(ProjectParam param) {
@@ -44,7 +43,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:list')")
    @OperationLog
    @ApiOperation("查询全部项目管理表")
    @GetMapping()
    public ApiResult<List<Project>> list(ProjectParam param) {
@@ -56,7 +54,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:list')")
    @OperationLog
    @ApiOperation("根据id查询项目管理表")
    @GetMapping("/{id}")
    public ApiResult<Project> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:save')")
    @OperationLog
    @ApiOperation("添加项目管理表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Project project) {
@@ -82,7 +78,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:update')")
    @OperationLog
    @ApiOperation("修改项目管理表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Project project) {
@@ -93,7 +88,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:remove')")
    @OperationLog
    @ApiOperation("删除项目管理表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -104,7 +98,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:save')")
    @OperationLog
    @ApiOperation("批量添加项目管理表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Project> list) {
@@ -115,7 +108,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:update')")
    @OperationLog
    @ApiOperation("批量修改项目管理表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Project> batchParam) {
@@ -126,7 +118,6 @@ public class ProjectController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:project:remove')")
    @OperationLog
    @ApiOperation("批量删除项目管理表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -44,7 +44,6 @@ public class TaskController extends BaseController {
    private NoticeService noticeService;
    @PreAuthorize("hasAuthority('oa:task:list')")
    @OperationLog
    @ApiOperation("分页查询工单记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Task>> page(TaskParam param) {
@@ -65,7 +64,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:list')")
    @OperationLog
    @ApiOperation("查询全部工单记录表")
    @GetMapping()
    public ApiResult<List<Task>> list(TaskParam param) {
@@ -77,7 +75,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:list')")
    @OperationLog
    @ApiOperation("根据id查询工单记录表")
    @GetMapping("/{id}")
    public ApiResult<Task> get(@PathVariable("id") Integer id) {
@@ -86,7 +83,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:save')")
    @OperationLog
    @ApiOperation("添加工单记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Task task) {
@@ -120,7 +116,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:update')")
    @OperationLog
    @ApiOperation("修改工单记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Task task) {
@@ -136,7 +131,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:remove')")
    @OperationLog
    @ApiOperation("删除工单记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -147,7 +141,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:save')")
    @OperationLog
    @ApiOperation("批量添加工单记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Task> list) {
@@ -158,7 +151,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:update')")
    @OperationLog
    @ApiOperation("批量修改工单记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Task> batchParam) {
@@ -169,7 +161,6 @@ public class TaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:remove')")
    @OperationLog
    @ApiOperation("批量删除工单记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -40,7 +40,6 @@ public class TaskRecordController extends BaseController {
    private NoticeService noticeService;
    @PreAuthorize("hasAuthority('oa:task:list')")
    @OperationLog
    @ApiOperation("分页查询工单回复记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<TaskRecord>> page(TaskRecordParam param) {
@@ -49,7 +48,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:list')")
    @OperationLog
    @ApiOperation("查询全部工单回复记录表")
    @GetMapping()
    public ApiResult<List<TaskRecord>> list(TaskRecordParam param) {
@@ -64,7 +62,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:list')")
    @OperationLog
    @ApiOperation("根据id查询工单回复记录表")
    @GetMapping("/{id}")
    public ApiResult<TaskRecord> get(@PathVariable("id") Integer id) {
@@ -73,7 +70,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:save')")
    @OperationLog
    @ApiOperation("添加工单回复记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody TaskRecord taskRecord) {
@@ -97,7 +93,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:update')")
    @OperationLog
    @ApiOperation("修改工单回复记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody TaskRecord taskRecord) {
@@ -111,7 +106,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:remove')")
    @OperationLog
    @ApiOperation("删除工单回复记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -122,7 +116,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:save')")
    @OperationLog
    @ApiOperation("批量添加工单回复记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<TaskRecord> list) {
@@ -133,7 +126,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:update')")
    @OperationLog
    @ApiOperation("批量修改工单回复记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<TaskRecord> batchParam) {
@@ -144,7 +136,6 @@ public class TaskRecordController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:remove')")
    @OperationLog
    @ApiOperation("批量删除工单回复记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -42,7 +42,6 @@ public class TaskUserController extends BaseController {
    private TaskService taskService;
    @PreAuthorize("hasAuthority('oa:taskUser:list')")
    @OperationLog
    @ApiOperation("分页查询工单成员")
    @GetMapping("/page")
    public ApiResult<PageResult<TaskUser>> page(TaskUserParam param) {
@@ -51,7 +50,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:list')")
    @OperationLog
    @ApiOperation("查询全部工单成员")
    @GetMapping()
    public ApiResult<List<TaskUser>> list(TaskUserParam param) {
@@ -60,7 +58,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:list')")
    @OperationLog
    @ApiOperation("根据id查询工单成员")
    @GetMapping("/{id}")
    public ApiResult<TaskUser> get(@PathVariable("id") Integer id) {
@@ -70,7 +67,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:save')")
    @OperationLog
    @ApiOperation("添加工单成员")
    @PostMapping()
    public ApiResult<?> save(@RequestBody TaskUser taskUser) {
@@ -96,7 +92,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:update')")
    @OperationLog
    @ApiOperation("修改工单成员")
    @PutMapping()
    public ApiResult<?> update(@RequestBody TaskUser taskUser) {
@@ -107,7 +102,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:remove')")
    @OperationLog
    @ApiOperation("删除工单成员")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -118,7 +112,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:save')")
    @OperationLog
    @ApiOperation("批量添加工单成员")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<TaskUser> list) {
@@ -129,7 +122,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:update')")
    @OperationLog
    @ApiOperation("批量修改工单成员")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<TaskUser> batchParam) {
@@ -140,7 +132,6 @@ public class TaskUserController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:taskUser:remove')")
    @OperationLog
    @ApiOperation("批量删除工单成员")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -27,7 +27,6 @@ public class OpenAppUserController extends BaseController {
    @Resource
    private AppUserService appUserService;
    @OperationLog
    @ApiOperation("分页查询应用成员")
    @GetMapping("/page")
    public ApiResult<PageResult<AppUser>> page(AppUserParam param) {
@@ -40,7 +39,6 @@ public class OpenAppUserController extends BaseController {
        //return success(appUserService.pageRel(param));
    }
    @OperationLog
    @ApiOperation("查询全部应用成员")
    @GetMapping()
    public ApiResult<List<AppUser>> list(AppUserParam param) {
@@ -63,7 +61,6 @@ public class OpenAppUserController extends BaseController {
        //return success(appUserService.getByIdRel(id));
    }
    @OperationLog
    @ApiOperation("添加应用成员")
    @PostMapping()
    public ApiResult<?> save(@RequestBody AppUser appUser) {
@@ -88,7 +85,6 @@ public class OpenAppUserController extends BaseController {
        return fail("添加失败");
    }
    @OperationLog
    @ApiOperation("修改应用成员")
    @PutMapping()
    public ApiResult<?> update(@RequestBody AppUser appUser) {
@@ -100,7 +96,6 @@ public class OpenAppUserController extends BaseController {
        return fail("修改失败");
    }
    @OperationLog
    @ApiOperation("删除应用成员")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -116,7 +111,6 @@ public class OpenAppUserController extends BaseController {
        return fail("删除失败");
    }
    @OperationLog
    @ApiOperation("批量添加应用成员")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<AppUser> list) {
@@ -128,7 +122,6 @@ public class OpenAppUserController extends BaseController {
        return fail("添加失败");
    }
    @OperationLog
    @ApiOperation("批量修改应用成员")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<AppUser> batchParam) {
@@ -140,7 +133,6 @@ public class OpenAppUserController extends BaseController {
        return fail("修改失败");
    }
    @OperationLog
    @ApiOperation("批量删除应用成员")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -66,7 +66,6 @@ public class OpenBcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
    @OperationLog
    @ApiOperation("修改代报餐管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcAgent bcAgent) {
@@ -77,7 +76,6 @@ public class OpenBcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
    @OperationLog
    @ApiOperation("删除代报餐管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -88,7 +86,6 @@ public class OpenBcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:save')")
    @OperationLog
    @ApiOperation("批量添加代报餐管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcAgent> list) {
@@ -99,7 +96,6 @@ public class OpenBcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
    @OperationLog
    @ApiOperation("批量修改代报餐管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcAgent> batchParam) {
@@ -110,7 +106,6 @@ public class OpenBcAgentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
    @OperationLog
    @ApiOperation("批量删除代报餐管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -51,7 +51,6 @@ public class OpenBcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
    @OperationLog
    @ApiOperation("根据id查询临时报餐管理")
    @GetMapping("/{id}")
    public ApiResult<BcTemporary> get(@PathVariable("id") Integer id) {
@@ -61,7 +60,6 @@ public class OpenBcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
    @OperationLog
    @ApiOperation("添加临时报餐管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody BcTemporary bcTemporary) {
@@ -72,7 +70,6 @@ public class OpenBcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
    @OperationLog
    @ApiOperation("修改临时报餐管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody BcTemporary bcTemporary) {
@@ -83,7 +80,6 @@ public class OpenBcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
    @OperationLog
    @ApiOperation("删除临时报餐管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -94,7 +90,6 @@ public class OpenBcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
    @OperationLog
    @ApiOperation("批量添加临时报餐管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<BcTemporary> list) {
@@ -105,7 +100,6 @@ public class OpenBcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
    @OperationLog
    @ApiOperation("批量修改临时报餐管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcTemporary> batchParam) {
@@ -116,7 +110,6 @@ public class OpenBcTemporaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
    @OperationLog
    @ApiOperation("批量删除临时报餐管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -46,7 +46,6 @@ public class OpenCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:list')")
    @OperationLog
    @ApiOperation("根据id查询商品分类表")
    @GetMapping("/{id}")
    public ApiResult<Category> get(@PathVariable("id") Integer id) {
@@ -56,7 +55,6 @@ public class OpenCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:save')")
    @OperationLog
    @ApiOperation("添加商品分类表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Category category) {
@@ -72,7 +70,6 @@ public class OpenCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:update')")
    @OperationLog
    @ApiOperation("修改商品分类表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Category category) {
@@ -83,7 +80,6 @@ public class OpenCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:remove')")
    @OperationLog
    @ApiOperation("删除商品分类表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -94,7 +90,6 @@ public class OpenCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:save')")
    @OperationLog
    @ApiOperation("批量添加商品分类表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Category> list) {
@@ -105,7 +100,6 @@ public class OpenCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:update')")
    @OperationLog
    @ApiOperation("批量修改商品分类表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Category> batchParam) {
@@ -116,7 +110,6 @@ public class OpenCategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:remove')")
    @OperationLog
    @ApiOperation("批量删除商品分类表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -33,7 +33,6 @@ public class OpenDictController extends BaseController {
    private DictService dictService;
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("分页查询字典")
    @GetMapping("/page")
    public ApiResult<PageResult<Dict>> page(DictParam param) {
@@ -43,7 +42,6 @@ public class OpenDictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("查询全部字典")
    @GetMapping()
    public ApiResult<List<Dict>> list(DictParam param) {
@@ -53,7 +51,6 @@ public class OpenDictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("根据id查询字典")
    @GetMapping("/{id}")
    public ApiResult<Dict> get(@PathVariable("id") Integer id) {
@@ -79,7 +76,6 @@ public class OpenDictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:update')")
    @OperationLog
    @ApiOperation("修改字典")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Dict dict) {
@@ -100,7 +96,6 @@ public class OpenDictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("删除字典")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -111,7 +106,6 @@ public class OpenDictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("批量添加字典")
    @PostMapping("/batch")
    public ApiResult<List<String>> saveBatch(@RequestBody List<Dict> list) {
@@ -142,7 +136,6 @@ public class OpenDictController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("批量删除字典")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -30,7 +30,6 @@ public class OpenDictDataController extends BaseController {
    private DictDataService dictDataService;
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("分页查询字典数据")
    @GetMapping("/page")
    public ApiResult<PageResult<DictData>> page(DictDataParam param) {
@@ -38,7 +37,6 @@ public class OpenDictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("查询全部字典数据")
    @GetMapping()
    public ApiResult<List<DictData>> list(DictDataParam param) {
@@ -46,7 +44,6 @@ public class OpenDictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("根据id查询字典数据")
    @GetMapping("/{id}")
    public ApiResult<DictData> get(@PathVariable("id") Integer id) {
@@ -54,7 +51,6 @@ public class OpenDictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("添加字典数据")
    @PostMapping()
    public ApiResult<?> add(@RequestBody DictData dictData) {
@@ -75,7 +71,6 @@ public class OpenDictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:update')")
    @OperationLog
    @ApiOperation("修改字典数据")
    @PutMapping()
    public ApiResult<?> update(@RequestBody DictData dictData) {
@@ -98,7 +93,6 @@ public class OpenDictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("删除字典数据")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -109,7 +103,6 @@ public class OpenDictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("批量添加字典数据")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<DictData> dictDataList) {
@@ -120,7 +113,6 @@ public class OpenDictDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("批量删除字典数据")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -33,7 +33,6 @@ public class OpenDictionaryController extends BaseController {
    private DictionaryService dictionaryService;
    @PreAuthorize("hasAuthority('sys:dictionary:list')")
    @OperationLog
    @ApiOperation("分页查询字典")
    @GetMapping("/page")
    public ApiResult<PageResult<Dictionary>> page(DictionaryParam param) {
@@ -43,7 +42,6 @@ public class OpenDictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:list')")
    @OperationLog
    @ApiOperation("查询全部字典")
    @GetMapping()
    public ApiResult<List<Dictionary>> list(DictionaryParam param) {
@@ -53,7 +51,6 @@ public class OpenDictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:list')")
    @OperationLog
    @ApiOperation("根据id查询字典")
    @GetMapping("/{id}")
    public ApiResult<Dictionary> get(@PathVariable("id") Integer id) {
@@ -79,7 +76,6 @@ public class OpenDictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:update')")
    @OperationLog
    @ApiOperation("修改字典")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Dictionary dictionary) {
@@ -100,7 +96,6 @@ public class OpenDictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
    @OperationLog
    @ApiOperation("删除字典")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -111,7 +106,6 @@ public class OpenDictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:save')")
    @OperationLog
    @ApiOperation("批量添加字典")
    @PostMapping("/batch")
    public ApiResult<List<String>> saveBatch(@RequestBody List<Dictionary> list) {
@@ -142,7 +136,6 @@ public class OpenDictionaryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
    @OperationLog
    @ApiOperation("批量删除字典")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -30,7 +30,6 @@ public class OpenDictionaryDataController extends BaseController {
    private DictionaryDataService dictionaryDataService;
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("分页查询字典数据")
    @GetMapping("/page")
    public ApiResult<PageResult<DictionaryData>> page(DictionaryDataParam param) {
@@ -38,7 +37,6 @@ public class OpenDictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("查询全部字典数据")
    @GetMapping()
    public ApiResult<List<DictionaryData>> list(DictionaryDataParam param) {
@@ -46,7 +44,6 @@ public class OpenDictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:list')")
    @OperationLog
    @ApiOperation("根据id查询字典数据")
    @GetMapping("/{id}")
    public ApiResult<DictionaryData> get(@PathVariable("id") Integer id) {
@@ -54,7 +51,6 @@ public class OpenDictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("添加字典数据")
    @PostMapping()
    public ApiResult<?> add(@RequestBody DictionaryData dictionaryData) {
@@ -75,7 +71,6 @@ public class OpenDictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:update')")
    @OperationLog
    @ApiOperation("修改字典数据")
    @PutMapping()
    public ApiResult<?> update(@RequestBody DictionaryData dictionaryData) {
@@ -98,7 +93,6 @@ public class OpenDictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("删除字典数据")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -109,7 +103,6 @@ public class OpenDictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:save')")
    @OperationLog
    @ApiOperation("批量添加字典数据")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<DictionaryData> dictDataList) {
@@ -120,7 +113,6 @@ public class OpenDictionaryDataController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:dict:remove')")
    @OperationLog
    @ApiOperation("批量删除字典数据")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -52,7 +52,6 @@ public class OpenDocsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:docs:save')")
    @OperationLog
    @ApiOperation("添加文档管理记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Docs docs) {
@@ -68,7 +67,6 @@ public class OpenDocsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:docs:update')")
    @OperationLog
    @ApiOperation("修改文档管理记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Docs docs) {
@@ -79,7 +77,6 @@ public class OpenDocsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:docs:remove')")
    @OperationLog
    @ApiOperation("删除文档管理记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -92,7 +89,6 @@ public class OpenDocsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:docs:save')")
    @OperationLog
    @ApiOperation("批量添加文档管理记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Docs> list) {
@@ -105,7 +101,6 @@ public class OpenDocsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:docs:update')")
    @OperationLog
    @ApiOperation("批量修改文档管理记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Docs> batchParam) {
@@ -118,7 +113,6 @@ public class OpenDocsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('cms:docs:remove')")
    @OperationLog
    @ApiOperation("批量删除文档管理记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -58,7 +58,6 @@ public class OpenEquipmentController extends BaseController {
    private OrderRefundService orderRefundService;
    @PreAuthorize("hasAuthority('apps:equipment:list')")
    @OperationLog
    @ApiOperation("分页查询设备管理")
    @GetMapping("/page")
    public ApiResult<PageResult<Equipment>> page(EquipmentParam param) {
@@ -72,7 +71,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:list')")
    @OperationLog
    @ApiOperation("查询全部设备管理")
    @GetMapping()
    public ApiResult<List<Equipment>> list(EquipmentParam param) {
@@ -84,7 +82,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:list')")
    @OperationLog
    @ApiOperation("根据id查询设备管理")
    @GetMapping("/{id}")
    public ApiResult<Equipment> get(@PathVariable("id") Integer id) {
@@ -94,7 +91,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:save')")
    @OperationLog
    @ApiOperation("添加设备管理")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Equipment equipment) throws AlipayApiException {
@@ -118,7 +114,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:update')")
    @OperationLog
    @ApiOperation("修改设备管理")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Equipment equipment) throws AlipayApiException {
@@ -133,7 +128,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:remove')")
    @OperationLog
    @ApiOperation("删除设备管理")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -144,7 +138,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:save')")
    @OperationLog
    @ApiOperation("批量添加设备管理")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Equipment> list) {
@@ -155,7 +148,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:update')")
    @OperationLog
    @ApiOperation("批量修改设备管理")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Equipment> batchParam) {
@@ -166,7 +158,6 @@ public class OpenEquipmentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('apps:equipment:remove')")
    @OperationLog
    @ApiOperation("批量删除设备管理")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -40,7 +40,6 @@ public class OpenFileController extends BaseController {
    @Resource
    private FileRecordService fileRecordService;
    @OperationLog
    @ApiOperation("上传文件")
    @PostMapping("/upload")
    public ApiResult<FileRecord> upload(@RequestParam MultipartFile file, HttpServletRequest request) {
@@ -74,7 +73,6 @@ public class OpenFileController extends BaseController {
        }
    }
    @OperationLog
    @ApiOperation("上传base64文件")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "base64", value = "base64", required = true, dataType = "string", dataTypeClass = String.class),
@@ -106,7 +104,6 @@ public class OpenFileController extends BaseController {
        }
    }
    @OperationLog
    @ApiOperation("根据id查询文件")
    @GetMapping("/{id}")
    public ApiResult<FileRecord> get(@PathVariable("id") Integer id) {
@@ -149,7 +146,6 @@ public class OpenFileController extends BaseController {
        FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request);
    }
    @OperationLog
    @ApiOperation("删除文件")
    @DeleteMapping("/remove/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -168,7 +164,6 @@ public class OpenFileController extends BaseController {
        return fail("删除失败");
    }
    @OperationLog
    @ApiOperation("批量删除文件")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class)
@@ -192,7 +187,6 @@ public class OpenFileController extends BaseController {
        return fail("删除失败");
    }
    @OperationLog
    @ApiOperation("分页查询文件")
    @GetMapping("/page")
    public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
@@ -217,7 +211,6 @@ public class OpenFileController extends BaseController {
        return success(result);
    }
    @OperationLog
    @ApiOperation("查询全部文件")
    @GetMapping("/list")
    public ApiResult<List<FileRecord>> list(FileRecordParam param, HttpServletRequest request) {
@@ -274,7 +267,6 @@ public class OpenFileController extends BaseController {
        return getUploadBaseDir() + "pdf/";
    }
    @OperationLog
    @ApiOperation("添加文件")
    @PostMapping()
    public ApiResult<?> save(@RequestBody FileRecord fileRecord) {
@@ -286,7 +278,6 @@ public class OpenFileController extends BaseController {
      return fail("上传失败");
    }
    @OperationLog
    @ApiOperation("修改文件")
    @PutMapping()
    public ApiResult<?> update(@RequestBody FileRecord fileRecord) {
@@ -776,7 +776,6 @@ public class OpenMainController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:user')")
    @OperationLog
    @ApiOperation("修改个人信息")
    @PutMapping("/auth/user")
    public ApiResult<User> updateInfo(@RequestBody User user) {
@@ -797,7 +796,6 @@ public class OpenMainController extends BaseController {
    }
    @PreAuthorize("hasAuthority('sys:auth:password')")
    @OperationLog
    @ApiOperation("修改自己密码")
    @PutMapping("/auth/password")
    public ApiResult<?> updatePassword(@RequestBody UpdatePasswordParam param) {
@@ -871,7 +869,6 @@ public class OpenMainController extends BaseController {
      return fail("发送失败");
    }
    @OperationLog
    @ApiOperation("重置密码")
    @PutMapping("/password")
    public ApiResult<?> resetPassword(@RequestBody User user) {
@@ -86,7 +86,6 @@ public class OpenMarketController extends BaseController {
        return success(appService.getByIdRel(id));
    }
    @OperationLog
    @ApiOperation("排行榜")
    @GetMapping("/ranking")
    public ApiResult<?> ranking(UserParam param) {
@@ -45,7 +45,6 @@ public class OpenOrderGoodsController extends BaseController {
    private OrderService orderService;
    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
    @OperationLog
    @ApiOperation("分页查询订单商品记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<OrderGoods>> page(OrderGoodsParam param) {
@@ -57,7 +56,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
    @OperationLog
    @ApiOperation("查询全部订单商品记录表")
    @GetMapping()
    public ApiResult<List<OrderGoods>> list(OrderGoodsParam param) {
@@ -69,7 +67,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
    @OperationLog
    @ApiOperation("根据id查询订单商品记录表")
    @GetMapping("/{id}")
    public ApiResult<OrderGoods> get(@PathVariable("id") Integer id) {
@@ -79,7 +76,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:save')")
    @OperationLog
    @ApiOperation("添加订单商品记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody OrderGoods orderGoods) {
@@ -96,7 +92,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:update')")
    @OperationLog
    @ApiOperation("修改订单商品记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody OrderGoods orderGoods) {
@@ -107,7 +102,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:remove')")
    @OperationLog
    @ApiOperation("删除订单商品记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -118,7 +112,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:save')")
    @OperationLog
    @ApiOperation("批量添加订单商品记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<OrderGoods> list) {
@@ -129,7 +122,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:update')")
    @OperationLog
    @ApiOperation("批量修改订单商品记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderGoods> batchParam) {
@@ -140,7 +132,6 @@ public class OpenOrderGoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:orderGoods:remove')")
    @OperationLog
    @ApiOperation("批量删除订单商品记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -73,7 +73,6 @@ public class OpenTaskController extends BaseController {
    }
    @PreAuthorize("hasAuthority('oa:task:list')")
    @OperationLog
    @ApiOperation("根据id查询工单记录表")
    @GetMapping("/{id}")
    public ApiResult<Task> get(@PathVariable("id") Integer id) {
@@ -69,8 +69,7 @@ public class OpenWxOfficialController extends BaseController {
  public OpenWxOfficialController() {
  }
-  @OperationLog
+  @ApiOperation("第一步：用户同意授权，获取code")
    @ApiOperation("第一步：用户同意授权，获取code")
    @GetMapping("/code")
    public ApiResult<?> code() throws UnsupportedEncodingException {
      WxOfficialUtil client = wxOfficialUtil.client(getTenantId());
@@ -78,7 +77,6 @@ public class OpenWxOfficialController extends BaseController {
      return success(codeUrl);
    }
    @OperationLog
    @Transactional(rollbackFor = Exception.class)
    @ApiOperation("第二步：通过code换取网页授权access_token")
    @GetMapping("/accessToken")
@@ -63,7 +63,6 @@ public class OpenWxWorkController extends BaseController {
    @Resource
    private UserRoleService userRoleService;
    @OperationLog
    @ApiOperation("第一步：请求验证URL有效性")
    @GetMapping()
    public String msgSignature(HttpServletRequest request) throws AesException {
@@ -34,7 +34,6 @@ public class CartController extends BaseController {
    private StringRedisTemplate stringRedisTemplate;
    @PreAuthorize("hasAuthority('shop:cart:list')")
    @OperationLog
    @ApiOperation("分页查询购物车记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Cart>> page(CartParam param) {
@@ -46,7 +45,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:list')")
    @OperationLog
    @ApiOperation("查询全部购物车记录表")
    @GetMapping()
    public ApiResult<List<Cart>> list(CartParam param) {
@@ -59,7 +57,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:list')")
    @OperationLog
    @ApiOperation("根据id查询购物车记录表")
    @GetMapping("/{id}")
    public ApiResult<Cart> get(@PathVariable("id") Integer id) {
@@ -69,7 +66,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:save')")
    @OperationLog
    @ApiOperation("添加购物车记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Cart cart) {
@@ -91,7 +87,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:update')")
    @OperationLog
    @ApiOperation("修改购物车记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Cart cart) {
@@ -102,7 +97,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:remove')")
    @OperationLog
    @ApiOperation("删除购物车记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -113,7 +107,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:save')")
    @OperationLog
    @ApiOperation("批量添加购物车记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Cart> list) {
@@ -124,7 +117,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:update')")
    @OperationLog
    @ApiOperation("批量修改购物车记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Cart> batchParam) {
@@ -135,7 +127,6 @@ public class CartController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:cart:remove')")
    @OperationLog
    @ApiOperation("批量删除购物车记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class CategoryController extends BaseController {
    private CategoryService categoryService;
    @PreAuthorize("hasAuthority('shop:category:list')")
    @OperationLog
    @ApiOperation("分页查询商品分类表")
    @GetMapping("/page")
    public ApiResult<PageResult<Category>> page(CategoryParam param) {
@@ -45,7 +44,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:list')")
    @OperationLog
    @ApiOperation("查询全部商品分类表")
    @GetMapping()
    public ApiResult<List<Category>> list(CategoryParam param) {
@@ -58,7 +56,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:list')")
    @OperationLog
    @ApiOperation("根据id查询商品分类表")
    @GetMapping("/{id}")
    public ApiResult<Category> get(@PathVariable("id") Integer id) {
@@ -68,7 +65,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:save')")
    @OperationLog
    @ApiOperation("添加商品分类表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Category category) {
@@ -84,7 +80,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:update')")
    @OperationLog
    @ApiOperation("修改商品分类表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Category category) {
@@ -95,7 +90,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:remove')")
    @OperationLog
    @ApiOperation("删除商品分类表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -106,7 +100,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:save')")
    @OperationLog
    @ApiOperation("批量添加商品分类表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Category> list) {
@@ -117,7 +110,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:update')")
    @OperationLog
    @ApiOperation("批量修改商品分类表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Category> batchParam) {
@@ -128,7 +120,6 @@ public class CategoryController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:category:remove')")
    @OperationLog
    @ApiOperation("批量删除商品分类表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class CommentController extends BaseController {
    private CommentService commentService;
    @PreAuthorize("hasAuthority('shop:comment:list')")
    @OperationLog
    @ApiOperation("分页查询商品评价记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Comment>> page(CommentParam param) {
@@ -44,7 +43,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:list')")
    @OperationLog
    @ApiOperation("查询全部商品评价记录表")
    @GetMapping()
    public ApiResult<List<Comment>> list(CommentParam param) {
@@ -56,7 +54,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:list')")
    @OperationLog
    @ApiOperation("根据id查询商品评价记录表")
    @GetMapping("/{id}")
    public ApiResult<Comment> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:save')")
    @OperationLog
    @ApiOperation("添加商品评价记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Comment comment) {
@@ -82,7 +78,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:update')")
    @OperationLog
    @ApiOperation("修改商品评价记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Comment comment) {
@@ -93,7 +88,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:remove')")
    @OperationLog
    @ApiOperation("删除商品评价记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -104,7 +98,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:save')")
    @OperationLog
    @ApiOperation("批量添加商品评价记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Comment> list) {
@@ -115,7 +108,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:update')")
    @OperationLog
    @ApiOperation("批量修改商品评价记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Comment> batchParam) {
@@ -126,7 +118,6 @@ public class CommentController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:comment:remove')")
    @OperationLog
    @ApiOperation("批量删除商品评价记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class CouponController extends BaseController {
    private CouponService couponService;
    @PreAuthorize("hasAuthority('shop:coupon:list')")
    @OperationLog
    @ApiOperation("分页查询优惠券记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Coupon>> page(CouponParam param) {
@@ -44,7 +43,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:list')")
    @OperationLog
    @ApiOperation("查询全部优惠券记录表")
    @GetMapping()
    public ApiResult<List<Coupon>> list(CouponParam param) {
@@ -56,7 +54,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:list')")
    @OperationLog
    @ApiOperation("根据id查询优惠券记录表")
    @GetMapping("/{id}")
    public ApiResult<Coupon> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:save')")
    @OperationLog
    @ApiOperation("添加优惠券记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Coupon coupon) {
@@ -82,7 +78,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:update')")
    @OperationLog
    @ApiOperation("修改优惠券记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Coupon coupon) {
@@ -93,7 +88,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:remove')")
    @OperationLog
    @ApiOperation("删除优惠券记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -104,7 +98,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:save')")
    @OperationLog
    @ApiOperation("批量添加优惠券记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Coupon> list) {
@@ -115,7 +108,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:update')")
    @OperationLog
    @ApiOperation("批量修改优惠券记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Coupon> batchParam) {
@@ -126,7 +118,6 @@ public class CouponController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:coupon:remove')")
    @OperationLog
    @ApiOperation("批量删除优惠券记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -32,7 +32,6 @@ public class ExpressController extends BaseController {
    private ExpressService expressService;
    @PreAuthorize("hasAuthority('shop:express:list')")
    @OperationLog
    @ApiOperation("分页查询物流公司记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Express>> page(ExpressParam param) {
@@ -44,7 +43,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:list')")
    @OperationLog
    @ApiOperation("查询全部物流公司记录表")
    @GetMapping()
    public ApiResult<List<Express>> list(ExpressParam param) {
@@ -56,7 +54,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:list')")
    @OperationLog
    @ApiOperation("根据id查询物流公司记录表")
    @GetMapping("/{id}")
    public ApiResult<Express> get(@PathVariable("id") Integer id) {
@@ -66,7 +63,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:save')")
    @OperationLog
    @ApiOperation("添加物流公司记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Express express) {
@@ -82,7 +78,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:update')")
    @OperationLog
    @ApiOperation("修改物流公司记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Express express) {
@@ -93,7 +88,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:remove')")
    @OperationLog
    @ApiOperation("删除物流公司记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -104,7 +98,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:save')")
    @OperationLog
    @ApiOperation("批量添加物流公司记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Express> list) {
@@ -115,7 +108,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:update')")
    @OperationLog
    @ApiOperation("批量修改物流公司记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Express> batchParam) {
@@ -126,7 +118,6 @@ public class ExpressController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:express:remove')")
    @OperationLog
    @ApiOperation("批量删除物流公司记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -31,7 +31,6 @@ public class GoodsController extends BaseController {
    private GoodsService goodsService;
    @PreAuthorize("hasAuthority('shop:goods:list')")
    @OperationLog
    @ApiOperation("分页查询商品记录表")
    @GetMapping("/page")
    public ApiResult<PageResult<Goods>> page(GoodsParam param) {
@@ -43,7 +42,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:list')")
    @OperationLog
    @ApiOperation("查询全部商品记录表")
    @GetMapping()
    public ApiResult<List<Goods>> list(GoodsParam param) {
@@ -55,7 +53,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:list')")
    @OperationLog
    @ApiOperation("根据id查询商品记录表")
    @GetMapping("/{id}")
    public ApiResult<Goods> get(@PathVariable("id") Integer id) {
@@ -65,7 +62,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:save')")
    @OperationLog
    @ApiOperation("添加商品记录表")
    @PostMapping()
    public ApiResult<?> save(@RequestBody Goods goods) {
@@ -81,7 +77,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:update')")
    @OperationLog
    @ApiOperation("修改商品记录表")
    @PutMapping()
    public ApiResult<?> update(@RequestBody Goods goods) {
@@ -92,7 +87,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:remove')")
    @OperationLog
    @ApiOperation("删除商品记录表")
    @DeleteMapping("/{id}")
    public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -103,7 +97,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:save')")
    @OperationLog
    @ApiOperation("批量添加商品记录表")
    @PostMapping("/batch")
    public ApiResult<?> saveBatch(@RequestBody List<Goods> list) {
@@ -114,7 +107,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:update')")
    @OperationLog
    @ApiOperation("批量修改商品记录表")
    @PutMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody BatchParam<Goods> batchParam) {
@@ -125,7 +117,6 @@ public class GoodsController extends BaseController {
    }
    @PreAuthorize("hasAuthority('shop:goods:remove')")
    @OperationLog
    @ApiOperation("批量删除商品记录表")
    @DeleteMapping("/batch")
    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
--- a/Show More
+++ b/Show More