From 23a801ec69215515a37e16f08e25f26495833fbb Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Fri, 21 Jun 2024 15:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E7=9C=8B=E5=85=A8=E9=83=A8=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screendata/factory/FactoryScreenDataController.java | 9 +++++++++ .../service/screendata/ScreenDataServiceImpl.java | 3 ++- .../src/main/resources/mapper/staff/StaffMapper.xml | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java index 402a7ce3..ad771491 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java @@ -52,6 +52,15 @@ public class FactoryScreenDataController { return success(staffDataRespVO); } + @GetMapping("/getStaffData-all") + @Operation(summary = "大屏员工信息数据") + @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 + @PermitAll + public CommonResult getStaffDataAll() { + StaffDataRespVO staffDataRespVO = screenDataService.getStaffData(null); + return success(staffDataRespVO); + } + @GetMapping("/getPropertyData") @Operation(summary = "大屏资产数据") @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java index 2985a994..00bd7e32 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java @@ -414,7 +414,8 @@ public class ScreenDataServiceImpl implements ScreenDataService { vo.setDamagedTotal(toDayVO.getDamageNum()); // 设置同昨日比较 百分比 - double increaseCompared = Math.round(toDayVO.getDamageNum() - yesterdayVO.getDamageNum() * 100.0) / 100.0; // 保留两位小数 + double increaseCompared = Math.round(toDayVO.getDamageNum() == null ? 0 : toDayVO.getDamageNum() - + (yesterdayVO.getDamageNum() == null ? 0 : yesterdayVO.getDamageNum()) * 100.0) / 100.0; // 保留两位小数 vo.setIncreaseCompared(increaseCompared); return vo; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staff/StaffMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staff/StaffMapper.xml index 23174fb0..fab63085 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staff/StaffMapper.xml +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staff/StaffMapper.xml @@ -19,6 +19,7 @@ a.status = 1 and a.deleted = 0 + and a.factory_id != 1 and a.factory_id = #{factoryId}