From 724ac17f35aea010d92f95ed31991f40d73dba57 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 21 Aug 2024 11:03:33 +0800 Subject: [PATCH] =?UTF-8?q?APP=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CraneMonitorController.java | 13 +++++++++- .../bonus/app/mapper/AppSafetyHatMapper.java | 9 +++++++ .../app/service/ICraneMonitorService.java | 4 +++- .../service/impl/AppSafetyHatServiceImpl.java | 7 ++---- .../service/impl/CraneMonitorServiceImpl.java | 12 ++++------ .../resources/mapper/AppSafetyHatMapper.xml | 24 ++++++++++--------- .../controller/PersonMgeController.java | 2 -- 7 files changed, 43 insertions(+), 28 deletions(-) diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/CraneMonitorController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/CraneMonitorController.java index f06cbd5..01430f5 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/CraneMonitorController.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/CraneMonitorController.java @@ -1,11 +1,18 @@ package com.bonus.app.controller; import com.bonus.app.service.ICraneMonitorService; +import com.bonus.common.core.constant.BusinessConstants; +import com.bonus.common.core.text.Convert; +import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.entity.app.AppParamsDto; +import com.bonus.common.entity.app.vo.DevWarnVo; import com.bonus.common.entity.app.vo.JdConfigVo; +import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -42,7 +49,11 @@ public class CraneMonitorController { @GetMapping("getJdWarnList") @SysLog(title = "APP->吊装监控", businessType = OperaType.QUERY,logType = 0,module = "APP->吊装监控",details ="查询近电感应设备预警信息") public AjaxResult getJdWarnList(AppParamsDto dto){ - return service.getJdWarnList(dto); + Integer pageNum = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_SIZE), 10); + PageHelper.startPage(pageNum, pageSize); + PageInfo pageInfo = service.getJdWarnList(dto); + return AjaxResult.success(pageInfo.getList()); } @PostMapping("configJdDevice") diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/AppSafetyHatMapper.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/AppSafetyHatMapper.java index 0d78dc9..0c25707 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/AppSafetyHatMapper.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/AppSafetyHatMapper.java @@ -51,4 +51,13 @@ public interface AppSafetyHatMapper { * @date 2024/8/7 19:30 */ void returnHelmet(AppParamsDto dto); + + /** + * 更新设备领用表 归还状态 + * @param dto + * @return void + * @author cwchen + * @date 2024/8/21 10:43 + */ + void updateReturnDeviceData(AppParamsDto dto); } diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/ICraneMonitorService.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/ICraneMonitorService.java index 20a385e..f9b213c 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/ICraneMonitorService.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/ICraneMonitorService.java @@ -2,7 +2,9 @@ package com.bonus.app.service; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.entity.app.AppParamsDto; +import com.bonus.common.entity.app.vo.DevWarnVo; import com.bonus.common.entity.app.vo.JdConfigVo; +import com.github.pagehelper.PageInfo; /** * @className:CraneMonitorService @@ -37,7 +39,7 @@ public interface ICraneMonitorService { * @author cwchen * @date 2024/8/13 9:19 */ - AjaxResult getJdWarnList(AppParamsDto dto); + PageInfo getJdWarnList(AppParamsDto dto); /** * 配置近电感应设备属性 diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppSafetyHatServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppSafetyHatServiceImpl.java index ab7976b..62bb228 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppSafetyHatServiceImpl.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppSafetyHatServiceImpl.java @@ -35,9 +35,6 @@ public class AppSafetyHatServiceImpl implements IAppSafetyHatService { @Resource(name = "AppSafetyHatMapper") private AppSafetyHatMapper mapper; - @Resource(name = "AppEquipmentReqMapper") - private AppEquipmentReqMapper appEquipmentReqMapper; - @Override public PageInfo getSafetyHatLists(AppParamsDto dto) { List list = new ArrayList<>(); @@ -84,8 +81,8 @@ public class AppSafetyHatServiceImpl implements IAppSafetyHatService { } // 更新人员领用的归还状态 mapper.returnHelmet(dto); - // 更新设备表解绑状态 - appEquipmentReqMapper.updateReturnDeviceData(dto,2); + // 更新设备领用表 归还状态 + mapper.updateReturnDeviceData(dto); return AjaxResult.success(); } catch (Exception e) { log.error(e.toString(),e); diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java index 2d70483..e8188dc 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java @@ -1,18 +1,16 @@ package com.bonus.app.service.impl; -import cn.hutool.core.annotation.AliasFor; import com.bonus.app.mapper.CraneMonitorMapper; import com.bonus.app.service.ICraneMonitorService; import com.bonus.common.core.constant.BusinessConstants; -import com.bonus.common.core.utils.DateTimeHelper; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.entity.app.AppParamsDto; import com.bonus.common.entity.app.vo.DevInfoVo; import com.bonus.common.entity.app.vo.DevWarnVo; import com.bonus.common.entity.app.vo.JdConfigVo; -import com.bonus.common.entity.bracelet.vo.PersonVo; import com.bonus.common.security.utils.ValidatorsUtils; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -74,18 +72,16 @@ public class CraneMonitorServiceImpl implements ICraneMonitorService { } @Override - public AjaxResult getJdWarnList(AppParamsDto dto) { + public PageInfo getJdWarnList(AppParamsDto dto) { List list = new ArrayList<>(); try { dto.setDevType(BusinessConstants.JD); - // 告警数据默认展示当天，不需要加日期限制可去掉 - dto.setStartTime(DateTimeHelper.getNowDay()); - dto.setEndTime(DateTimeHelper.getNowDay()); list = mapper.getJdWarnList(dto); } catch (Exception e) { log.error(e.toString(), e); } - return AjaxResult.success(list); + PageInfo pageInfo = new PageInfo<>(list); + return pageInfo; } @Override diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/AppSafetyHatMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/AppSafetyHatMapper.xml index 1f3b041..dfc7002 100644 --- a/bonus-modules/bonus-app/src/main/resources/mapper/AppSafetyHatMapper.xml +++ b/bonus-modules/bonus-app/src/main/resources/mapper/AppSafetyHatMapper.xml @@ -39,11 +39,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE tb_sh_use SET unbid_time = #{backTime} ,time_type = 0 WHERE id = #{id} + + + UPDATE tb_dev_ly SET ly_user = null,ly_status = null,ly_time = null,user_type = null WHERE dev_id = #{devId} + \ No newline at end of file diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java index a3ef823..6d7dfe4 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java @@ -48,10 +48,8 @@ public class PersonMgeController extends BaseController { @GetMapping("list") @SysLog(title = "人员管理", businessType = OperaType.QUERY, logType = 0, module = "基础管理->人员管理", details = "查询人员列表") public TableDataInfo list(BraceletParamsDto dto) { - System.err.println("开始" + DateTimeHelper.getNowTime()); startPage(); TableDataInfo tableDataInfo = service.getPersonLists(dto); - System.err.println("结束" + DateTimeHelper.getNowTime()); return tableDataInfo; }