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 a4125cd..1989248 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,7 +35,11 @@ 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 JD = "elec_induction"; + public final static String DL = "电量"; /** 管理员角色*/ public final static String ADMINISTRATORS = "administrators"; diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/DevInfoVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/DevInfoVo.java new file mode 100644 index 0000000..a67dd7f --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/DevInfoVo.java @@ -0,0 +1,31 @@ +package com.bonus.common.entity.app.vo; + +import lombok.Data; + +/** + * @className:DevInfoVo + * @author:cwchen + * @date:2024-08-12-16:27 + * @version:1.0 + * @description:设备-vo + */ +@Data +public class DevInfoVo { + + /**设备ID*/ + private Long devId; + /**设备名称*/ + private String devName; + /**设备编码*/ + private String devCode; + /**设备下标*/ + private Integer devIndex; + /**是否告警 0-否 1-是*/ + private Integer isWarn = 0; + /**班组长*/ + private String teamLeader; + /**班组长手机号*/ + private String leaderPhone; + /**电量*/ + private String electricQuantity; +} 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 503e262..0b6a453 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,9 +1,18 @@ package com.bonus.app.controller; +import com.bonus.app.service.ICraneMonitorService; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.entity.app.AppParamsDto; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + /** * @className:CraneMonitorController * @author:cwchen @@ -15,4 +24,19 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/craneMonitor/") @Slf4j public class CraneMonitorController { + + @Resource(name = "ICraneMonitorService") + private ICraneMonitorService service; + + @GetMapping("getDzWarnList") + @SysLog(title = "APP->吊装监控", businessType = OperaType.QUERY,logType = 0,module = "APP->吊装监控",details ="查询吊装预警设备") + public AjaxResult getDzWarnList(AppParamsDto dto){ + return service.getDzWarnList(dto); + } + + @GetMapping("getJdList") + @SysLog(title = "APP->吊装监控", businessType = OperaType.QUERY,logType = 0,module = "APP->吊装监控",details ="查询近电感应设备") + public AjaxResult getJdList(AppParamsDto dto){ + return service.getJdList(dto); + } } 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 index 85279ad..30f39dd 100644 --- 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 @@ -1,5 +1,12 @@ package com.bonus.app.mapper; +import com.bonus.common.entity.app.AppParamsDto; +import com.bonus.common.entity.app.vo.DevInfoVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + /** * @className:CraneMonitorMapper * @author:cwchen @@ -7,5 +14,32 @@ package com.bonus.app.mapper; * @version:1.0 * @description:吊车监控 */ +@Repository(value = "CraneMonitorMapper") public interface CraneMonitorMapper { + /** + * 查询班组领用的吊装预警设备 + * @param dto + * @return List + * @author cwchen + * @date 2024/8/12 16:31 + */ + List getDzWarnList(AppParamsDto dto); + + /** + * 查询班组领用的近电感应设备 + * @param dto + * @return List + * @author cwchen + * @date 2024/8/12 17:29 + */ + List getJdList(AppParamsDto dto); + + /** + * 查询近电感应设备的电量值 + * @param vo + * @return String + * @author cwchen + * @date 2024/8/12 17:54 + */ + String getElectricQuantity(@Param("devId") Long devId, @Param("dataCode")String dataCode); } 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 2dda6b5..3a40dad 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 @@ -1,5 +1,8 @@ package com.bonus.app.service; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.entity.app.AppParamsDto; + /** * @className:CraneMonitorService * @author:cwchen @@ -8,4 +11,14 @@ package com.bonus.app.service; * @description:吊车监控 */ public interface ICraneMonitorService { + /** + * 查询班组领用的吊装预警设备 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/8/12 16:24 + */ + AjaxResult getDzWarnList(AppParamsDto dto); + + AjaxResult getJdList(AppParamsDto dto); } 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 2ebf931..b949abb 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,6 +1,18 @@ 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.web.domain.AjaxResult; +import com.bonus.common.entity.app.AppParamsDto; +import com.bonus.common.entity.app.vo.DevInfoVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * @className:CraneMonitorServiceImpl @@ -9,5 +21,38 @@ import com.bonus.app.service.ICraneMonitorService; * @version:1.0 * @description:吊车监控 */ +@Service(value = "ICraneMonitorService") +@Slf4j public class CraneMonitorServiceImpl implements ICraneMonitorService { + + @Resource(name = "CraneMonitorMapper") + private CraneMonitorMapper mapper; + + @Override + public AjaxResult getDzWarnList(AppParamsDto dto) { + List list = new ArrayList<>(); + try { + dto.setDevType(BusinessConstants.DZYJ); + list = mapper.getDzWarnList(dto); + } catch (Exception e) { + log.error(e.toString(),e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getJdList(AppParamsDto dto) { + List list = new ArrayList<>(); + try { + dto.setDevType(BusinessConstants.JD); + list = mapper.getJdList(dto); + for (DevInfoVo vo : list) { + String electricQuantity = mapper.getElectricQuantity(vo.getDevId(),BusinessConstants.DL); + vo.setElectricQuantity(electricQuantity); + } + } catch (Exception e) { + log.error(e.toString(),e); + } + return AjaxResult.success(list); + } } diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml index addb782..4f5446e 100644 --- a/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml +++ b/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml @@ -2,6 +2,34 @@ - + + + + + + + \ No newline at end of file