From 5c1c29ee4abd2c34be981f15a26814c346880733 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Thu, 19 Dec 2024 23:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../printer/yilianyun/GenerateQRCodeImage.java | 6 +++--- .../UserConsumptionDetailsController.java | 2 +- .../UserRechargeCardsController.java | 14 +++++++------- .../userRecharge/UserRechargeController.java | 2 +- .../devlink/service/ZhanLianCountService.java | 18 ------------------ 5 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/ZhanLianCountService.java diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/yilianyun/GenerateQRCodeImage.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/yilianyun/GenerateQRCodeImage.java index fa55c6d..f0357b7 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/yilianyun/GenerateQRCodeImage.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/printer/yilianyun/GenerateQRCodeImage.java @@ -84,7 +84,7 @@ public class GenerateQRCodeImage { g2d.drawString(text1, textX, textY1); // 绘制第二段文字 - String text2 = "◉ 系列:"+deviceReportInfo.getMcuFw(); + String text2 = "◉系列:"+deviceReportInfo.getMcuFw(); g2d.setFont(new Font("Dialog", Font.BOLD, 18)); @@ -93,7 +93,7 @@ public class GenerateQRCodeImage { g2d.drawString(text2, textX, textY2); // 绘制第三段文字 - String text3 = "◉ 型号:" + deviceReportInfo.getBspType()+deviceReportInfo.getLteType()+""; + String text3 = "◉型号:" + deviceReportInfo.getBspType()+deviceReportInfo.getLteType()+""; int textY3 = textY2 + fontMetrics.getHeight() + 10; // 在第一段文字下方添加一些间距 @@ -101,7 +101,7 @@ public class GenerateQRCodeImage { g2d.drawString(text3, textX, textY3); //绘制第三段文字 - String text4 = "◉ 批次:" + deviceReportInfo.getBatchNumber(); + String text4 = "◉批次:" + deviceReportInfo.getBatchNumber(); int textY4 = textY3 + fontMetrics.getHeight() + 10; // 在第一段文字下方添加一些间距 diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java index a905338..b81caa4 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java @@ -54,7 +54,7 @@ public class UserConsumptionDetailsController extends BaseController /** * 查询用户充值卡账单明细记录列表 */ - @PreAuthorize("@ss.hasPermi('rechargecard:details:list')") +// @PreAuthorize("@ss.hasPermi('rechargecard:details:list')") @GetMapping("/list/show") @ApiOperation("查询用户充值卡账单明细记录展示列表") public TableDataInfo Showlist(UserConsumptionDetails userConsumptionDetails) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeCardsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeCardsController.java index 0f2d529..3cd4cb4 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeCardsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeCardsController.java @@ -41,7 +41,7 @@ public class UserRechargeCardsController extends BaseController /** * 测试 */ - @PreAuthorize("@ss.hasPermi('rechargecard:cards:query')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:query')") @GetMapping(value = "/test/{id}") @ApiOperation("获取用户充值卡详细信息") public AjaxResult test(@PathVariable("id") Long id) @@ -53,7 +53,7 @@ public class UserRechargeCardsController extends BaseController /** * 查询用户充值卡列表 */ - @PreAuthorize("@ss.hasPermi('rechargecard:cards:list')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:list')") @GetMapping("/list") @ApiOperation("查询用户充值卡列表") public TableDataInfo list(UserRechargeCards userRechargeCards) @@ -67,7 +67,7 @@ public class UserRechargeCardsController extends BaseController * 导出用户充值卡列表 */ @ApiOperation("导出用户充值卡列表") - @PreAuthorize("@ss.hasPermi('rechargecard:cards:export')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:export')") @PostMapping("/export") public void export(HttpServletResponse response, UserRechargeCards userRechargeCards) { @@ -79,7 +79,7 @@ public class UserRechargeCardsController extends BaseController /** * 获取用户充值卡详细信息 */ - @PreAuthorize("@ss.hasPermi('rechargecard:cards:query')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:query')") @GetMapping(value = "/{id}") @ApiOperation("获取用户充值卡详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -91,7 +91,7 @@ public class UserRechargeCardsController extends BaseController /** * 新增用户充值卡 */ - @PreAuthorize("@ss.hasPermi('rechargecard:cards:add')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:add')") @PostMapping @ApiOperation("新增用户充值卡") public AjaxResult add(@RequestBody UserRechargeCards userRechargeCards) @@ -102,7 +102,7 @@ public class UserRechargeCardsController extends BaseController /** * 修改用户充值卡 */ - @PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')") @PutMapping @ApiOperation("修改用户充值卡") public AjaxResult edit(@RequestBody UserRechargeCards userRechargeCards) @@ -113,7 +113,7 @@ public class UserRechargeCardsController extends BaseController /** * 删除用户充值卡 */ - @PreAuthorize("@ss.hasPermi('rechargecard:cards:remove')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:remove')") @DeleteMapping("/{id}") @ApiOperation("删除用户充值卡") public AjaxResult remove(@PathVariable Long id) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java index 8bd159f..ede38e8 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserRechargeController.java @@ -30,7 +30,7 @@ public class UserRechargeController extends BaseController { /** * 修改用户充值卡金额 */ - @PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')") +// @PreAuthorize("@ss.hasPermi('rechargecard:cards:edit')") @PutMapping @ApiOperation("修改用户充值卡") public AjaxResult result(@RequestBody RechargecardUser rechargecardUser) diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/ZhanLianCountService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/ZhanLianCountService.java deleted file mode 100644 index fd1f904..0000000 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/ZhanLianCountService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fastbee.deviceData.api.devlink.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class ZhanLianCountService { - @Autowired - private ZhanLianAuthorizationService authorizationService; - - - /** - * 统计在线设备数量 - */ - public void countOnlineDevice() { -// authorizationService.countOnlineDevice(); - } -}