From bad6e184136460df311d648a6288df8d84549986 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 17 Aug 2024 13:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=9D=91=E7=9B=91=E6=B5=8B=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IDevPitmonitSouthsmosDataService.java | 3 +- .../DevPitmonitSouthsmosDataServiceImpl.java | 4 +- .../quartz/task/PitmonitSouthsmosTask.java | 12 +-- .../web/controller/PitMonitController.java | 81 +++++++++++++++++++ .../device/domain/PitmonitSouthsmosAlarm.java | 38 ++++++++- .../device/domain/PitmonitSouthsmosData.java | 32 +++++++- .../mapper/PitmonitSouthsmosAlarmMapper.java | 2 + .../mapper/PitmonitSouthsmosDataMapper.java | 18 +++++ .../mapper/PitmonitSouthsmosDeviceMapper.java | 2 + .../IPitmonitSouthsmosAlarmService.java | 8 ++ .../IPitmonitSouthsmosDataService.java | 20 +++++ .../IPitmonitSouthsmosDeviceService.java | 2 + .../PitmonitSouthsmosAlarmServiceImpl.java | 8 ++ .../PitmonitSouthsmosDataServiceImpl.java | 34 ++++++++ .../PitmonitSouthsmosDeviceServiceImpl.java | 5 ++ .../device/PitmonitSouthsmosAlarmMapper.xml | 17 +++- .../device/PitmonitSouthsmosDataMapper.xml | 72 ++++++++++++++++- .../device/PitmonitSouthsmosDevSpMapper.xml | 6 +- .../device/PitmonitSouthsmosDeviceMapper.xml | 16 +++- .../PitmonitSouthsmosElementItemMapper.xml | 6 +- .../device/PitmonitSouthsmosElementMapper.xml | 6 +- .../PitmonitSouthsmosSurveypointMapper.xml | 6 +- .../PitmonitSouthsmosThresholdMapper.xml | 6 +- .../device/ProjectPitMonitCfgMapper.xml | 6 +- 24 files changed, 368 insertions(+), 42 deletions(-) create mode 100644 yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/PitMonitController.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDataService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDataService.java index 5e000180..4004b284 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDataService.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/IDevPitmonitSouthsmosDataService.java @@ -2,6 +2,7 @@ package com.ruoyi.quartz.service; import java.util.List; import com.ruoyi.quartz.domain.DevPitmonitSouthsmosData; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosElement; import com.ruoyi.quartz.domain.SurProjectPitMonitCfg; /** @@ -60,5 +61,5 @@ public interface IDevPitmonitSouthsmosDataService */ public int deleteDevPitmonitSouthsmosDataById(Long id); - public void addList(List dataList, SurProjectPitMonitCfg cfg); + public void addList(List dataList, SurProjectPitMonitCfg cfg, DevPitmonitSouthsmosElement el); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDataServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDataServiceImpl.java index 458eb244..b07b94e5 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDataServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/DevPitmonitSouthsmosDataServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import cn.hutool.core.util.StrUtil; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.quartz.domain.DevPitmonitSouthsmosElement; import com.ruoyi.quartz.domain.SurProjectPitMonitCfg; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -111,9 +112,10 @@ public class DevPitmonitSouthsmosDataServiceImpl implements IDevPitmonitSouthsmo } @Override - public void addList(List dataList, SurProjectPitMonitCfg cfg) { + public void addList(List dataList, SurProjectPitMonitCfg cfg, DevPitmonitSouthsmosElement el) { dataList.forEach(it->{ it.setCfgId(cfg.getId()); + it.setDataType(el.getNameEn()); DevPitmonitSouthsmosData old=selectDevPitmonitSouthsmosDataByDataId(it.getDataId()); if(old==null){ insertDevPitmonitSouthsmosData(it); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java index f7df439e..16006b93 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java @@ -122,7 +122,7 @@ public class PitmonitSouthsmosTask { List elList=elementService.selectDevPitmonitSouthsmosElementList(elWhere); elList.forEach(el->{ List dataList=getElementData(orgId,""+el.getSrvId(),el.getNameEn(),token,date,1); - dataService.addList(dataList,cfg); + dataService.addList(dataList,cfg,el); }); //8.获取报警信息 List alarmList=getAlarm(orgId,token,date); @@ -168,9 +168,9 @@ public class PitmonitSouthsmosTask { //List spList=getSurveyPoint(token,orgId); //System.out.println(spList); //6.获取测点数据 - //List dataList=getElementData(orgId,"22","horizontal",token,DateUtil.parse("2024-01-01"),1); - //System.out.println(dataList); - //System.out.println(dataList.size()); + List dataList=getElementData(orgId,"22","horizontal",token,DateUtil.parse("2024-01-01"),1); + System.out.println(dataList); + System.out.println(dataList.size()); //7.获取报警阈值 //List thList=getThreshold("53245",token); //System.out.println(thList); @@ -178,8 +178,8 @@ public class PitmonitSouthsmosTask { //List alarmList=getAlarm(orgId,token,DateUtil.parse("2024-01-01")); //System.out.println(alarmList); //9.获取设备 - List devList=getDevices(token,orgId); - System.out.println(devList); + //List devList=getDevices(token,orgId); + //System.out.println(devList); } private static List getDevices(String token,String orgId){ diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/PitMonitController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/PitMonitController.java new file mode 100644 index 00000000..0f5da33a --- /dev/null +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/PitMonitController.java @@ -0,0 +1,81 @@ +package com.yanzhu.jh.bigscreen.web.controller; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.yanzhu.jh.device.domain.PitmonitSouthsmosAlarm; +import com.yanzhu.jh.device.domain.PitmonitSouthsmosData; +import com.yanzhu.jh.device.service.*; +import com.yanzhu.jh.project.domain.SurProjectAttendanceData; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.Map; +import java.util.List; +/*** + * 基坑监测 + */ +@RestController +@RequestMapping("/bgscreen/pitmonit") +public class PitMonitController { + + @Autowired + private IPitmonitSouthsmosDataService dataService; + @Autowired + private IPitmonitSouthsmosAlarmService alarmService; + @Autowired + private IPitmonitSouthsmosDeviceService deviceService; + @Autowired + private IPitmonitSouthsmosDevSpService devSpService; + @Autowired + private IPitmonitSouthsmosElementItemService elementItemService; + @Autowired + private IPitmonitSouthsmosElementService elementService; + @Autowired + private IPitmonitSouthsmosSurveypointService surveypointService; + @Autowired + private IPitmonitSouthsmosThresholdService thresholdService; + @Autowired + private IProjectPitMonitCfgService cfgService; + + @GetMapping("/totalCount") + public AjaxResult totalCount(Long prjId) { + int dataCount=dataService.getCountByPrjId(prjId); + int devCount=deviceService.getCountByPrjId(prjId); + Map map=new HashMap<>(); + map.put("data",dataCount); + map.put("dev",devCount); + return AjaxResult.success(map); + } + + @GetMapping("/alarm") + public AjaxResult alarmList(Long prjId){ + String status="false"; + List list=alarmService.queryByState(prjId,status); + return AjaxResult.success(list); + } + /** + * 获取项目中测点最后一条数据 + */ + @GetMapping("/getLastDataForElement") + public AjaxResult getLastDataForElement(Long prjId){ + List list=dataService.getLastDataForElement(prjId); + return AjaxResult.success(list); + } + /** + * 按收集日期和数据类型查询数据 + */ + @PostMapping("/selectByDate") + public AjaxResult selectByDate(@RequestBody PitmonitSouthsmosData where){ + List list=dataService.selectByDate(where); + return AjaxResult.success(list); + } + + /** + * 数据监控天数 + */ + @GetMapping("/monitDays") + public AjaxResult monitDays(Long prjId){ + Long days=dataService.monitDays(prjId); + return AjaxResult.success(days); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosAlarm.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosAlarm.java index 82110204..09a2bd3e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosAlarm.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosAlarm.java @@ -41,22 +41,22 @@ public class PitmonitSouthsmosAlarm extends BaseEntity private Date gmtAlarm; /** 报警时间，如果数据回落至正常范围或被处理，则报警结束 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "报警时间，如果数据回落至正常范围或被处理，则报警结束", width = 30, dateFormat = "yyyy-MM-dd") private Date gmtAlarmOver; /** 开始后第一次产生报警的时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开始后第一次产生报警的时间", width = 30, dateFormat = "yyyy-MM-dd") private Date gmtAlarmStart; /** 数据库记录创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "数据库记录创建时间", width = 30, dateFormat = "yyyy-MM-dd") private Date gmtCreate; /** 报警更新时间，该报警每产生一次都会更新该时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "报警更新时间，该报警每产生一次都会更新该时间", width = 30, dateFormat = "yyyy-MM-dd") private Date gmtModified; @@ -136,6 +136,36 @@ public class PitmonitSouthsmosAlarm extends BaseEntity @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Long isDel; + + private Long projectId; + private String prjName; + private String deptName; + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public String getPrjName() { + return prjName; + } + + public void setPrjName(String prjName) { + this.prjName = prjName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + + public void setId(Long id) { this.id = id; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosData.java index 7310d4b2..b6c658c2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/PitmonitSouthsmosData.java @@ -42,7 +42,7 @@ public class PitmonitSouthsmosData extends BaseEntity private String spName; /** 收集时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "收集时间", width = 30, dateFormat = "yyyy-MM-dd") private Date collectTime; @@ -86,7 +86,35 @@ public class PitmonitSouthsmosData extends BaseEntity @Excel(name = "") private Long isDel; - public void setId(Long id) + private Long projectId; + private String prjName; + private String deptName; + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public String getPrjName() { + return prjName; + } + + public void setPrjName(String prjName) { + this.prjName = prjName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public void setId(Long id) { this.id = id; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosAlarmMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosAlarmMapper.java index 3b25520a..db4e5ebc 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosAlarmMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosAlarmMapper.java @@ -58,4 +58,6 @@ public interface PitmonitSouthsmosAlarmMapper * @return 结果 */ public int deleteDevPitmonitSouthsmosAlarmByIds(Long[] ids); + + public List queryByState(PitmonitSouthsmosAlarm where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDataMapper.java index 7d17dea3..8dcf3ff7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDataMapper.java @@ -1,5 +1,6 @@ package com.yanzhu.jh.device.mapper; +import java.util.Date; import java.util.List; import com.yanzhu.jh.device.domain.PitmonitSouthsmosData; @@ -58,4 +59,21 @@ public interface PitmonitSouthsmosDataMapper * @return 结果 */ public int deleteDevPitmonitSouthsmosDataByIds(Long[] ids); + + public int getCountByPrjId(Long prjId); + + /** + * 获取项目中测点最后一条数据 + * @param id + * @return + */ + public List getLastDataForElement(Long id); + /** + * 按收集日期和数据类型查询数据 + * @param where + * @return + */ + List selectByDate(PitmonitSouthsmosData where); + + public Date monitDays(Long id); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDeviceMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDeviceMapper.java index 4d08300a..232c318e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDeviceMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/mapper/PitmonitSouthsmosDeviceMapper.java @@ -58,4 +58,6 @@ public interface PitmonitSouthsmosDeviceMapper * @return 结果 */ public int deleteDevPitmonitSouthsmosDeviceByIds(Long[] ids); + + public int getCountByPrjId(Long id); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosAlarmService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosAlarmService.java index 4ef0bbd8..4b7d57f5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosAlarmService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosAlarmService.java @@ -58,4 +58,12 @@ public interface IPitmonitSouthsmosAlarmService * @return 结果 */ public int deleteDevPitmonitSouthsmosAlarmById(Long id); + + /** + * 按项目和状态来查询 + * @param prjId + * @param status + * @return + */ + public List queryByState(Long prjId, String status); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDataService.java index 7eb77ae5..cbf5f0db 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDataService.java @@ -58,4 +58,24 @@ public interface IPitmonitSouthsmosDataService * @return 结果 */ public int deleteDevPitmonitSouthsmosDataById(Long id); + + public int getCountByPrjId(Long prjId); + + /** + * 获取项目中测点最后一条数据 + * @param id + * @return + */ + public List getLastDataForElement(Long id); + + /** + * 按收集日期和数据类型查询数据 + * @param where + * @return + */ + public List selectByDate(PitmonitSouthsmosData where); + /** + * 数据监控天数 + */ + public Long monitDays(Long prjId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDeviceService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDeviceService.java index bbdb1162..b9163a42 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDeviceService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/IPitmonitSouthsmosDeviceService.java @@ -58,4 +58,6 @@ public interface IPitmonitSouthsmosDeviceService * @return 结果 */ public int deleteDevPitmonitSouthsmosDeviceById(Long id); + + public int getCountByPrjId(Long prjId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosAlarmServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosAlarmServiceImpl.java index 65172c42..b79f7b66 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosAlarmServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosAlarmServiceImpl.java @@ -95,4 +95,12 @@ public class PitmonitSouthsmosAlarmServiceImpl implements IPitmonitSouthsmosAlar { return pitmonitSouthsmosAlarmMapper.deleteDevPitmonitSouthsmosAlarmById(id); } + + @Override + public List queryByState(Long prjId, String status) { + PitmonitSouthsmosAlarm where=new PitmonitSouthsmosAlarm(); + where.setProjectId(prjId); + where.setStatus(status); + return pitmonitSouthsmosAlarmMapper.queryByState(where); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDataServiceImpl.java index bde8aa99..21f01e87 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDataServiceImpl.java @@ -1,6 +1,10 @@ package com.yanzhu.jh.device.service.impl; +import java.util.Date; import java.util.List; + +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -95,4 +99,34 @@ public class PitmonitSouthsmosDataServiceImpl implements IPitmonitSouthsmosDataS { return pitmonitSouthsmosDataMapper.deleteDevPitmonitSouthsmosDataById(id); } + + @Override + public int getCountByPrjId(Long prjId) { + return pitmonitSouthsmosDataMapper.getCountByPrjId(prjId); + } + + /** + * 获取项目中测点最后一条数据 + * @param id + * @return + */ + @Override + public List getLastDataForElement(Long id) { + return pitmonitSouthsmosDataMapper.getLastDataForElement(id); + } + /** + * 按收集日期和数据类型查询数据 + * @param where + * @return + */ + @Override + public List selectByDate(PitmonitSouthsmosData where) { + return pitmonitSouthsmosDataMapper.selectByDate(where); + } + + @Override + public Long monitDays(Long id) { + Date dt= pitmonitSouthsmosDataMapper.monitDays(id); + return DateUtil.between(new Date(),dt, DateUnit.DAY); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDeviceServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDeviceServiceImpl.java index 92a874c5..abc842ba 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDeviceServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/service/impl/PitmonitSouthsmosDeviceServiceImpl.java @@ -95,4 +95,9 @@ public class PitmonitSouthsmosDeviceServiceImpl implements IPitmonitSouthsmosDev { return pitmonitSouthsmosDeviceMapper.deleteDevPitmonitSouthsmosDeviceById(id); } + + @Override + public int getCountByPrjId(Long prjId) { + return pitmonitSouthsmosDeviceMapper.getCountByPrjId(prjId); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml index 6768235e..81c76a97 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -39,13 +39,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, cfgId, srvId, alarmInfo, alarmSource, gmtAlarm, gmtAlarmOver, gmtAlarmStart, gmtCreate, gmtModified, level, meId, meName, monitorItemId, numbers, result, resultUrl, spId, spName, staff, staffPhone, status, structureId, structureName, threshold, type, variety, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_alarm - and cfgId = #{cfgId} @@ -79,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} @@ -208,4 +210,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml index ccf8bc5f..c28c1ce9 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,13 +27,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, cfgId, dataType, dataId, spId, spName, collectTime, changeRate, changeRate2, displace, displace2, totalize, totalize2, variation, variation2, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_data - and cfgId = #{cfgId} @@ -55,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} @@ -148,4 +150,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + + + + + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml index a38d96fc..294ef03c 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDevSpMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cfgId, devId, spId, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_dev_sp - and cfgId = #{cfgId} @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml index 59bbefb7..1ccd6209 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -39,10 +39,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, cfgId, devId, autoType, certUrl, checkDate, devCode, devShadow, devType, devTypeName, key, manufacturer, name, orgId, parent, parentIds, productType, position, status, structureId, structureName, typeCategory, typeName, verifyDate, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_device + select id, cfgId, devId, autoType, certUrl, checkDate, devCode, devShadow, devType, devTypeName, key, manufacturer, name, orgId, parent, parentIds, productType, position, status, structureId, structureName, typeCategory, typeName, verifyDate, state, remark, is_del, create_by, create_time, update_by, update_time + from dev_pitmonit_southsmos_device - and cfgId = #{cfgId} @@ -73,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} @@ -193,4 +194,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml index df2b58a9..434f0ab8 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementItemMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cfgId, srvId, monitorElementId, name, step, unit, valueRange, gmtCreate, gmtModified, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_element_item - and cfgId = #{cfgId} @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml index f0634f77..754fff4e 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cfgId, srvId, maxSp, monitorStatus, name, nameEn, type, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_element - and cfgId = #{cfgId} @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml index 2e5ebfe1..a91fc2d8 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cfgId, spId, groupId, groupName, meId, meName, meNameEn, modifyDate, name, position, dataSource, createDate, status, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_surveypoint - and cfgId = #{cfgId} @@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml index 9a24adfd..378adf8f 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cfgId, srvId, alarmInfo, alarmName, intervalA, intervalB, level, monitorElementId, monitorItemId, monitorItemName, tgId, threshold, type, unit, state, remark, is_del, create_by, create_time, update_by, update_time from dev_pitmonit_southsmos_threshold - and cfgId = #{cfgId} @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml index f0fe3cf1..6603aeb2 100644 --- a/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time from sur_project_pit_monit_cfg - and project_id = #{projectId} @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id}