From c783cfb4920ae50fb549787660bef4e6d25a7d82 Mon Sep 17 00:00:00 2001 From: tongliran Date: Mon, 30 Dec 2024 17:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B7=E5=8D=A1=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=92=8C=E8=AE=BE=E5=A4=87=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90=EF=BC=9B=E5=9C=A8?= =?UTF-8?q?=E5=88=B7=E5=8D=A1=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?userName=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardSwipeRecords/NgCardSwipeRecordsController.java | 8 +------- .../NgDeviceOperationRecordsController.java | 6 ------ .../java/com/fastbee/iot/domain/NgCardSwipeRecords.java | 5 +++++ .../resources/mapper/iot/NgCardSwipeRecordsMapper.xml | 8 +++++++- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/cardSwipeRecords/NgCardSwipeRecordsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/cardSwipeRecords/NgCardSwipeRecordsController.java index dc584d5..8ca5a99 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/cardSwipeRecords/NgCardSwipeRecordsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/cardSwipeRecords/NgCardSwipeRecordsController.java @@ -41,7 +41,7 @@ public class NgCardSwipeRecordsController extends BaseController /** * 用户查询刷卡记录列表 */ - @PreAuthorize("@ss.hasPermi('iot:records:list')") + @GetMapping("/list/user") @ApiOperation("查询刷卡记录列表") public TableDataInfo userList(NgCardSwipeRecords ngCardSwipeRecords) @@ -54,7 +54,6 @@ public class NgCardSwipeRecordsController extends BaseController /** * 查询刷卡记录列表 */ - @PreAuthorize("@ss.hasPermi('iot:records:list')") @GetMapping("/list") @ApiOperation("查询刷卡记录列表") public TableDataInfo list(NgCardSwipeRecords ngCardSwipeRecords) @@ -69,7 +68,6 @@ public class NgCardSwipeRecordsController extends BaseController * 导出刷卡记录列表 */ @ApiOperation("导出刷卡记录列表") - @PreAuthorize("@ss.hasPermi('iot:records:export')") @PostMapping("/export") public void export(HttpServletResponse response, NgCardSwipeRecords ngCardSwipeRecords) { @@ -81,7 +79,6 @@ public class NgCardSwipeRecordsController extends BaseController /** * 获取刷卡记录详细信息 */ - @PreAuthorize("@ss.hasPermi('iot:records:query')") @GetMapping(value = "/{id}") @ApiOperation("获取刷卡记录详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -92,7 +89,6 @@ public class NgCardSwipeRecordsController extends BaseController /** * 新增刷卡记录 */ - @PreAuthorize("@ss.hasPermi('iot:records:add')") @PostMapping @ApiOperation("新增刷卡记录") public AjaxResult add(@RequestBody NgCardSwipeRecords ngCardSwipeRecords) @@ -103,7 +99,6 @@ public class NgCardSwipeRecordsController extends BaseController /** * 修改刷卡记录 */ - @PreAuthorize("@ss.hasPermi('iot:records:edit')") @PutMapping @ApiOperation("修改刷卡记录") public AjaxResult edit(@RequestBody NgCardSwipeRecords ngCardSwipeRecords) @@ -114,7 +109,6 @@ public class NgCardSwipeRecordsController extends BaseController /** * 删除刷卡记录 */ - @PreAuthorize("@ss.hasPermi('iot:records:remove')") @DeleteMapping("/{ids}") @ApiOperation("删除刷卡记录") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceOperationRecords/NgDeviceOperationRecordsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceOperationRecords/NgDeviceOperationRecordsController.java index 3486037..19c4a1d 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceOperationRecords/NgDeviceOperationRecordsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceOperationRecords/NgDeviceOperationRecordsController.java @@ -41,7 +41,6 @@ public class NgDeviceOperationRecordsController extends BaseController /** * 查询设备操作记录列表 */ - @PreAuthorize("@ss.hasPermi('iot:records:list')") @GetMapping("/list") @ApiOperation("查询设备操作记录列表") public TableDataInfo list(NgDeviceOperationRecords ngDeviceOperationRecords) @@ -55,7 +54,6 @@ public class NgDeviceOperationRecordsController extends BaseController * 导出设备操作记录列表 */ @ApiOperation("导出设备操作记录列表") - @PreAuthorize("@ss.hasPermi('iot:records:export')") @PostMapping("/export") public void export(HttpServletResponse response, NgDeviceOperationRecords ngDeviceOperationRecords) { @@ -67,7 +65,6 @@ public class NgDeviceOperationRecordsController extends BaseController /** * 获取设备操作记录详细信息 */ - @PreAuthorize("@ss.hasPermi('iot:records:query')") @GetMapping(value = "/{id}") @ApiOperation("获取设备操作记录详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -78,7 +75,6 @@ public class NgDeviceOperationRecordsController extends BaseController /** * 新增设备操作记录 */ - @PreAuthorize("@ss.hasPermi('iot:records:add')") @PostMapping @ApiOperation("新增设备操作记录") public AjaxResult add(@RequestBody NgDeviceOperationRecords ngDeviceOperationRecords) @@ -89,7 +85,6 @@ public class NgDeviceOperationRecordsController extends BaseController /** * 修改设备操作记录 */ - @PreAuthorize("@ss.hasPermi('iot:records:edit')") @PutMapping @ApiOperation("修改设备操作记录") public AjaxResult edit(@RequestBody NgDeviceOperationRecords ngDeviceOperationRecords) @@ -100,7 +95,6 @@ public class NgDeviceOperationRecordsController extends BaseController /** * 删除设备操作记录 */ - @PreAuthorize("@ss.hasPermi('iot:records:remove')") @DeleteMapping("/{ids}") @ApiOperation("删除设备操作记录") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java index b1daaaa..a414076 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgCardSwipeRecords.java @@ -69,4 +69,9 @@ public class NgCardSwipeRecords extends BaseEntity @ApiModelProperty("区域码") private String areaCode; + /** 用户名称 */ + @Excel(name = "用户名称") + @ApiModelProperty("用户名称") + private String userName; + } diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml index a757f1c..7881b44 100644 --- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml +++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/NgCardSwipeRecordsMapper.xml @@ -19,10 +19,11 @@ + - select id, user_id, device_number, card_swipe_type, card_number, dept_id, card_swipe_time, amount_due, area_code, remark, create_time, update_time, create_by, update_by from ng_card_swipe_records + select id, user_id, device_number, card_swipe_type, card_number, dept_id, card_swipe_time, amount_due, area_code, remark, create_time, update_time, create_by, update_by, user_name from ng_card_swipe_records @@ -50,6 +52,7 @@ and card_swipe_time = #{cardSwipeTime} and amount_due = #{amountDue} and area_code = #{areaCode} + and user_name like concat('%', #{userName}, '%') @@ -74,6 +77,7 @@ update_time, create_by, update_by, + user_name, #{userId}, @@ -89,6 +93,7 @@ #{updateTime}, #{createBy}, #{updateBy}, + #{userName}, @@ -108,6 +113,7 @@ update_time = #{updateTime}, create_by = #{createBy}, update_by = #{updateBy}, + user_name = #{userName}, where id = #{id}