diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/CollectDevAttrVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/CollectDevAttrVo.java index bbe0442..fd19b5a 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/CollectDevAttrVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/CollectDevAttrVo.java @@ -70,5 +70,8 @@ public class CollectDevAttrVo { */ private String changeVal; - + /** + * 数据限制 + */ + private int limit; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java index 28a8b96..ca82321 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java @@ -61,6 +61,11 @@ public class ConstInfoVo { * 配置信息 */ private String configData; + /** + * 数量 + */ + + private int num; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserMapper.java index 954df80..d142859 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserMapper.java @@ -17,4 +17,6 @@ public interface TtSysUserMapper { void addTtSysUser(TtSysUserVo ttSysUserVo); void updateTtSysUser(TtSysUserVo ttSysUserVo); + + void deleteTtSysUser(TtSysUserVo ttSysUserVo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserServiceImpl.java index a116705..ccd326a 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserServiceImpl.java @@ -155,6 +155,6 @@ public class TtSysUserServiceImpl implements TtSysUserService { @Override public void deleteTtSysUser(TtSysUserVo ttSysUserVo) { //修改用户信息 - ttSysUserMapper.updateTtSysUser(ttSysUserVo); + ttSysUserMapper.deleteTtSysUser(ttSysUserVo); } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/common/utils/TypeCodeUtils.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/common/utils/TypeCodeUtils.java index 6172ea5..54f983b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/common/utils/TypeCodeUtils.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/common/utils/TypeCodeUtils.java @@ -11,5 +11,10 @@ public class TypeCodeUtils { */ public final static String GZM_CODE="9000100"; + /** + * 大体积混凝土 + */ + public final static String HNT_CODE="9000200"; + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java new file mode 100644 index 0000000..3b53b48 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java @@ -0,0 +1,71 @@ +package com.bonus.base.screen.controller; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; +import com.bonus.base.screen.domain.ProjectOverviewVo; +import com.bonus.base.screen.service.ExcavationDetectionService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +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; +import java.util.List; + +/** + * 深基坑监测 + * @author 马三炮 + * @date 2025/4/17 + */ +@Slf4j +@RestController +@RequestMapping("/excavationDetection") +public class ExcavationDetectionController extends BaseController { + + + @Resource + private ExcavationDetectionService excavationDetectionService; + + @ApiOperation(value = "查询设备列表") + @PostMapping("/getMassConcreteList") + public AjaxResult getTtSysUserCheckList(@RequestBody ConstInfoVo constInfoVo) { + try { + List collectDevVoList = excavationDetectionService.getCollectDeviceList(constInfoVo); + return success(collectDevVoList); + }catch (Exception e){ + log.error("查询区域列表失败",e.getMessage()); + return error("查询区域列表失败"); + } + } + @ApiOperation(value = "设备统计") + @PostMapping("/getDevStatistics") + public AjaxResult getDevStatistics(@RequestBody ConstInfoVo constInfoVo) { + try { + ProjectOverviewVo projectOverviewVo = excavationDetectionService.getDevStatistics(constInfoVo); + return success(projectOverviewVo); + }catch (Exception e){ + log.error("查询区域列表失败",e.getMessage()); + return error("查询区域列表失败"); + } + } + + @ApiOperation(value = "报警信息") + @PostMapping("/concreteAlarmList") + public AjaxResult concreteAlarmList(@RequestBody ConstInfoVo constInfoVo) { + try { + + List deviceAlarmVoList = excavationDetectionService.concreteAlarmList(constInfoVo); + return success(deviceAlarmVoList); + }catch (Exception e){ + log.error("区域设备统计失败",e.getMessage()); + return error("区域设备统计失败"); + } + } + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java new file mode 100644 index 0000000..694c447 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/MassConcreteController.java @@ -0,0 +1,106 @@ +package com.bonus.base.screen.controller; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; +import com.bonus.base.screen.domain.ProjectOverviewVo; +import com.bonus.base.screen.service.MassConcreteService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 大体积混凝土 + */ +@Slf4j +@RestController +@RequestMapping("/massConcrete") +public class MassConcreteController extends BaseController { + + + @Resource + private MassConcreteService massConcreteService; + + @ApiOperation(value = "查询区域列表") + @PostMapping("/getMassConcreteList") + public AjaxResult getTtSysUserCheckList(@RequestBody ConstInfoVo constInfoVo) { + try { + List constInfoVoList = massConcreteService.getTtSysUserCheckList(constInfoVo); + return success(constInfoVoList); + }catch (Exception e){ + log.error("查询区域列表失败",e.getMessage()); + return error("查询区域列表失败"); + } + } + + + @ApiOperation(value = "查询区域下设备列表") + @PostMapping("/getCollectDeviceList") + public AjaxResult getCollectDeviceList(@RequestBody ConstInfoVo constInfoVo) { + try { + List collectDevVoList = massConcreteService.getCollectDeviceList(constInfoVo); + return success(collectDevVoList); + }catch (Exception e){ + log.error("查询区域列表失败",e.getMessage()); + return error("查询区域列表失败"); + } + } + + @ApiOperation(value = "设备统计") + @PostMapping("/getDevStatistics") + public AjaxResult getDevStatistics(@RequestBody ConstInfoVo constInfoVo) { + try { + ProjectOverviewVo projectOverviewVo = massConcreteService.getDevStatistics(constInfoVo); + return success(projectOverviewVo); + }catch (Exception e){ + log.error("查询区域列表失败",e.getMessage()); + return error("查询区域列表失败"); + } + } + + @ApiOperation(value = "区域设备统计") + @PostMapping("/getCollectDeviceAll") + public AjaxResult getCollectDeviceAll(@RequestBody ConstInfoVo constInfoVo) { + try { + + List constInfoVoList = massConcreteService.getCollectDeviceAll(constInfoVo); + return success(constInfoVoList); + }catch (Exception e){ + log.error("区域设备统计失败",e.getMessage()); + return error("区域设备统计失败"); + } + } + + @ApiOperation(value = "报警信息") + @PostMapping("/concreteAlarmList") + public AjaxResult concreteAlarmList(@RequestBody ConstInfoVo constInfoVo) { + try { + + List deviceAlarmVoList = massConcreteService.concreteAlarmList(constInfoVo); + return success(deviceAlarmVoList); + }catch (Exception e){ + log.error("区域设备统计失败",e.getMessage()); + return error("区域设备统计失败"); + } + } + + @ApiOperation(value = "检测温度变化") + @PostMapping("/temperatureList") + public AjaxResult temperatureList(@RequestBody CollectDeviceHisVo collectDeviceHisVo) { + try { + + List collectDeviceHisVoList = massConcreteService.temperatureList(collectDeviceHisVo); + return success(collectDeviceHisVoList); + }catch (Exception e){ + log.error("区域设备统计失败",e.getMessage()); + return error("区域设备统计失败"); + } + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ScreenDevModelController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ScreenDevModelController.java index 17700a6..5a5b014 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ScreenDevModelController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ScreenDevModelController.java @@ -53,7 +53,7 @@ public class ScreenDevModelController { @ApiOperation(value = "查询预警记录") @PostMapping("getWarnInfo") - public AjaxResult getWarnInfo(ParamVo vo) { + public AjaxResult getWarnInfo(@RequestBody ParamVo vo) { return service.getWarnInfo(vo); } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/CollectDeviceHisVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/CollectDeviceHisVo.java new file mode 100644 index 0000000..816a503 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/CollectDeviceHisVo.java @@ -0,0 +1,52 @@ +package com.bonus.base.screen.domain; + +import lombok.Data; + +/** + * @author 马三炮 + * @date 2025/4/17 + */ +@Data +public class CollectDeviceHisVo { + + /** + * id + */ + private String id; + + /** + * 设备id + */ + private String devId; + + /** + * 属性id + */ + private String attrId; + + /** + * 属性名称 + */ + private String attrName; + + /** + * 单位 + */ + private String unit; + + /** + * 属性值 + */ + private String attrVal; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 限制条数 + */ + private int limit; + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/ParamVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/ParamVo.java index fa8be9d..ce316d1 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/ParamVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/ParamVo.java @@ -33,5 +33,8 @@ public class ParamVo { */ private String type; - + /** + * 分组id + */ + private String id; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/WarnInfoVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/WarnInfoVo.java index eec239d..a9450fe 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/WarnInfoVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/WarnInfoVo.java @@ -21,5 +21,5 @@ public class WarnInfoVo { * 内容 * */ - private String content; + private String remark; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/ExcavationDetectionMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/ExcavationDetectionMapper.java new file mode 100644 index 0000000..904260b --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/ExcavationDetectionMapper.java @@ -0,0 +1,15 @@ +package com.bonus.base.screen.mapper; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; + +import java.util.List; + +public interface ExcavationDetectionMapper { + List getCollectDeviceList(ConstInfoVo constInfoVo); + + List getDevStatistics(ConstInfoVo constInfoVo); + + List concreteAlarmList(ConstInfoVo constInfoVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/MassConcreteMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/MassConcreteMapper.java new file mode 100644 index 0000000..49e6d41 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/MassConcreteMapper.java @@ -0,0 +1,24 @@ +package com.bonus.base.screen.mapper; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; +import com.bonus.base.screen.domain.ProjectOverviewVo; + +import java.util.List; +import java.util.Map; + +public interface MassConcreteMapper { + List getTtSysUserCheckList(ConstInfoVo constInfoVo); + + List getCollectDeviceList(ConstInfoVo constInfoVo); + + List getDevStatistics(ConstInfoVo constInfoVo); + + List getCollectDeviceAll(ConstInfoVo constInfoVo); + + List concreteAlarmList(ConstInfoVo constInfoVo); + + List temperatureList(CollectDeviceHisVo collectDeviceHisVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ExcavationDetectionService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ExcavationDetectionService.java new file mode 100644 index 0000000..62b2dc0 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ExcavationDetectionService.java @@ -0,0 +1,18 @@ +package com.bonus.base.screen.service; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; +import com.bonus.base.screen.domain.ProjectOverviewVo; + +import java.util.List; + +public interface ExcavationDetectionService { + List getCollectDeviceList(ConstInfoVo constInfoVo); + + ProjectOverviewVo getDevStatistics(ConstInfoVo constInfoVo); + + List concreteAlarmList(ConstInfoVo constInfoVo); + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/MassConcreteService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/MassConcreteService.java new file mode 100644 index 0000000..db2b6d5 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/MassConcreteService.java @@ -0,0 +1,54 @@ +package com.bonus.base.screen.service; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; +import com.bonus.base.screen.domain.ProjectOverviewVo; + +import java.util.List; +import java.util.Map; + +public interface MassConcreteService { + /** + * 查询区域列表 + * @param constInfoVo + * @return + */ + List getTtSysUserCheckList(ConstInfoVo constInfoVo); + + /** + * 查询区域下设备列表 + * @param constInfoVo + * @return + */ + List getCollectDeviceList(ConstInfoVo constInfoVo); + + /** + * 设备统计 + * @param constInfoVo + * @return + */ + ProjectOverviewVo getDevStatistics(ConstInfoVo constInfoVo); + + /** + * 区域设备统计 + * @param constInfoVo + * @return + */ + List getCollectDeviceAll(ConstInfoVo constInfoVo); + + /** + * 报警信息 + * @param constInfoVo + * @return + */ + List concreteAlarmList(ConstInfoVo constInfoVo); + + /** + * 检测温度变化 + * @param collectDeviceHisVo + * @return + */ + List temperatureList(CollectDeviceHisVo collectDeviceHisVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ExcavationDetectionServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ExcavationDetectionServiceImpl.java new file mode 100644 index 0000000..283f0f4 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ExcavationDetectionServiceImpl.java @@ -0,0 +1,56 @@ +package com.bonus.base.screen.service.impl; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; +import com.bonus.base.screen.domain.ProjectOverviewVo; +import com.bonus.base.screen.mapper.ExcavationDetectionMapper; +import com.bonus.base.screen.service.ExcavationDetectionService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/17 + */ +@Slf4j +@Service +public class ExcavationDetectionServiceImpl implements ExcavationDetectionService { + + @Resource + private ExcavationDetectionMapper excavationDetectionMapper; + + @Override + public List getCollectDeviceList(ConstInfoVo constInfoVo) { + + List collectDevVoList = excavationDetectionMapper.getCollectDeviceList(constInfoVo); + return collectDevVoList; + } + + @Override + public ProjectOverviewVo getDevStatistics(ConstInfoVo constInfoVo) { + //获取在线和离线的信息 + List list=excavationDetectionMapper.getDevStatistics(constInfoVo); + ProjectOverviewVo projectOverviewVo = new ProjectOverviewVo(); + int num=0; + for (CollectDevVo collectDevVo:list){ + if ("1".equals(collectDevVo.getIsOnline())){ + projectOverviewVo.setOnlineQuantity(collectDevVo.getNum()); + } + num+=collectDevVo.getNum(); + } + projectOverviewVo.setTotalQuantity(num); + return projectOverviewVo; + } + + @Override + public List concreteAlarmList(ConstInfoVo constInfoVo) { + List deviceAlarmVoList = excavationDetectionMapper.concreteAlarmList(constInfoVo); + return deviceAlarmVoList; + } + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/MassConcreteServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/MassConcreteServiceImpl.java new file mode 100644 index 0000000..a799d6d --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/MassConcreteServiceImpl.java @@ -0,0 +1,103 @@ +package com.bonus.base.screen.service.impl; + +import com.bonus.base.basic.domain.CollectDevVo; +import com.bonus.base.basic.domain.ConstInfoVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.domain.DeviceAlarmVo; +import com.bonus.base.screen.domain.ProjectOverviewVo; +import com.bonus.base.screen.mapper.MassConcreteMapper; +import com.bonus.base.screen.service.MassConcreteService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * @author 马三炮 + * @date 2025/4/17 + */ +@Slf4j +@Service +public class MassConcreteServiceImpl implements MassConcreteService { + + @Resource + private MassConcreteMapper massConcreteMapper; + + /** + * 查询区域列表 + * @param constInfoVo + * @return + */ + @Override + public List getTtSysUserCheckList(ConstInfoVo constInfoVo) { + List constInfoVoList = massConcreteMapper.getTtSysUserCheckList(constInfoVo); + return constInfoVoList; + } + + /** + * 查询区域下设备列表 + * @param constInfoVo + * @return + */ + @Override + public List getCollectDeviceList(ConstInfoVo constInfoVo) { + List collectDevVoList = massConcreteMapper.getCollectDeviceList(constInfoVo); + return collectDevVoList; + } + + /** + * 设备统计 + * @param constInfoVo + * @return + */ + @Override + public ProjectOverviewVo getDevStatistics(ConstInfoVo constInfoVo) { + //获取在线和离线的信息 + List list=massConcreteMapper.getDevStatistics(constInfoVo); + ProjectOverviewVo projectOverviewVo = new ProjectOverviewVo(); + int num=0; + for (CollectDevVo collectDevVo:list){ + if ("1".equals(collectDevVo.getIsOnline())){ + projectOverviewVo.setOnlineQuantity(collectDevVo.getNum()); + } + num+=collectDevVo.getNum(); + } + projectOverviewVo.setTotalQuantity(num); + return projectOverviewVo; + } + + /** + * 区域设备统计 + * @param constInfoVo + * @return + */ + @Override + public List getCollectDeviceAll(ConstInfoVo constInfoVo) { + List constInfoVoList = massConcreteMapper.getCollectDeviceAll(constInfoVo); + return constInfoVoList; + } + + /** + * 报警信息 + * @param constInfoVo + * @return + */ + @Override + public List concreteAlarmList(ConstInfoVo constInfoVo) { + List deviceAlarmVoList = massConcreteMapper.concreteAlarmList(constInfoVo); + return deviceAlarmVoList; + } + + /** + * 检测温度变化 + * @param collectDeviceHisVo + * @return + */ + @Override + public List temperatureList(CollectDeviceHisVo collectDeviceHisVo) { + List collectDeviceHisVoList = massConcreteMapper.temperatureList(collectDeviceHisVo); + return collectDeviceHisVoList; + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ProjectOverviewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ProjectOverviewServiceImpl.java index 3313b5c..048ca68 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ProjectOverviewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ProjectOverviewServiceImpl.java @@ -17,6 +17,10 @@ public class ProjectOverviewServiceImpl implements ProjectOverviewService { private ProjectOverviewMapper projectOverviewMapper; + /** + * 获取感知设备总数 + * @return + */ @Override public int getTotalQuantity() { int totalQuantity = projectOverviewMapper.getTotalQuantity(); @@ -24,24 +28,40 @@ public class ProjectOverviewServiceImpl implements ProjectOverviewService { return totalQuantity; } + /** + * 设备在线总数 + * @return + */ @Override public int getOnlineQuantity() { int onlineQuantity = projectOverviewMapper.getOnlineQuantity(); return onlineQuantity; } + /** + * 设备异常总数 + * @return + */ @Override public int getTotalExceptionCount() { int totalExceptionCount = projectOverviewMapper.getTotalExceptionCount(); return totalExceptionCount; } + /** + * 设备报警次数 + * @return + */ @Override public int getDeviceAlarms() { int deviceAlarms = projectOverviewMapper.getDeviceAlarms(); return deviceAlarms; } + /** + * 报警信息 + * @return + */ @Override public List getDeviceAlarmList() { List deviceAlarmVoList = projectOverviewMapper.getDeviceAlarmList(); diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ScreenDevModelServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ScreenDevModelServiceImpl.java index 1e1bf4a..e0dadf3 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ScreenDevModelServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ScreenDevModelServiceImpl.java @@ -82,7 +82,7 @@ public class ScreenDevModelServiceImpl implements ScreenDevModelService { num+=collectDevVo.getNum(); } map.put("allNum",num); - map.put("onLineRate", map.get("online")/num); +// map.put("onLineRate", map.get("online")/num); return AjaxResult.success("查询成功",map); }catch (Exception e){ map.put("allNum",0); diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/CollectDeviceMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/CollectDeviceMapper.xml index 7c6ce15..6601d1b 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/CollectDeviceMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/CollectDeviceMapper.xml @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml index a93f57b..b41f316 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/ConstINfoMapper.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into tb_const_info (id, name, type_id, type_code, type_name, create_time, update_time, is_active, del_flag, remark, background_image, config_data, code - ) values (#{id},#{name},#{typeId},#{typeCode},#{typeName},now(),now(),0,0,#{remark},#{backImage},#{configData},#{code}); + ) values (#{id},#{name},#{typeId},#{typeCode},#{typeName},now(),now(),#{isActive},0,#{remark},#{backImage},#{configData},#{code}); update tb_const_info set name=#{name},type_id=#{typeId},update_time=now(), @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -66,4 +66,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from tb_collect_device WHERE const_id=#{id} and del_flag=0 - \ No newline at end of file + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ExcavationDetectionMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ExcavationDetectionMapper.xml new file mode 100644 index 0000000..df432af --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ExcavationDetectionMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/MassConcreteMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/MassConcreteMapper.xml new file mode 100644 index 0000000..a720cc7 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/MassConcreteMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ProjectOverviewMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ProjectOverviewMapper.xml index 7a24c2d..b0274ff 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ProjectOverviewMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ProjectOverviewMapper.xml @@ -22,6 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select tcdh.create_time as createTime,tcdh.remark as remark,tcd.dev_name as devName from tb_collect_device_his tcdh left join tb_collect_device tcd on tcdh.dev_id = tcd.id - where tcdh.is_warn =1 + where tcdh.is_warn =1 LIMIT 20 diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ScreenDevModelMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ScreenDevModelMapper.xml index 9a98a7c..0511682 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ScreenDevModelMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ScreenDevModelMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserMapper.xml index 66b7ae7..eb526d7 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserMapper.xml @@ -85,6 +85,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update tt_sys_user set team_id = null where team_id =#{teamId} + + update tt_sys_user set del_flag = 0 + where id =#{id} +