diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java index 8200d5f..a4125cd 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java @@ -35,6 +35,7 @@ public class BusinessConstants { public final static String SHX = "shx"; /** 安全帽设备类型*/ public final static String AQM = "aqm"; + public final static String DZYJ = "lift_warn"; /** 管理员角色*/ public final static String ADMINISTRATORS = "administrators"; 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 new file mode 100644 index 0000000..503e262 --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/CraneMonitorController.java @@ -0,0 +1,18 @@ +package com.bonus.app.controller; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @className:CraneMonitorController + * @author:cwchen + * @date:2024-08-12-15:35 + * @version:1.0 + * @description:吊车监控 + */ +@RestController +@RequestMapping("/craneMonitor/") +@Slf4j +public class CraneMonitorController { +} diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/CraneMonitorMapper.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/CraneMonitorMapper.java new file mode 100644 index 0000000..85279ad --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/CraneMonitorMapper.java @@ -0,0 +1,11 @@ +package com.bonus.app.mapper; + +/** + * @className:CraneMonitorMapper + * @author:cwchen + * @date:2024-08-12-15:36 + * @version:1.0 + * @description:吊车监控 + */ +public interface CraneMonitorMapper { +} 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 new file mode 100644 index 0000000..2dda6b5 --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/ICraneMonitorService.java @@ -0,0 +1,11 @@ +package com.bonus.app.service; + +/** + * @className:CraneMonitorService + * @author:cwchen + * @date:2024-08-12-15:35 + * @version:1.0 + * @description:吊车监控 + */ +public interface ICraneMonitorService { +} 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 new file mode 100644 index 0000000..2ebf931 --- /dev/null +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java @@ -0,0 +1,13 @@ +package com.bonus.app.service.impl; + +import com.bonus.app.service.ICraneMonitorService; + +/** + * @className:CraneMonitorServiceImpl + * @author:cwchen + * @date:2024-08-12-15:36 + * @version:1.0 + * @description:吊车监控 + */ +public class CraneMonitorServiceImpl implements ICraneMonitorService { +} diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml new file mode 100644 index 0000000..addb782 --- /dev/null +++ b/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java index 0fe1e43..a303063 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java @@ -88,4 +88,17 @@ public class SelectController { public AjaxResult getTeamPeople(SysParamsDto dto) { return service.getTeamPeople(dto); } + + /** + * 根据杆塔ID获取领用吊装预警设备的班组 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/8/12 15:40 + */ + @GetMapping("/getTeamListsByDzDevice") + public AjaxResult getTeamListsByDzDevice(SysParamsDto dto) { + return service.getTeamListsByDzDevice(dto); + } + } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysParamsDto.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysParamsDto.java index eb39f09..d64fd73 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysParamsDto.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysParamsDto.java @@ -17,6 +17,12 @@ public class SysParamsDto { private String id; + /**杆塔ID*/ + private Long towerId; + + /**设备类型*/ + private String devTypeCode; + /** * 角色编码 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java index 6250c80..748e03b 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java @@ -64,4 +64,13 @@ public interface SelectMapper { * @date 2024/8/7 18:25 */ List getTeamPeople(SysParamsDto dto); + + /** + * 根据杆塔ID获取领用吊装预警设备的班组 + * @param dto + * @return List + * @author cwchen + * @date 2024/8/12 15:46 + */ + List getTeamListsByDzDevice(SysParamsDto dto); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java index 9e7fcf2..d1a344d 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java @@ -57,4 +57,13 @@ public interface ISelectService { * @date 2024/8/7 18:25 */ AjaxResult getTeamPeople(SysParamsDto dto); + + /** + * 根据杆塔ID获取领用吊装预警设备的班组 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/8/12 15:45 + */ + AjaxResult getTeamListsByDzDevice(SysParamsDto dto); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java index 5ea8781..104607a 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.system.service.impl; +import com.bonus.common.core.constant.BusinessConstants; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.web.domain.AjaxResult; @@ -88,4 +89,16 @@ public class SelectServiceImpl implements ISelectService { return AjaxResult.error(); } } + + @Override + public AjaxResult getTeamListsByDzDevice(SysParamsDto dto) { + try { + dto.setDevTypeCode(BusinessConstants.DZYJ); + List list = mapper.getTeamListsByDzDevice(dto); + return AjaxResult.success(list); + } catch (Exception e) { + log.error(e.toString(),e); + return AjaxResult.error(); + } + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml index 470e314..485d41e 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml @@ -14,6 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT id,CONCAT(name,'-',phone) AS name FROM tb_people WHERE team_id = #{teamId} + + + \ No newline at end of file