Skip to content

G
gassafety-progress
Commit 1e5f3ea8 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress into master

parents 05eb5f40 2e36366e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4292 additions and 286 deletions
gassafetyprogress-admin/src/main/java/com/zehong/web/codeconfig/CodeConFig.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.web.codeconfig;
import java.util.Random;
public class CodeConFig {
//生成四位随机数
public static String RandomCode(){
//生成一个6位随机数
String radom = String.valueOf(new Random().nextInt(999999));
String substring = radom.substring(0,4);
return substring;
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/THiddenDangerStandingBookController.java
View file @ 1e5f3ea8
......@@ -50,7 +50,6 @@ public class THiddenDangerStandingBookController extends BaseController
/**
* 导出隐患整治台账列表
*/
@PreAuthorize("@ss.hasPermi('standingBook:hidden:export')")
@Log(title = "隐患整治台账", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(THiddenDangerStandingBookForm tHiddenDangerStandingBook)
......@@ -63,7 +62,6 @@ public class THiddenDangerStandingBookController extends BaseController
/**
* 获取隐患整治台账详细信息
*/
@PreAuthorize("@ss.hasPermi('standingBook:hidden:query')")
@GetMapping(value = "/{hiddenId}")
public AjaxResult getInfo(@PathVariable("hiddenId") Long hiddenId)
{
......@@ -73,7 +71,6 @@ public class THiddenDangerStandingBookController extends BaseController
/**
* 新增隐患整治台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:hidden:add')")
@Log(title = "隐患整治台账", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody THiddenDangerStandingBook tHiddenDangerStandingBook)
......@@ -84,7 +81,6 @@ public class THiddenDangerStandingBookController extends BaseController
/**
* 修改隐患整治台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:hidden:edit')")
@Log(title = "隐患整治台账", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody THiddenDangerStandingBook tHiddenDangerStandingBook)
......@@ -95,7 +91,6 @@ public class THiddenDangerStandingBookController extends BaseController
/**
* 删除隐患整治台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:hidden:remove')")
@Log(title = "隐患整治台账", businessType = BusinessType.DELETE)
@DeleteMapping("/{hiddenIds}")
public AjaxResult remove(@PathVariable Long[] hiddenIds)
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/TSafeEquipmentStandingBookController.java
View file @ 1e5f3ea8
......@@ -50,7 +50,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
/**
* 导出用户加装安全装置台账列表
*/
@PreAuthorize("@ss.hasPermi('standingBook:equipment:export')")
@Log(title = "用户加装安全装置台账", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook)
......@@ -63,7 +62,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
/**
* 获取用户加装安全装置台账详细信息
*/
@PreAuthorize("@ss.hasPermi('standingBook:equipment:query')")
@GetMapping(value = "/{safeEquipmentId}")
public AjaxResult getInfo(@PathVariable("safeEquipmentId") Long safeEquipmentId)
{
......@@ -73,7 +71,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
/**
* 新增用户加装安全装置台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:equipment:add')")
@Log(title = "用户加装安全装置台账", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
......@@ -84,7 +81,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
/**
* 修改用户加装安全装置台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:equipment:edit')")
@Log(title = "用户加装安全装置台账", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
......@@ -95,7 +91,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
/**
* 删除用户加装安全装置台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:equipment:remove')")
@Log(title = "用户加装安全装置台账", businessType = BusinessType.DELETE)
@DeleteMapping("/{safeEquipmentIds}")
public AjaxResult remove(@PathVariable Long[] safeEquipmentIds)
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/TTroubleStandingBookController.java
View file @ 1e5f3ea8
......@@ -50,7 +50,6 @@ public class TTroubleStandingBookController extends BaseController
/**
* 导出事故台账列表
*/
@PreAuthorize("@ss.hasPermi('standingBook:trouble:export')")
@Log(title = "事故台账", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TTroubleStandingBookForm tTroubleStandingBook)
......@@ -63,7 +62,6 @@ public class TTroubleStandingBookController extends BaseController
/**
* 获取事故台账详细信息
*/
@PreAuthorize("@ss.hasPermi('standingBook:trouble:query')")
@GetMapping(value = "/{troubleId}")
public AjaxResult getInfo(@PathVariable("troubleId") Long troubleId)
{
......@@ -73,7 +71,6 @@ public class TTroubleStandingBookController extends BaseController
/**
* 新增事故台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:trouble:add')")
@Log(title = "事故台账", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TTroubleStandingBook tTroubleStandingBook)
......@@ -84,7 +81,6 @@ public class TTroubleStandingBookController extends BaseController
/**
* 修改事故台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:trouble:edit')")
@Log(title = "事故台账", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TTroubleStandingBook tTroubleStandingBook)
......@@ -95,7 +91,6 @@ public class TTroubleStandingBookController extends BaseController
/**
* 删除事故台账
*/
@PreAuthorize("@ss.hasPermi('standingBook:trouble:remove')")
@Log(title = "事故台账", businessType = BusinessType.DELETE)
@DeleteMapping("/{troubleIds}")
public AjaxResult remove(@PathVariable Long[] troubleIds)
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.web.controller.supervise;
import com.zehong.system.domain.*;
import com.zehong.system.service.IPipeInterfaceService;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 管道信息接口控制层
*/
@Controller
@RestController
@RequestMapping("/pipe/pipe")
public class PipeInterfaceController {
@Autowired
IPipeInterfaceService iPipeInterfaceService;
/**
* 查询管道数据列表
*/
@RequestBody
@RequestMapping("/selectPipeData")
public PipeList selectPipeData() {
//获取分组数据
List<PipeDate> pipeDatesGroup = iPipeInterfaceService.selectGroupPipeData();
//查询管道数据列表
List<PipeDate> pipeDates = iPipeInterfaceService.selectPipeData();
int k=1;
//循环根据权属单位名称分组的数据
for (int i=0;i<pipeDatesGroup.size();i++){
//循环全部数据
for (int n=0;n<pipeDates.size();n++){
//判断如果名称一样就一组
if (pipeDatesGroup.get(i).getPowerCompany().equals(pipeDates.get(n).getPowerCompany())){
// //设置分组类型
pipeDates.get(n).setCompanyType(Integer.parseInt(pipeDates.get(n).getPipeId()));
pipeDates.get(n).setIconType(1);
}
}
k++;
}
PipeList pipeList=new PipeList();
pipeList.setData(pipeDates);
return pipeList;
}
/**
* 调压箱数据查询接口
*/
@RequestBody
@RequestMapping("/selectDeviceData")
public DeviceList selectDeviceData(){
//调压箱数据查询方法
List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData();
DeviceList deviceList=new DeviceList();
for (int i=0;i<deviceData.size();i++){
//查询下级设备数据
List<PressureFlow> pressureFlows = iPipeInterfaceService.selectPressureFlow(deviceData.get(i).getDeviceId());
deviceData.get(i).setPressureFlows(pressureFlows);
deviceData.get(i).setIconType(2);
}
deviceList.setData(deviceData);
return deviceList;
}
/**
* 场站信息查询接口
*/
@RequestBody
@RequestMapping("/selectTSiteStationInfoData")
public TSiteStationInfoDataList selectTSiteStationInfoData(){
//场站信息查询方法
List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData();
TSiteStationInfoDataList tSiteStationInfoDataList=new TSiteStationInfoDataList();
for (int i=0;i<tSiteStationInfoData.size();i++){
//查询场站下级设备数据
List<PressureFlow> pressureFlows = iPipeInterfaceService.selecttSiteStationInfoDataList(tSiteStationInfoData.get(i).getSiteStationId());
tSiteStationInfoData.get(i).setPressureFlows(pressureFlows);
tSiteStationInfoData.get(i).setIconType(4);
}
tSiteStationInfoDataList.setData(tSiteStationInfoData);
return tSiteStationInfoDataList;
}
/**
* 监控信息查询
*/
@RequestBody
@RequestMapping("/selectTvideoManagerData")
public List<TvideoManagerData> selectTvideoManagerData(){
//查询监控信息
List<TvideoManagerData> tvideoManagerData = iPipeInterfaceService.selectTvideoManagerData();
for (int i=0;i<tvideoManagerData.size();i++){
tvideoManagerData.get(i).setIconType(5);
}
return tvideoManagerData;
}
/**
* 燃气用户信息查询接口
*/
@RequestBody
@RequestMapping("/selectTdetectorUser")
public List<TdetectorUserData> selectTdetectorUser(){
//燃气用户信息查询方法
List<TdetectorUserData> tdetectorUserData = iPipeInterfaceService.selectTdetectorUser();
for (int i=0;i<tdetectorUserData.size();i++){
tdetectorUserData.get(i).setIconType(6);
}
return tdetectorUserData;
}
/**
* 企业名称id查询接口
*/
@RequestBody
@RequestMapping("/selectTenterpriseInfoData")
public List<TenterpriseInfoData> selectTenterpriseInfoData(){
//查询企业名称id方法
List<TenterpriseInfoData> tenterpriseInfoData = iPipeInterfaceService.selectTenterpriseInfoData();
return tenterpriseInfoData;
}
/**
* 阀门数据查询接口
*/
@RequestBody
@RequestMapping("/selectvalveData")
public List<PipeDate> selectvalveData(){
//查询阀门井数据
List<PipeDate> pipeDates = iPipeInterfaceService.selectvalveData();
for (int i=0;i<pipeDates.size();i++){
pipeDates.get(i).setIconType(3);
}
return pipeDates;
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorInfoController.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.web.controller.supervise;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType;
import com.zehong.common.enums.ResultEnum;
import com.zehong.common.exception.IOCException;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.TDetectorInfo;
import com.zehong.system.domain.vo.TDetectorAlarmInfoVO;
import com.zehong.system.service.ITDetectorInfoService;
import com.zehong.system.service.ITDetectorReportDataService;
import com.zehong.system.service.ITDetectorUserService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 探测器Controller
*
* @author zehong
* @date 2021-11-02
*/
@RestController
@RequestMapping("/detector/detectorInfo")
@Slf4j
public class TDetectorInfoController extends BaseController
{
@Autowired
private ITDetectorInfoService tDetectorInfoService;
@Autowired
private ITDetectorUserService tDetectorUserService;
@Autowired
private ITDetectorReportDataService tDetectorReportDataService;
/**
* 查询探测器列表
*/
@GetMapping("/list")
public TableDataInfo list(TDetectorInfo tDetectorInfo)
{
startPage();
List<TDetectorInfo> list = tDetectorInfoService.selectTDetectorInfoList(tDetectorInfo);
return getDataTable(list);
}
/**
* 获取探测器列表
* @param tDetectorInfo
* @return
*/
@GetMapping("/detectorInfoList")
public AjaxResult detectorInfoList(TDetectorInfo tDetectorInfo){
return AjaxResult.success(tDetectorInfoService.selectTDetectorInfoList(tDetectorInfo));
}
/**
* 导出探测器列表
*/
@Log(title = "探测器", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TDetectorInfo tDetectorInfo)
{
List<TDetectorInfo> list = tDetectorInfoService.selectTDetectorInfoList(tDetectorInfo);
ExcelUtil<TDetectorInfo> util = new ExcelUtil<TDetectorInfo>(TDetectorInfo.class);
return util.exportExcel(list, "探测器数据");
}
/**
* 获取探测器详细信息
*/
@GetMapping(value = "/{detectorId}")
public AjaxResult getInfo(@PathVariable("detectorId") Long detectorId)
{
return AjaxResult.success(tDetectorInfoService.selectTDetectorInfoById(detectorId));
}
/**
* 新增探测器
*/
@Log(title = "探测器", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TDetectorInfo tDetectorInfo)
{
return toAjax(tDetectorInfoService.insertTDetectorInfo(tDetectorInfo));
}
/**
* 修改探测器
*/
@Log(title = "探测器", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TDetectorInfo tDetectorInfo)
{
return toAjax(tDetectorInfoService.updateTDetectorInfo(tDetectorInfo));
}
/**
* 删除探测器
*/
@Log(title = "探测器", businessType = BusinessType.DELETE)
@DeleteMapping("/{detectorIds}")
public AjaxResult remove(@PathVariable Long[] detectorIds)
{
return toAjax(tDetectorInfoService.deleteTDetectorInfoByIds(detectorIds));
}
@ApiOperation(value = "大屏数据初始化时主动查询的感知设备报警信息前50条")
@GetMapping("/getAlarmData")
public AjaxResult getAlarmData(){
ModelMap map = new ModelMap();
try {
TDetectorInfo detector = new TDetectorInfo();
detector.setIsDel("0");
detector.setDetectorStatus("0");
List<TDetectorInfo> onlineList = tDetectorInfoService.selectTDetectorInfoList(detector);
int onlineNum = onlineList.size();
detector.setDetectorStatus("1");
List<TDetectorInfo> offlineList = tDetectorInfoService.selectTDetectorInfoList(detector);
int offlineNum = offlineList.size();
detector.setDetectorStatus("2");
List<TDetectorInfo> alarmList = tDetectorInfoService.selectTDetectorInfoList(detector);
int alarmNum = alarmList.size();
List<TDetectorAlarmInfoVO> alarmVO = tDetectorReportDataService.selectTDetectorAlarm();
for(TDetectorAlarmInfoVO alarm : alarmVO){
if("1".equals(alarm.getDetectorType())){
alarm.setDetectorType("家用探测器");
} else if ("2".equals(alarm.getDetectorType())){
alarm.setDetectorType("工业探测器");
}
}
map.put("alarmNum", alarmNum);
map.put("onlineNum", onlineNum);
map.put("offlineNum", offlineNum);
map.put("pageData", alarmVO);
} catch (Exception ie){
ie.printStackTrace();
log.error("【查询报警数据】操作出错,error={}",ie.getMessage());
throw new IOCException(ResultEnum.OPERATION_FAIL.getCode(), "查询报警数据操作出错");
}
return AjaxResult.success(map);
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java
View file @ 1e5f3ea8
......@@ -6,6 +6,7 @@ import com.zehong.system.domain.Listaw;
import com.zehong.system.domain.TDetailInfoList;
import com.zehong.system.domain.TDeviceInfoS;
import com.zehong.system.service.ITEmployedPeopleInfoService;
import com.zehong.web.codeconfig.CodeConFig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -77,8 +78,12 @@ public class TDeviceInfoController extends BaseController
@PostMapping
public void add(@RequestBody Listaw listaw)
{
//生成四位随机码
String code = CodeConFig.RandomCode();
listaw.gettDeviceInfo().setDeviceCode(code);
//添加设备信息表数据 并且返回新增id
tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
if (listaw.gettDeviceInfoS()!=null){
//将关联设备信息与设备进行绑定
tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId(),listaw.gettDeviceInfo().getRelationDeviceType());
......
gassafetyprogress-common/pom.xml
View file @ 1e5f3ea8
......@@ -118,6 +118,10 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
......
gassafetyprogress-common/src/main/java/com/zehong/common/enums/ResultEnum.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.common.enums;
import lombok.Getter;
@Getter
public enum ResultEnum {
SUCCESS(0,"成功"),
PARAM_ERROR(10000,"参数不正确"),
NOT_EXIST(20000,"记录不存在"),
ACCOUNT_EXIST(20001,"帐号已存在"),
LOGIN_FAIL(30000,"登录失败"),
ACCOUNT_NO(30001,"账号不存在"),
ACCOUNT_PWD_ERROR(30002,"登录失败，账号或密码错误"),
ACCOUNT_LOCKED(30003,"账号冻结"),
LOGOUT_FAIL(30004,"登出失败"),
AUTH_FAIL(30005,"认证失败"),
AUTH_INFO_ERROR(30006,"认证信息异常"),
ERROR_PERMISSION(30007,"权限不足"),
ERROR_JWT(30008,"凭证认证失败"),
EXPIRED_JWT(30009,"失效的jwtToken"),
ACCOUNT_PWD_EMPTY(30010,"登录失败，帐号或密码不能为空"),
ACCOUNT_OLD_PWD_ERROR(30011,"旧密码错误"),
OPERATION_FAIL(4000,"操作失败"),
INDICATOR_CREATE_FAIL(4001,"新增失败，最多添加3个引领性指标！"),
ORG_CREATE_FAIL(4002,"新增失败，该主管在该时间段内已存在至关重要指标！"),
REQUEST_METHOD_SUPPORT_ERROR(4003,"当前请求方法不支持"),
MEETING_CREATE_FAIL(4004,"本周已填写至关重要目标会议！"),
SERVER_FAIL(5000,"服务器开小差了~~"),
INTERNAL_SERVER_ERROR(5001, "服务器内部错误!"),
SERVER_BUSY(5002, "服务器正忙，请稍后再试!"),
ENTERPRISE_EXIST(6000, "企业机构代码已注册!"),
ENTERPRISE_NOEXIST(6001, "企业机构代码不存在!"),
DETECTOR_NOEXIST(7000, "探测器编号不存在！")
;
private Integer code;
private String message;
ResultEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
gassafetyprogress-common/src/main/java/com/zehong/common/exception/IOCException.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.common.exception;
import com.zehong.common.enums.ResultEnum;
import lombok.Getter;
@Getter
public class IOCException extends RuntimeException {
private static final long serialVersionUID = 7272332822781740888L;
private Integer code;
public IOCException(ResultEnum resultEnum){
super(resultEnum.getMessage());
this.code = resultEnum.getCode();
}
public IOCException(Integer code, String message){
super(message);
this.code = code;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/DeviceData.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import java.util.List;
/**
* 调压箱前端返回接口封装类
*/
public class DeviceData {
private String deviceId;
private String enterpriseId;
private String type;
private String deviceName;
private String deviceCode;
private String deviceAddr;
private String longitude;
private String latitude;
private String companyType;
private List<PressureFlow> pressureFlows;
private String beyondEnterpriseName;
private int iconType;
public int getIconType() {
return iconType;
}
public void setIconType(int iconType) {
this.iconType = iconType;
}
public String getBeyondEnterpriseName() {
return beyondEnterpriseName;
}
public void setBeyondEnterpriseName(String beyondEnterpriseName) {
this.beyondEnterpriseName = beyondEnterpriseName;
}
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getDeviceCode() {
return deviceCode;
}
public void setDeviceCode(String deviceCode) {
this.deviceCode = deviceCode;
}
public String getDeviceAddr() {
return deviceAddr;
}
public void setDeviceAddr(String deviceAddr) {
this.deviceAddr = deviceAddr;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getCompanyType() {
return companyType;
}
public void setCompanyType(String companyType) {
this.companyType = companyType;
}
public List<PressureFlow> getPressureFlows() {
return pressureFlows;
}
public void setPressureFlows(List<PressureFlow> pressureFlows) {
this.pressureFlows = pressureFlows;
}
@Override
public String toString() {
return "DeviceData{" +
"deviceId='" + deviceId + '\'' +
", enterpriseId='" + enterpriseId + '\'' +
", type='" + type + '\'' +
", deviceName='" + deviceName + '\'' +
", deviceCode='" + deviceCode + '\'' +
", deviceAddr='" + deviceAddr + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", companyType='" + companyType + '\'' +
", pressureFlows=" + pressureFlows +
", beyondEnterpriseName='" + beyondEnterpriseName + '\'' +
", iconType=" + iconType +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/DeviceList.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import java.util.List;
public class DeviceList {
private List<DeviceData> data;
public List<DeviceData> getData() {
return data;
}
public void setData(List<DeviceData> data) {
this.data = data;
}
@Override
public String toString() {
return "DeviceList{" +
"data=" + data +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/PipeDate.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import com.zehong.common.core.domain.BaseEntity;
public class PipeDate extends BaseEntity {
private String pipeId;
private String pipeya;
private String pipeDiameter;
private String pipeMaterial;
private String pipeDepth;
private String pipeTrend;
private String buildyear;
private String buildCompany;
private String powerCompany;
private String type;
private String pipeAddr;
private String path;
private String pipeLength;
private String pipeType;
private int pipePressure;
private String iconUrl;
private String installationTime;
private String inspectionTime;
private int companyType;
private int iconType;
public String getPipeId() {
return pipeId;
}
public void setPipeId(String pipeId) {
this.pipeId = pipeId;
}
public int getIconType() {
return iconType;
}
public void setIconType(int iconType) {
this.iconType = iconType;
}
public int getCompanyType() {
return companyType;
}
public void setCompanyType(int companyType) {
this.companyType = companyType;
}
public String getPipeya() {
return pipeya;
}
public void setPipeya(String pipeya) {
this.pipeya = pipeya;
}
public String getPipeDiameter() {
return pipeDiameter;
}
public void setPipeDiameter(String pipeDiameter) {
this.pipeDiameter = pipeDiameter;
}
public String getPipeMaterial() {
return pipeMaterial;
}
public void setPipeMaterial(String pipeMaterial) {
this.pipeMaterial = pipeMaterial;
}
public String getPipeDepth() {
return pipeDepth;
}
public void setPipeDepth(String pipeDepth) {
this.pipeDepth = pipeDepth;
}
public String getPipeTrend() {
return pipeTrend;
}
public void setPipeTrend(String pipeTrend) {
this.pipeTrend = pipeTrend;
}
public String getBuildyear() {
return buildyear;
}
public void setBuildyear(String buildyear) {
this.buildyear = buildyear;
}
public String getBuildCompany() {
return buildCompany;
}
public void setBuildCompany(String buildCompany) {
this.buildCompany = buildCompany;
}
public String getPowerCompany() {
return powerCompany;
}
public void setPowerCompany(String powerCompany) {
this.powerCompany = powerCompany;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getPipeAddr() {
return pipeAddr;
}
public void setPipeAddr(String pipeAddr) {
this.pipeAddr = pipeAddr;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public String getPipeLength() {
return pipeLength;
}
public void setPipeLength(String pipeLength) {
this.pipeLength = pipeLength;
}
public String getPipeType() {
return pipeType;
}
public void setPipeType(String pipeType) {
this.pipeType = pipeType;
}
public int getPipePressure() {
return pipePressure;
}
public void setPipePressure(int pipePressure) {
this.pipePressure = pipePressure;
}
public String getIconUrl() {
return iconUrl;
}
public void setIconUrl(String iconUrl) {
this.iconUrl = iconUrl;
}
public String getInstallationTime() {
return installationTime;
}
public void setInstallationTime(String installationTime) {
this.installationTime = installationTime;
}
public String getInspectionTime() {
return inspectionTime;
}
public void setInspectionTime(String inspectionTime) {
this.inspectionTime = inspectionTime;
}
@Override
public String toString() {
return "PipeDate{" +
"pipeId='" + pipeId + '\'' +
", pipeya='" + pipeya + '\'' +
", pipeDiameter='" + pipeDiameter + '\'' +
", pipeMaterial='" + pipeMaterial + '\'' +
", pipeDepth='" + pipeDepth + '\'' +
", pipeTrend='" + pipeTrend + '\'' +
", buildyear='" + buildyear + '\'' +
", buildCompany='" + buildCompany + '\'' +
", powerCompany='" + powerCompany + '\'' +
", type='" + type + '\'' +
", pipeAddr='" + pipeAddr + '\'' +
", path='" + path + '\'' +
", pipeLength='" + pipeLength + '\'' +
", pipeType='" + pipeType + '\'' +
", pipePressure=" + pipePressure +
", iconUrl='" + iconUrl + '\'' +
", installationTime='" + installationTime + '\'' +
", inspectionTime='" + inspectionTime + '\'' +
", companyType=" + companyType +
", iconType=" + iconType +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/PipeList.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import java.util.List;
public class PipeList {
private List<PipeDate> data;
public List<PipeDate> getData() {
return data;
}
public void setData(List<PipeDate> data) {
this.data = data;
}
@Override
public String toString() {
return "PipeList{" +
"data=" + data +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/PressureFlow.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
public class PressureFlow {
private String deviceNo;
private String deviceType;
private String deviceState;
private String deviceNum;
private String reportTime;
public String getDeviceNo() {
return deviceNo;
}
public void setDeviceNo(String deviceNo) {
this.deviceNo = deviceNo;
}
public String getDeviceType() {
return deviceType;
}
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public String getDeviceState() {
return deviceState;
}
public void setDeviceState(String deviceState) {
this.deviceState = deviceState;
}
public String getDeviceNum() {
return deviceNum;
}
public void setDeviceNum(String deviceNum) {
this.deviceNum = deviceNum;
}
public String getReportTime() {
return reportTime;
}
public void setReportTime(String reportTime) {
this.reportTime = reportTime;
}
@Override
public String toString() {
return "PressureFlow{" +
"deviceNo='" + deviceNo + '\'' +
", deviceType='" + deviceType + '\'' +
", deviceState='" + deviceState + '\'' +
", deviceNum='" + deviceNum + '\'' +
", reportTime='" + reportTime + '\'' +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDetectorInfo.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
/**
* 探测器对象 t_detector_info
*
* @author zehong
* @date 2021-11-02
*/
public class TDetectorInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 设备id */
private Long detectorId;
/** 企业id */
private Integer enterpriseId;
/** 用户id */
@Excel(name = "用户id")
private Long userId;
/** 设备名称 */
@Excel(name = "设备名称")
private String detectorName;
/** 设备编号 */
@Excel(name = "设备编号")
private String detectorCode;
/** 设备地址 */
@Excel(name = "设备地址")
private String detectorAddr;
/** 设备类型（1家用报警器，2工业报警器） */
@Excel(name = "设备类型", readConverterExp = "1家用报警器，2工业报警器")
private String detectorType;
/** 检测介质（1甲烷，2氨气，3一氧化碳，4可燃气体，5有毒气体） */
@Excel(name = "检测介质", readConverterExp = "1甲烷，2氨气，3一氧化碳，4可燃气体，5有毒气体")
private String medium;
/** 经度 */
@Excel(name = "经度")
private BigDecimal longitude;
/** 纬度 */
@Excel(name = "纬度")
private BigDecimal latitude;
/** 物联网编号 */
@Excel(name = "物联网编号")
private String iotNo;
/** 联系人 */
@Excel(name = "联系人")
private String linkman;
/** 电话 */
@Excel(name = "电话")
private String phone;
/** 创建时间 */
private Date creatTime;
/** 报警时间 */
private String alarmTime;
/** 设备状态(0正常，1离线，2报警) */
@Excel(name = "设备状态")
private String detectorStatus;
/** 是否删除(0正常，1删除) */
@Excel(name = "是否删除(0正常，1删除)")
private String isDel;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setDetectorId(Long detectorId)
{
this.detectorId = detectorId;
}
public Long getDetectorId()
{
return detectorId;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setDetectorName(String detectorName)
{
this.detectorName = detectorName;
}
public String getDetectorName()
{
return detectorName;
}
public void setDetectorCode(String detectorCode)
{
this.detectorCode = detectorCode;
}
public String getDetectorCode()
{
return detectorCode;
}
public void setDetectorAddr(String detectorAddr)
{
this.detectorAddr = detectorAddr;
}
public String getDetectorAddr()
{
return detectorAddr;
}
public void setDetectorType(String detectorType)
{
this.detectorType = detectorType;
}
public String getDetectorType()
{
return detectorType;
}
public void setMedium(String medium)
{
this.medium = medium;
}
public String getMedium()
{
return medium;
}
public void setLongitude(BigDecimal longitude)
{
this.longitude = longitude;
}
public BigDecimal getLongitude()
{
return longitude;
}
public void setLatitude(BigDecimal latitude)
{
this.latitude = latitude;
}
public BigDecimal getLatitude()
{
return latitude;
}
public void setIotNo(String iotNo)
{
this.iotNo = iotNo;
}
public String getIotNo()
{
return iotNo;
}
public void setLinkman(String linkman)
{
this.linkman = linkman;
}
public String getLinkman()
{
return linkman;
}
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
{
return phone;
}
public Date getCreatTime() {
return creatTime;
}
public void setCreatTime(Date creatTime) {
this.creatTime = creatTime;
}
public String getAlarmTime() {
return alarmTime;
}
public void setAlarmTime(String alarmTime) {
this.alarmTime = alarmTime;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public String getDetectorStatus() {
return detectorStatus;
}
public void setDetectorStatus(String detectorStatus) {
this.detectorStatus = detectorStatus;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDetectorReportData.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import java.io.Serializable;
import java.util.Date;
public class TDetectorReportData implements Serializable {
private Integer id;
private String sourceId;
private String detectorCode;
private String detectorStatusId;
private String statusName;
private Float reportValue;
private Integer zhHostStatusId;
private Integer netPoint;
private Integer signalStrength;
private String ipAddress;
private Date createTime;
// 是否销警，默认0, 1自动销警，2手动销警
private String isCancelAlarm;
private Date cancelTime;
private static final long serialVersionUID = 1L;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getSourceId() {
return sourceId;
}
public void setSourceId(String sourceId) {
this.sourceId = sourceId == null ? null : sourceId.trim();
}
public String getDetectorCode() {
return detectorCode;
}
public void setDetectorCode(String detectorCode) {
this.detectorCode = detectorCode;
}
public String getDetectorStatusId() {
return detectorStatusId;
}
public void setDetectorStatusId(String detectorStatusId) {
this.detectorStatusId = detectorStatusId;
}
public String getStatusName() {
return statusName;
}
public void setStatusName(String statusName) {
this.statusName = statusName;
}
public Float getReportValue() {
return reportValue;
}
public void setReportValue(Float reportValue) {
this.reportValue = reportValue;
}
public Integer getZhHostStatusId() {
return zhHostStatusId;
}
public void setZhHostStatusId(Integer zhHostStatusId) {
this.zhHostStatusId = zhHostStatusId;
}
public Integer getNetPoint() {
return netPoint;
}
public void setNetPoint(Integer netPoint) {
this.netPoint = netPoint;
}
public Integer getSignalStrength() {
return signalStrength;
}
public void setSignalStrength(Integer signalStrength) {
this.signalStrength = signalStrength;
}
public String getIpAddress() {
return ipAddress;
}
public void setIpAddress(String ipAddress) {
this.ipAddress = ipAddress == null ? null : ipAddress.trim();
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getIsCancelAlarm() {
return isCancelAlarm;
}
public void setIsCancelAlarm(String isCancelAlarm) {
this.isCancelAlarm = isCancelAlarm == null ? null : isCancelAlarm.trim();
}
public Date getCancelTime() {
return cancelTime;
}
public void setCancelTime(Date cancelTime) {
this.cancelTime = cancelTime;
}
}
\ No newline at end of file
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEmployedPeopleInfo.java
View file @ 1e5f3ea8
......@@ -31,7 +31,7 @@ public class TEmployedPeopleInfo extends BaseEntity
private String idCard;
/** 证书编号 */
@Excel(name = "证书编号")
@Excel(name = "技能岗位证书编号")
private String certificateNum;
/** 受聘企业名称 */
......@@ -41,12 +41,12 @@ public class TEmployedPeopleInfo extends BaseEntity
/** 受聘企业id */
private Long beyondEnterpriseId;
/** 报考类型 */
@Excel(name = "报考类型")
/** 发证部门 */
@Excel(name = "发证部门")
private String registerExaminationType;
/** 人员类型：1.运行维护人员 2.抢修人员 */
@Excel(name = "人员类型")
/** 任职岗位：1.主要负责人 2.安全管理人员3.运行维护和抢修人员 */
@Excel(name = "任职岗位")
private String peopleOccupation;
/** 发证日期 */
......@@ -54,8 +54,8 @@ public class TEmployedPeopleInfo extends BaseEntity
@JsonFormat(pattern="yyyy-MM-dd")
private String issueDate;
/** 证书变更情况 */
@Excel(name = "证书变更情况")
/** 复检日期 */
@Excel(name = "复检日期")
private String certificateChange;
/** 是否删除(0正常，1删除) */
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSiteStationInfoData.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import java.util.List;
public class TSiteStationInfoData {
private String siteStationId;
private String stationName;
private String stationType;
private String type;
private String stationAddr;
private String longitude;
private String latitude;
private String buildyear;
private String buildCompany;
private String powerCompany;
private List<PressureFlow> pressureFlows;
private int iconType;
public int getIconType() {
return iconType;
}
public void setIconType(int iconType) {
this.iconType = iconType;
}
public String getSiteStationId() {
return siteStationId;
}
public void setSiteStationId(String siteStationId) {
this.siteStationId = siteStationId;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public String getStationType() {
return stationType;
}
public void setStationType(String stationType) {
this.stationType = stationType;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getStationAddr() {
return stationAddr;
}
public void setStationAddr(String stationAddr) {
this.stationAddr = stationAddr;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getBuildyear() {
return buildyear;
}
public void setBuildyear(String buildyear) {
this.buildyear = buildyear;
}
public String getBuildCompany() {
return buildCompany;
}
public void setBuildCompany(String buildCompany) {
this.buildCompany = buildCompany;
}
public String getPowerCompany() {
return powerCompany;
}
public void setPowerCompany(String powerCompany) {
this.powerCompany = powerCompany;
}
public List<PressureFlow> getPressureFlows() {
return pressureFlows;
}
public void setPressureFlows(List<PressureFlow> pressureFlows) {
this.pressureFlows = pressureFlows;
}
@Override
public String toString() {
return "TSiteStationInfoData{" +
"siteStationId='" + siteStationId + '\'' +
", stationName='" + stationName + '\'' +
", stationType='" + stationType + '\'' +
", type='" + type + '\'' +
", stationAddr='" + stationAddr + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", buildyear='" + buildyear + '\'' +
", buildCompany='" + buildCompany + '\'' +
", powerCompany='" + powerCompany + '\'' +
", pressureFlows=" + pressureFlows +
", iconType=" + iconType +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSiteStationInfoDataList.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
import java.util.List;
public class TSiteStationInfoDataList {
private List<TSiteStationInfoData> data;
public List<TSiteStationInfoData> getData() {
return data;
}
public void setData(List<TSiteStationInfoData> data) {
this.data = data;
}
@Override
public String toString() {
return "TSiteStationInfoDataList{" +
"data=" + data +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TdetectorUserData.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
public class TdetectorUserData {
private String usrName;
private String usrType;
private String type;
private String longitude;
private String latitude;
private String phone;
private String address;
private String companyType;
private int iconType;
public int getIconType() {
return iconType;
}
public void setIconType(int iconType) {
this.iconType = iconType;
}
public String getUsrName() {
return usrName;
}
public void setUsrName(String usrName) {
this.usrName = usrName;
}
public String getUsrType() {
return usrType;
}
public void setUsrType(String usrType) {
this.usrType = usrType;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getCompanyType() {
return companyType;
}
public void setCompanyType(String companyType) {
this.companyType = companyType;
}
@Override
public String toString() {
return "TdetectorUserData{" +
"usrName='" + usrName + '\'' +
", usrType='" + usrType + '\'' +
", type='" + type + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", phone='" + phone + '\'' +
", address='" + address + '\'' +
", companyType='" + companyType + '\'' +
", iconType=" + iconType +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TenterpriseInfoData.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
public class TenterpriseInfoData {
private String enterpriseId;
private String enterpriseName;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
@Override
public String toString() {
return "TenterpriseInfoData{" +
"enterpriseId='" + enterpriseId + '\'' +
", enterpriseName='" + enterpriseName + '\'' +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TvideoManagerData.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain;
public class TvideoManagerData {
private String companyType;
private String videoManagerId;
private String videoName;
private String resourceId;
private String usr;
private String longitude;
private String latitude;
private String videoAddress;
private String type;
private int iconType;
public int getIconType() {
return iconType;
}
public void setIconType(int iconType) {
this.iconType = iconType;
}
public String getCompanyType() {
return companyType;
}
public void setCompanyType(String companyType) {
this.companyType = companyType;
}
public String getVideoManagerId() {
return videoManagerId;
}
public void setVideoManagerId(String videoManagerId) {
this.videoManagerId = videoManagerId;
}
public String getVideoName() {
return videoName;
}
public void setVideoName(String videoName) {
this.videoName = videoName;
}
public String getResourceId() {
return resourceId;
}
public void setResourceId(String resourceId) {
this.resourceId = resourceId;
}
public String getUsr() {
return usr;
}
public void setUsr(String usr) {
this.usr = usr;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getVideoAddress() {
return videoAddress;
}
public void setVideoAddress(String videoAddress) {
this.videoAddress = videoAddress;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Override
public String toString() {
return "TvideoManagerData{" +
"companyType='" + companyType + '\'' +
", videoManagerId='" + videoManagerId + '\'' +
", videoName='" + videoName + '\'' +
", resourceId='" + resourceId + '\'' +
", usr='" + usr + '\'' +
", longitude='" + longitude + '\'' +
", latitude='" + latitude + '\'' +
", videoAddress='" + videoAddress + '\'' +
", type='" + type + '\'' +
", iconType=" + iconType +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/dto/TDetectorInfoDTO.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain.dto;
import lombok.Data;
@Data
public class TDetectorInfoDTO {
private String deviceType; // 1探测器、2安全用电设备
private String deviceCode;
//探测器 推送数据（1正常，7、9离线，其他值预警） 用电推送数据（E正常，0正常，1故障，2预警）
private String deviceStatus;
private String alarmTime;
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/TDetectorReportDataForm.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain.form;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@Data
public class TDetectorReportDataForm {
//数据上报原始ID必填 正常数据为用户名，报警数据为用户名+主键id
@NotEmpty(message="数据上报原始ID必填")
private String sourceId;
@NotEmpty(message="设备编号必填")
private String deviceNo;
//报警设备类型，1探测器，2智慧用电
private String deviceType;
//探测器 推送数据（1正常，7、9离线，其他值预警）
private String deviceStatusId;
//状态名称
private String statusName;
private String reportValue;
private String zhHostStatusId;
private String netPoint;
private String signalStrength;
private String ipAddress;
//创建时间
@NotEmpty(message="上报时间必填")
private String createTime;
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TDetectorAlarmInfoVO.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
* 推送的报警数据信息
* @author zhangzhizhong
*
*/
public class TDetectorAlarmInfoVO {
// 设备编号
private String detectorCode;
// 监测单位
private String unitName;
// 设备类型
private String detectorType;
// 预警类型
private String statusName;
// 预警时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date alarmTime;
// 处理状态
private String handledStatus;
public String getDetectorCode() {
return detectorCode;
}
public void setDetectorCode(String detectorCode) {
this.detectorCode = detectorCode;
}
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public String getDetectorType() {
return detectorType;
}
public void setDetectorType(String detectorType) {
this.detectorType = detectorType;
}
public String getStatusName() {
return statusName;
}
public void setStatusName(String statusName) {
this.statusName = statusName;
}
public Date getAlarmTime() {
return alarmTime;
}
public void setAlarmTime(Date alarmTime) {
this.alarmTime = alarmTime;
}
public String getHandledStatus() {
return handledStatus;
}
public void setHandledStatus(String handledStatus) {
this.handledStatus = handledStatus;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TDetectorUserVO.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.domain.vo;
import lombok.Data;
import java.math.BigDecimal;
/**
* 探测器用户对象 t_detector_user
*
* @author zehong
* @date 2021-11-02
*/
@Data
public class TDetectorUserVO
{
private static final long serialVersionUID = 1L;
/** 用户id */
private Long userId;
/** 用户账号 */
private String username;
/** 用户名称 */
private String nickName;
/** 用户类型（1居民用户，2商业用户，3工业用户） */
private String userType;
/** 探测器总数 */
private Integer detectorCount;
/** 在线数量 */
private Integer onLineNum;
/** 离线数量 */
private Integer offLineNum;
/** 历史报警数 */
private Integer historyAlarmNum;
/** 已处理报警 */
private Integer cancelAlarmNum;
/** 报警中 */
private Integer processingAlarmNum;
/** 地址 */
private String address;
/** 经度 */
private BigDecimal longitude;
/** 纬度 */
private BigDecimal latitude;
/** 联系人 */
private String linkman;
/** 电话 */
private String phone;
/** 邮箱 */
private String email;
/** 是否删除(0正常，1删除) */
private String isDel;
/** 备注 */
private String remarks;
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/PipeInterfaceMapper.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.mapper;
import com.zehong.system.domain.*;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 管道信息数据持久层
*/
@Mapper
public interface PipeInterfaceMapper {
/**
* 查询管道数据列表
* @return
*/
List<PipeDate> selectPipeData();
/**
* 获取分组数据
* @return
*/
List<PipeDate> selectGroupPipeData();
/**
* 调压箱数据查询方法
* @return
*/
List<DeviceData> selectDeviceData();
/**
* 查询下级设备数据
* @param deviceId
* @return
*/
List<PressureFlow> selectPressureFlow(String deviceId);
/**
* 场站信息查询方法
* @return
*/
List<TSiteStationInfoData> selectTSiteStationInfoData();
/**
* 查询场站下级数据
* @param siteStationId
* @return
*/
List<PressureFlow> selecttSiteStationInfoDataList(String siteStationId);
/**
* 监控信息查询
* @return
*/
List<TvideoManagerData> selectTvideoManagerData();
/**
* 燃气用户信息查询接口
* @return
*/
List<TdetectorUserData> selectTdetectorUser();
/**
* 查询企业名称id方法
* @return
*/
List<TenterpriseInfoData> selectTenterpriseInfoData();
/**
* 查询阀门井数据
* @return
*/
List<PipeDate> selectvalveData();
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDetectorInfoMapper.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.mapper;
import com.zehong.system.domain.TDetectorInfo;
import java.util.List;
/**
* 探测器Mapper接口
*
* @author zehong
* @date 2021-11-02
*/
public interface TDetectorInfoMapper
{
/**
* 查询探测器
*
* @param detectorId 探测器ID
* @return 探测器
*/
public TDetectorInfo selectTDetectorInfoById(Long detectorId);
/**
* 查询探测器
*
* @param detectorCode 探测器编号
* @return 探测器
*/
public TDetectorInfo selectTDetectorInfoByCode(String detectorCode);
/**
* 查询探测器列表
*
* @param tDetectorInfo 探测器
* @return 探测器集合
*/
public List<TDetectorInfo> selectTDetectorInfoList(TDetectorInfo tDetectorInfo);
/**
* 新增探测器
*
* @param tDetectorInfo 探测器
* @return 结果
*/
public int insertTDetectorInfo(TDetectorInfo tDetectorInfo);
public int insertBatch(List<TDetectorInfo> detectorList);
public int updateBatch(List<TDetectorInfo> detectorList);
/**
* 修改探测器
*
* @param tDetectorInfo 探测器
* @return 结果
*/
public int updateTDetectorInfo(TDetectorInfo tDetectorInfo);
/**
* 删除探测器
*
* @param detectorId 探测器ID
* @return 结果
*/
public int deleteTDetectorInfoById(Long detectorId);
/**
* 批量删除探测器
*
* @param detectorIds 需要删除的数据ID
* @return 结果
*/
public int deleteTDetectorInfoByIds(Long[] detectorIds);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDetectorReportDataMapper.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.mapper;
import com.zehong.system.domain.TDetectorInfo;
import com.zehong.system.domain.TDetectorReportData;
import com.zehong.system.domain.vo.TDetectorAlarmInfoVO;
import java.util.List;
/**
* 设备上报的数据Mapper接口
*
* @author zehong
* @date 2021-11-08
*/
public interface TDetectorReportDataMapper
{
/**
* 查询设备上报的数据
*
* @param id 设备上报的数据ID
* @return 设备上报的数据
*/
public TDetectorReportData selectTDetectorReportDataById(Long id);
public List<TDetectorReportData> selectTDetectorReportDataByCode(String detectorCode);
public List<TDetectorReportData> countDetectorByUserId(TDetectorInfo tDetectorInfo);
public List<TDetectorAlarmInfoVO> selectTDetectorAlarm();
public List<TDetectorReportData> selectRealtimeDataList();
/**
* 查询设备上报的数据列表
*
* @param tDetectorReportData 设备上报的数据
* @return 设备上报的数据集合
*/
public List<TDetectorReportData> selectTDetectorReportDataList(TDetectorReportData tDetectorReportData);
/**
* 新增设备上报的数据
*
* @param tDetectorReportData 设备上报的数据
* @return 结果
*/
public int insertTDetectorReportData(TDetectorReportData tDetectorReportData);
/**
* 修改设备上报的数据
*
* @param tDetectorReportData 设备上报的数据
* @return 结果
*/
public int updateTDetectorReportData(TDetectorReportData tDetectorReportData);
/**
* 删除设备上报的数据
*
* @param id 设备上报的数据ID
* @return 结果
*/
public int deleteTDetectorReportDataById(Long id);
/**
* 批量删除设备上报的数据
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteTDetectorReportDataByIds(Long[] ids);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/IPipeInterfaceService.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.service;
import com.zehong.system.domain.*;
import java.util.List;
/**
* 管道信息数据实现层
*/
public interface IPipeInterfaceService {
/**
* 查询管道数据列表
* @return
*/
List<PipeDate> selectPipeData();
/**
* 获取分组数据
* @return
*/
List<PipeDate> selectGroupPipeData();
/**
* 调压箱数据查询方法
* @return
*/
List<DeviceData> selectDeviceData();
/**
*查询下级设备数据
* @param deviceId
* @return
*/
List<PressureFlow> selectPressureFlow(String deviceId);
/**
* 场站信息查询方法
* @return
*/
List<TSiteStationInfoData> selectTSiteStationInfoData();
/**
* 查询场站下级设备数据
* @param siteStationId
* @return
*/
List<PressureFlow> selecttSiteStationInfoDataList(String siteStationId);
/**
* 监控信息查询
* @return
*/
List<TvideoManagerData> selectTvideoManagerData();
/**
* 燃气用户信息查询接口
* @return
*/
List<TdetectorUserData> selectTdetectorUser();
/**
* 查询企业名称id方法
* @return
*/
List<TenterpriseInfoData> selectTenterpriseInfoData();
/**
* 查询阀门井数据
* @return
*/
List<PipeDate> selectvalveData();
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDetectorInfoService.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.service;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TDetectorInfo;
import java.util.List;
/**
* 探测器Service接口
*
* @author zehong
* @date 2021-11-02
*/
public interface ITDetectorInfoService
{
/**
* 查询探测器
*
* @param detectorId 探测器ID
* @return 探测器
*/
public TDetectorInfo selectTDetectorInfoById(Long detectorId);
/**
* 查询探测器
*
* @param detectorCode 探测器编号
* @return 探测器
*/
public TDetectorInfo selectTDetectorInfoByCode(String detectorCode);
/**
* 查询探测器列表
*
* @param tDetectorInfo 探测器
* @return 探测器集合
*/
public List<TDetectorInfo> selectTDetectorInfoList(TDetectorInfo tDetectorInfo);
/**
* 查询探测器分页列表
*
* @param tDetectorInfo 探测器
* @return 探测器分页集合
*/
public PageInfo<TDetectorInfo> selectTDetectorInfoPage(TDetectorInfo tDetectorInfo);
/**
* 新增探测器
*
* @param tDetectorInfo 探测器
* @return 结果
*/
public int insertTDetectorInfo(TDetectorInfo tDetectorInfo);
public int insertBatch(List<TDetectorInfo> detectorList);
public int updateBatch(List<TDetectorInfo> detectorList);
/**
* 修改探测器
*
* @param tDetectorInfo 探测器
* @return 结果
*/
public int updateTDetectorInfo(TDetectorInfo tDetectorInfo);
/**
* 批量删除探测器
*
* @param detectorIds 需要删除的探测器ID
* @return 结果
*/
public int deleteTDetectorInfoByIds(Long[] detectorIds);
/**
* 删除探测器信息
*
* @param detectorId 探测器ID
* @return 结果
*/
public int deleteTDetectorInfoById(Long detectorId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDetectorReportDataService.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.service;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TDetectorInfo;
import com.zehong.system.domain.TDetectorReportData;
import com.zehong.system.domain.vo.TDetectorAlarmInfoVO;
import java.util.List;
/**
* 设备上报的数据Service接口
*
* @author zehong
* @date 2021-11-08
*/
public interface ITDetectorReportDataService
{
/**
* 查询设备上报的数据
*
* @param id 设备上报的数据ID
* @return 设备上报的数据
*/
public TDetectorReportData selectTDetectorReportDataById(Long id);
public List<TDetectorReportData> selectTDetectorReportDataByCode(String detectorCode);
public List<TDetectorReportData> selectRealtimeDataList();
public List<TDetectorAlarmInfoVO> selectTDetectorAlarm();
public List<TDetectorReportData> countDetectorByUserId(TDetectorInfo tDetectorInfo);
/**
* 查询设备上报的数据列表
*
* @param tDetectorReportData 设备上报的数据
* @return 设备上报的数据集合
*/
public List<TDetectorReportData> selectTDetectorReportDataList(TDetectorReportData tDetectorReportData);
/**
* 查询设备上报的数据分页列表
*
* @param tDetectorReportData 设备上报的数据
* @return 设备上报的数据分页集合
*/
public PageInfo<TDetectorReportData> selectTDetectorReportDataPage(TDetectorReportData tDetectorReportData);
/**
* 新增设备上报的数据
*
* @param tDetectorReportData 设备上报的数据
* @return 结果
*/
public int insertTDetectorReportData(TDetectorReportData tDetectorReportData);
/**
* 修改设备上报的数据
*
* @param tDetectorReportData 设备上报的数据
* @return 结果
*/
public int updateTDetectorReportData(TDetectorReportData tDetectorReportData);
/**
* 批量删除设备上报的数据
*
* @param ids 需要删除的设备上报的数据ID
* @return 结果
*/
public int deleteTDetectorReportDataByIds(Long[] ids);
/**
* 删除设备上报的数据信息
*
* @param id 设备上报的数据ID
* @return 结果
*/
public int deleteTDetectorReportDataById(Long id);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDetectorUserService.java
View file @ 1e5f3ea8
......@@ -2,6 +2,7 @@ package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TDetectorUser;
import com.zehong.system.domain.vo.TDetectorUserVO;
/**
* 燃气用户Service接口
......@@ -11,6 +12,15 @@ import com.zehong.system.domain.TDetectorUser;
*/
public interface ITDetectorUserService
{
/**
* 查询探测器用户列表
*
* @param tDetectorUser 探测器用户
* @return 探测器用户集合
*/
public List<TDetectorUserVO> detectorUserList(TDetectorUser tDetectorUser);
/**
* 查询燃气用户
*
......
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/PipeInterfaceServiceImpl.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.service.impl;
import com.zehong.system.domain.*;
import com.zehong.system.mapper.PipeInterfaceMapper;
import com.zehong.system.service.IPipeInterfaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 管道信息数据实现层
*/
@Service
public class PipeInterfaceServiceImpl implements IPipeInterfaceService {
@Autowired
PipeInterfaceMapper pipeInterfaceMapper;
/**
* 查询管道数据列表
* @return
*/
@Override
public List<PipeDate> selectPipeData() {
List<PipeDate> pipeDates = pipeInterfaceMapper.selectPipeData();
return pipeDates;
}
/**
* 获取分组数据
* @return
*/
@Override
public List<PipeDate> selectGroupPipeData() {
List<PipeDate> pipeDates = pipeInterfaceMapper.selectGroupPipeData();
return pipeDates;
}
/**
* 调压箱数据查询方法
* @return
*/
@Override
public List<DeviceData> selectDeviceData() {
List<DeviceData> deviceData = pipeInterfaceMapper.selectDeviceData();
return deviceData;
}
/**
* 查询下级设备数据
* @param deviceId
* @return
*/
@Override
public List<PressureFlow> selectPressureFlow(String deviceId) {
List<PressureFlow> pressureFlows = pipeInterfaceMapper.selectPressureFlow(deviceId);
return pressureFlows;
}
/**
* 场站信息查询方法
* @return
*/
@Override
public List<TSiteStationInfoData> selectTSiteStationInfoData() {
List<TSiteStationInfoData> tSiteStationInfoData = pipeInterfaceMapper.selectTSiteStationInfoData();
return tSiteStationInfoData;
}
/**
* 查询场站下级数据
* @param siteStationId
* @return
*/
@Override
public List<PressureFlow> selecttSiteStationInfoDataList(String siteStationId) {
List<PressureFlow> pressureFlows = pipeInterfaceMapper.selecttSiteStationInfoDataList(siteStationId);
return pressureFlows;
}
/**
* 监控信息查询
* @return
*/
@Override
public List<TvideoManagerData> selectTvideoManagerData() {
List<TvideoManagerData> tvideoManagerData = pipeInterfaceMapper.selectTvideoManagerData();
return tvideoManagerData;
}
/**
* 燃气用户信息查询接口
* @return
*/
@Override
public List<TdetectorUserData> selectTdetectorUser() {
List<TdetectorUserData> tdetectorUserData = pipeInterfaceMapper.selectTdetectorUser();
return tdetectorUserData;
}
/**
* 查询企业名称id方法
* @return
*/
@Override
public List<TenterpriseInfoData> selectTenterpriseInfoData() {
List<TenterpriseInfoData> tenterpriseInfoData = pipeInterfaceMapper.selectTenterpriseInfoData();
return tenterpriseInfoData;
}
/**
* 查询阀门井数据
* @return
*/
@Override
public List<PipeDate> selectvalveData() {
List<PipeDate> pipeDates = pipeInterfaceMapper.selectvalveData();
return pipeDates;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDetectorInfoServiceImpl.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.service.impl;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TDetectorInfo;
import com.zehong.system.mapper.TDetectorInfoMapper;
import com.zehong.system.service.ITDetectorInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 探测器Service业务层处理
*
* @author zehong
* @date 2021-11-02
*/
@Service
public class TDetectorInfoServiceImpl implements ITDetectorInfoService
{
@Autowired
private TDetectorInfoMapper tDetectorInfoMapper;
/**
* 查询探测器
*
* @param detectorId 探测器ID
* @return 探测器
*/
@Override
public TDetectorInfo selectTDetectorInfoById(Long detectorId)
{
return tDetectorInfoMapper.selectTDetectorInfoById(detectorId);
}
/**
* 查询探测器
*
* @param detectorCode 探测器编号
* @return 探测器
*/
public TDetectorInfo selectTDetectorInfoByCode(String detectorCode) {
return tDetectorInfoMapper.selectTDetectorInfoByCode(detectorCode);
}
/**
* 查询探测器列表
*
* @param tDetectorInfo 探测器
* @return 探测器
*/
@Override
public List<TDetectorInfo> selectTDetectorInfoList(TDetectorInfo tDetectorInfo)
{
List<TDetectorInfo> list = tDetectorInfoMapper.selectTDetectorInfoList(tDetectorInfo);
for(TDetectorInfo detector : list){
if("0".equals(detector.getDetectorStatus())){
detector.setDetectorStatus("正常");
} else {
detector.setDetectorStatus("离线");
}
}
return list;
}
/**
* 查询探测器分页列表
*
* @param tDetectorInfo 探测器
* @return 探测器
*/
@Override
public PageInfo<TDetectorInfo> selectTDetectorInfoPage(TDetectorInfo tDetectorInfo)
{
List<TDetectorInfo> list = tDetectorInfoMapper.selectTDetectorInfoList(tDetectorInfo);
for(TDetectorInfo detector : list){
if("0".equals(detector.getDetectorStatus())){
detector.setDetectorStatus("正常");
} else {
detector.setDetectorStatus("离线");
}
}
return new PageInfo(list);
}
/**
* 新增探测器
*
* @param tDetectorInfo 探测器
* @return 结果
*/
@Override
public int insertTDetectorInfo(TDetectorInfo tDetectorInfo)
{
return tDetectorInfoMapper.insertTDetectorInfo(tDetectorInfo);
}
@Override
public int insertBatch(List<TDetectorInfo> detectorList) {
// TODO Auto-generated method stub
return tDetectorInfoMapper.insertBatch(detectorList);
}
@Override
public int updateBatch(List<TDetectorInfo> detectorList) {
// TODO Auto-generated method stub
return tDetectorInfoMapper.updateBatch(detectorList);
}
/**
* 修改探测器
*
* @param tDetectorInfo 探测器
* @return 结果
*/
@Override
public int updateTDetectorInfo(TDetectorInfo tDetectorInfo)
{
return tDetectorInfoMapper.updateTDetectorInfo(tDetectorInfo);
}
/**
* 批量删除探测器
*
* @param detectorIds 需要删除的探测器ID
* @return 结果
*/
@Override
public int deleteTDetectorInfoByIds(Long[] detectorIds)
{
return tDetectorInfoMapper.deleteTDetectorInfoByIds(detectorIds);
}
/**
* 删除探测器信息
*
* @param detectorId 探测器ID
* @return 结果
*/
@Override
public int deleteTDetectorInfoById(Long detectorId)
{
return tDetectorInfoMapper.deleteTDetectorInfoById(detectorId);
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDetectorReportDataServiceImpl.java 0 → 100644
View file @ 1e5f3ea8
package com.zehong.system.service.impl;
import com.github.pagehelper.PageInfo;
import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.TDetectorInfo;
import com.zehong.system.domain.TDetectorReportData;
import com.zehong.system.domain.vo.TDetectorAlarmInfoVO;
import com.zehong.system.mapper.TDetectorReportDataMapper;
import com.zehong.system.service.ITDetectorReportDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 设备上报的数据Service业务层处理
*
* @author zehong
* @date 2021-11-08
*/
@Service
public class TDetectorReportDataServiceImpl implements ITDetectorReportDataService
{
@Autowired
private TDetectorReportDataMapper tDetectorReportDataMapper;
/**
* 查询设备上报的数据
*
* @param id 设备上报的数据ID
* @return 设备上报的数据
*/
@Override
public TDetectorReportData selectTDetectorReportDataById(Long id)
{
return tDetectorReportDataMapper.selectTDetectorReportDataById(id);
}
@Override
public List<TDetectorReportData> selectTDetectorReportDataByCode(String detectorCode)
{
return tDetectorReportDataMapper.selectTDetectorReportDataByCode(detectorCode);
}
@Override
public List<TDetectorAlarmInfoVO> selectTDetectorAlarm()
{
return tDetectorReportDataMapper.selectTDetectorAlarm();
}
@Override
public List<TDetectorReportData> selectRealtimeDataList()
{
return tDetectorReportDataMapper.selectRealtimeDataList();
}
@Override
public List<TDetectorReportData> countDetectorByUserId(TDetectorInfo tDetectorInfo){
return tDetectorReportDataMapper.countDetectorByUserId(tDetectorInfo);
}
/**
* 查询设备上报的数据列表
*
* @param tDetectorReportData 设备上报的数据
* @return 设备上报的数据
*/
@Override
public List<TDetectorReportData> selectTDetectorReportDataList(TDetectorReportData tDetectorReportData)
{
return tDetectorReportDataMapper.selectTDetectorReportDataList(tDetectorReportData);
}
/**
* 查询设备上报的数据分页列表
*
* @param tDetectorReportData 设备上报的数据
* @return 设备上报的数据
*/
@Override
public PageInfo<TDetectorReportData> selectTDetectorReportDataPage(TDetectorReportData tDetectorReportData)
{
return new PageInfo(tDetectorReportDataMapper.selectTDetectorReportDataList(tDetectorReportData));
}
/**
* 新增设备上报的数据
*
* @param tDetectorReportData 设备上报的数据
* @return 结果
*/
@Override
public int insertTDetectorReportData(TDetectorReportData tDetectorReportData)
{
tDetectorReportData.setCreateTime(DateUtils.getNowDate());
return tDetectorReportDataMapper.insertTDetectorReportData(tDetectorReportData);
}
/**
* 修改设备上报的数据
*
* @param tDetectorReportData 设备上报的数据
* @return 结果
*/
@Override
public int updateTDetectorReportData(TDetectorReportData tDetectorReportData)
{
return tDetectorReportDataMapper.updateTDetectorReportData(tDetectorReportData);
}
/**
* 批量删除设备上报的数据
*
* @param ids 需要删除的设备上报的数据ID
* @return 结果
*/
@Override
public int deleteTDetectorReportDataByIds(Long[] ids)
{
return tDetectorReportDataMapper.deleteTDetectorReportDataByIds(ids);
}
/**
* 删除设备上报的数据信息
*
* @param id 设备上报的数据ID
* @return 结果
*/
@Override
public int deleteTDetectorReportDataById(Long id)
{
return tDetectorReportDataMapper.deleteTDetectorReportDataById(id);
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDetectorUserServiceImpl.java
View file @ 1e5f3ea8
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zehong.system.domain.TDetectorInfo;
import com.zehong.system.domain.TDetectorReportData;
import com.zehong.system.domain.vo.TDetectorUserVO;
import com.zehong.system.mapper.TDetectorInfoMapper;
import com.zehong.system.mapper.TDetectorReportDataMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TDetectorUserMapper;
import com.zehong.system.domain.TDetectorUser;
import com.zehong.system.service.ITDetectorUserService;
import org.springframework.util.StringUtils;
/**
* 燃气用户Service业务层处理
......@@ -18,6 +27,69 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
{
@Autowired
private TDetectorUserMapper tDetectorUserMapper;
@Autowired
private TDetectorInfoMapper tDetectorInfoMapper;
@Autowired
private TDetectorReportDataMapper tDetectorReportDataMapper;
/**
* 查询探测器用户列表
*
* @param tDetectorUser 探测器用户
* @return 探测器用户
*/
@Override
public List<TDetectorUserVO> detectorUserList(TDetectorUser tDetectorUser)
{
List<TDetectorUserVO> list = new ArrayList<>();
List<TDetectorUser> tDetectorUserList = tDetectorUserMapper.selectTDetectorUserList(tDetectorUser);
TDetectorInfo detector = new TDetectorInfo();
for(TDetectorUser user : tDetectorUserList){
TDetectorUserVO userVO = new TDetectorUserVO();
BeanUtils.copyProperties(user, userVO);
detector.setUserId(user.getUserId());
detector.setIsDel("0");
List<TDetectorInfo> tDetectorInfoList = tDetectorInfoMapper.selectTDetectorInfoList(detector);
int onLineNum = 0;
int offLineNum = 0;
int cancelAlarmNum = 0;
int historyAlarmNum = 0;
if(tDetectorInfoList.size() > 0){
for(TDetectorInfo info : tDetectorInfoList){
if(!StringUtils.isEmpty(info.getDetectorStatus()) && info.getDetectorStatus().equals("0")){
++onLineNum;
}else{
++offLineNum;
}
}
List<TDetectorReportData> dataList = tDetectorReportDataMapper.countDetectorByUserId(detector);
historyAlarmNum = dataList.size();
for(TDetectorReportData data : dataList){
if(!StringUtils.isEmpty(data.getIsCancelAlarm()) && data.getIsCancelAlarm().equals("1")){
++cancelAlarmNum;
}
}
}
userVO.setDetectorCount(tDetectorInfoList.size());
userVO.setOnLineNum(onLineNum);
userVO.setOffLineNum(offLineNum);
userVO.setHistoryAlarmNum(historyAlarmNum);
userVO.setCancelAlarmNum(cancelAlarmNum);
userVO.setProcessingAlarmNum(Math.abs(historyAlarmNum - cancelAlarmNum));
list.add(userVO);
}
return list;
}
/**
* 查询燃气用户
......
gassafetyprogress-system/src/main/resources/mapper/system/PipeInterfaceMapper.xml 0 → 100644
View file @ 1e5f3ea8
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.PipeInterfaceMapper">
<!--管道-->
<resultMap type="PipeDate" id="PipeDateResult">
<result property="pipeId" column="pipe_id" />
<result property="pipeDiameter" column="pipe_diameter" />
<result property="pipeMaterial" column="pipe_material" />
<result property="pipeDepth" column="buried_depth" />
<result property="pipeTrend" column="pipe_trend" />
<result property="buildyear" column="build_date" />
<result property="pipeAddr" column="pipe_addr" />
<result property="path" column="coordinates" />
<result property="buildCompany" column="build_unit" />
<result property="powerCompany" column="beyond_enterprise_name" />
</resultMap>
<!--调压箱-->
<resultMap type="DeviceData" id="DeviceDateResult">
<result property="deviceId" column="device_id" />
<result property="type" column="device_type" />
<result property="deviceName" column="device_name" />
<result property="deviceCode" column="device_code" />
<result property="deviceAddr" column="device_addr" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="companyType" column="device_id" />
<result property="beyondEnterpriseName" column="beyond_enterprise_name" />
</resultMap>
<!--下级设备数据-->
<resultMap type="PressureFlow" id="PressureFlowResult">
<result property="deviceId" column="relation_device_id" />
<result property="deviceNo" column="device_model" />
<result property="deviceType" column="device_type" />
<result property="reportTime" column="create_time" />
</resultMap>
<!--场站数据-->
<resultMap type="TSiteStationInfoData" id="TSiteStationInfoDataResult">
<result property="siteStationId" column="site_station_id" />
<result property="stationName" column="site_station_name" />
<result property="stationType" column="site_station_type" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="buildyear" column="create_time" />
<result property="buildCompany" column="build_unit" />
<result property="powerCompany" column="beyond_enterprise_name" />
</resultMap>
<!--监控数据-->
<resultMap type="TvideoManagerData" id="TvideoManagerDataResult">
<result property="companyType" column="video_manager_id" />
<result property="videoManagerId" column="video_manager_id" />
<result property="videoName" column="video_name" />
<result property="resourceId" column="resource_id" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="videoAddress" column="video_address" />
<result property="type" column="type" />
</resultMap>
<!--燃气用户数据-->
<resultMap type="TdetectorUserData" id="TdetectorUserDataResult">
<result property="usrName" column="nick_name" />
<result property="usrType" column="user_type" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="phone" column="phone" />
<result property="address" column="address" />
<result property="companyType" column="user_id" />
</resultMap>
<!--查询企业名称id-->
<resultMap type="TenterpriseInfoData" id="TenterpriseInfoDataResult">
<result property="enterpriseId" column="enterprise_id" />
<result property="enterpriseName" column="enterprise_name" />
</resultMap>
<!--查询管道数据列表-->
<select id="selectPipeData" parameterType="PipeDate" resultMap="PipeDateResult">
select pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
where is_del='0'
</select>
<!--获取分组数据-->
<select id="selectGroupPipeData" parameterType="PipeDate" resultMap="PipeDateResult">
select pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
where is_del='0'
group by beyond_enterprise_name
</select>
<!--调压箱数据查询方法-->
<select id="selectDeviceData" resultMap="DeviceDateResult">
select device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
where device_type='2' and is_del='0'
</select>
<!--查询下级设备数据-->
<select id="selectPressureFlow" parameterType="DeviceData" resultMap="PressureFlowResult">
select device_model,device_type,create_time from t_relation_device_detail_info
where relation_device_id=#{deviceId} and relation_device_type='1'
</select>
<!--场站信息查询方法-->
<select id="selectTSiteStationInfoData" resultMap="TSiteStationInfoDataResult">
select site_station_id,site_station_name,site_station_type,longitude,latitude,create_time,build_unit,beyond_enterprise_name
from t_site_station_info where is_del='0'
</select>
<!--查询场站下级数据-->
<select id="selecttSiteStationInfoDataList" parameterType="DeviceData" resultMap="PressureFlowResult">
select device_model,device_type,create_time from t_relation_device_detail_info
where relation_device_id=#{deviceId} and relation_device_type='2'
</select>
<!--监控信息查询-->
<select id="selectTvideoManagerData" resultMap="TvideoManagerDataResult">
select video_manager_id,video_name,resource_id,longitude,latitude,video_address,type from t_video_manager
where is_del='0'
</select>
<!--燃气用户信息查询接口-->
<select id="selectTdetectorUser" resultMap="TdetectorUserDataResult">
select nick_name,user_type,longitude,latitude,phone,address,user_id from t_detector_user
where is_del='0'
</select>
<!--查询企业名称id方法-->
<select id="selectTenterpriseInfoData" resultMap="TenterpriseInfoDataResult">
select enterprise_id,enterprise_name from t_enterprise_info where is_del='0'
</select>
<!--查询阀门井数据-->
<select id="selectvalveData" resultMap="DeviceDateResult">
select device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
where device_type='1' and is_del='0'
</select>
</mapper>
gassafetyprogress-system/src/main/resources/mapper/system/TDetectorReportDataMapper.xml 0 → 100644
View file @ 1e5f3ea8
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TDetectorReportDataMapper">
<resultMap type="TDetectorReportData" id="TDetectorReportDataResult">
<result property="id" column="id" />
<result property="sourceId" column="source_id" />
<result property="detectorCode" column="detector_code" />
<result property="detectorStatusId" column="detector_status_id" />
<result property="statusName" column="status_name" />
<result property="reportValue" column="report_value" />
<result property="zhHostStatusId" column="zh_host_status_id" />
<result property="netPoint" column="net_point" />
<result property="signalStrength" column="signal_strength" />
<result property="ipAddress" column="ip_address" />
<result property="createTime" column="create_time" />
<result property="isCancelAlarm" column="is_cancel_alarm" />
<result property="cancelTime" column="cancel_time" />
</resultMap>
<sql id="selectTDetectorReportDataVo">
select id, source_id, detector_code, detector_status_id, status_name, report_value, zh_host_status_id, net_point, signal_strength, ip_address, create_time, is_cancel_alarm, cancel_time from t_detector_report_data
</sql>
<select id="selectTDetectorReportDataList" parameterType="TDetectorReportData" resultMap="TDetectorReportDataResult">
<include refid="selectTDetectorReportDataVo"/>
<where>
<if test="sourceId != null and sourceId != ''"> and source_id = #{sourceId}</if>
<if test="detectorCode != null and detectorCode != ''"> and detector_code = #{detectorCode}</if>
<if test="detectorStatusId != null and detectorStatusId != ''"> and detector_status_id = #{detectorStatusId}</if>
<if test="statusName != null and statusName != ''"> and status_name = #{statusName}</if>
<if test="reportValue != null "> and report_value = #{reportValue}</if>
<if test="zhHostStatusId != null "> and zh_host_status_id = #{zhHostStatusId}</if>
<if test="netPoint != null "> and net_point = #{netPoint}</if>
<if test="signalStrength != null "> and signal_strength = #{signalStrength}</if>
<if test="ipAddress != null and ipAddress != ''"> and ip_address = #{ipAddress}</if>
<if test="isCancelAlarm != null and isCancelAlarm != ''"> and is_cancel_alarm = #{isCancelAlarm}</if>
<if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
</where>
</select>
<select id="selectTDetectorReportDataById" parameterType="Long" resultMap="TDetectorReportDataResult">
<include refid="selectTDetectorReportDataVo"/>
where id = #{id}
</select>
<select id="selectTDetectorReportDataByCode" parameterType="String" resultMap="TDetectorReportDataResult">
<include refid="selectTDetectorReportDataVo"/>
where detector_code = #{detectorCode}
and is_cancel_alarm = '0'
ORDER BY create_time DESC
</select>
<select id="selectTDetectorAlarm" resultType="TDetectorAlarmInfoVO">
SELECT
rd.detector_code detectorCode,
CONCAT_WS("#",IFNULL(u.nick_name,IFNULL(di.linkman,di.detector_addr)),di.linkman) unitName,
di.detector_type detectorType,
rd.status_name statusName,
rd.create_time alarmTime,
IF (
rd.is_cancel_alarm = 0,
'未消除',
'已消除'
) handledStatus
FROM
t_detector_report_data rd
LEFT JOIN t_detector_info di ON rd.detector_code = di.detector_code
LEFT JOIN t_detector_user u ON u.user_id = di.user_id
WHERE u.is_del = '0'
ORDER BY rd.create_time DESC LIMIT 50
</select>
<select id="selectRealtimeDataList" resultMap="TDetectorReportDataResult">
SELECT * FROM
(
SELECT
t.source_id,
t.detector_code,
t.detector_status_id,
t.status_name,
t.report_value,
t.zh_host_status_id,
t.net_point,
t.signal_strength,
t.ip_address,
t.create_time,
t.is_cancel_alarm,
t.cancel_time,
d.detector_id,
d.detector_name,
d.detector_type
FROM
t_detector_report_data t
LEFT JOIN t_detector_info d ON t.detector_code = d.detector_code
WHERE
t.detector_status_id != '1'
ORDER BY t.create_time DESC
)data
GROUP BY data.detector_id LIMIT 50
</select>
<select id="countDetectorByUserId" parameterType="TDetectorInfo" resultMap="TDetectorReportDataResult" >
select r.id, r.source_id, r.detector_code, r.detector_status_id, r.is_cancel_alarm, r.cancel_time
from t_detector_report_data r
left join t_detector_info d on r.detector_code = d.detector_code
where r.detector_status_id != '1' and d.user_id = #{userId} and d.is_del = #{isDel}
</select>
<insert id="insertTDetectorReportData" parameterType="TDetectorReportData" useGeneratedKeys="true" keyProperty="id">
insert into t_detector_report_data
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sourceId != null">source_id,</if>
<if test="detectorCode != null and detectorCode != ''">detector_code,</if>
<if test="detectorStatusId != null">detector_status_id,</if>
<if test="statusName != null">status_name,</if>
<if test="reportValue != null">report_value,</if>
<if test="zhHostStatusId != null">zh_host_status_id,</if>
<if test="netPoint != null">net_point,</if>
<if test="signalStrength != null">signal_strength,</if>
<if test="ipAddress != null">ip_address,</if>
<if test="createTime != null">create_time,</if>
<if test="isCancelAlarm != null">is_cancel_alarm,</if>
<if test="cancelTime != null">cancel_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sourceId != null">#{sourceId},</if>
<if test="detectorCode != null and detectorCode != ''">#{detectorCode},</if>
<if test="detectorStatusId != null">#{detectorStatusId},</if>
<if test="statusName != null">#{statusName},</if>
<if test="reportValue != null">#{reportValue},</if>
<if test="zhHostStatusId != null">#{zhHostStatusId},</if>
<if test="netPoint != null">#{netPoint},</if>
<if test="signalStrength != null">#{signalStrength},</if>
<if test="ipAddress != null">#{ipAddress},</if>
<if test="createTime != null">#{createTime},</if>
<if test="isCancelAlarm != null">#{isCancelAlarm},</if>
<if test="cancelTime != null">#{cancelTime},</if>
</trim>
</insert>
<update id="updateTDetectorReportData" parameterType="TDetectorReportData">
update t_detector_report_data
<trim prefix="SET" suffixOverrides=",">
<if test="sourceId != null">source_id = #{sourceId},</if>
<if test="detectorCode != null and detectorCode != ''">detector_code = #{detectorCode},</if>
<if test="detectorStatusId != null">detector_status_id = #{detectorStatusId},</if>
<if test="statusName != null">status_name = #{statusName},</if>
<if test="reportValue != null">report_value = #{reportValue},</if>
<if test="zhHostStatusId != null">zh_host_status_id = #{zhHostStatusId},</if>
<if test="netPoint != null">net_point = #{netPoint},</if>
<if test="signalStrength != null">signal_strength = #{signalStrength},</if>
<if test="ipAddress != null">ip_address = #{ipAddress},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="isCancelAlarm != null">is_cancel_alarm = #{isCancelAlarm},</if>
<if test="cancelTime != null">cancel_time = #{cancelTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTDetectorReportDataById" parameterType="Long">
delete from t_detector_report_data where id = #{id}
</delete>
<delete id="deleteTDetectorReportDataByIds" parameterType="String">
delete from t_detector_report_data where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
gassafetyprogress-system/src/main/resources/mapper/system/TDetectorUserMapper.xml
View file @ 1e5f3ea8
......@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTDetectorUserList" parameterType="TDetectorUser" resultMap="TDetectorUserResult">
select user_id, username, nick_name, (CASE user_type WHEN '1' THEN '居民用户' WHEN '2' THEN '商业用户'WHEN '3' THEN '工业用户'end) as user_type , address, longitude, latitude, linkman, phone, email, is_del, remarks from t_detector_user
<where>
<where> is_del = '0'
<if test="username != null and username != ''"> and username like concat('%', #{username}, '%')</if>
<if test="nickName != null and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
</where>
......
gassafetyprogress-system/src/main/resources/mapper/system/TEmployedPeopleInfoMapper.xml
View file @ 1e5f3ea8
......@@ -41,11 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTEmployedPeopleInfoVo">
select employed_people_id, employed_people_name, id_card, certificate_num, beyond_enterprise_name, beyond_enterprise_id, register_examination_type, (CASE people_occupation WHEN '1' THEN '运行维护人员' WHEN '2' THEN '抢修人员'end ) as people_occupation, issue_date, certificate_change, create_by, create_time, update_by, update_time, is_del, remarks from t_employed_people_info
select employed_people_id, employed_people_name, id_card, certificate_num, beyond_enterprise_name, beyond_enterprise_id, register_examination_type, (CASE people_occupation WHEN '1' THEN '主要负责人' WHEN '2' THEN '安全管理人员' WHEN '3' THEN '运行维护和抢修人员'end ) as people_occupation, issue_date, certificate_change, create_by, create_time, update_by, update_time, is_del, remarks from t_employed_people_info
</sql>
<select id="selectTEmployedPeopleInfoList" parameterType="TEmployedPeopleInfo" resultMap="TEmployedPeopleInfoResult">
select employed_people_id, employed_people_name, id_card, certificate_num, beyond_enterprise_name, beyond_enterprise_id, register_examination_type,(CASE people_occupation WHEN '1' THEN '运行维护人员' WHEN '2' THEN '抢修人员'end ) as people_occupation, issue_date, certificate_change, create_by, create_time, update_by, update_time, is_del, remarks from t_employed_people_info
select employed_people_id, employed_people_name, id_card, certificate_num, beyond_enterprise_name, beyond_enterprise_id, register_examination_type,(CASE people_occupation WHEN '1' THEN '主要负责人' WHEN '2' THEN '安全管理人员' WHEN '3' THEN '运行维护和抢修人员'end ) as people_occupation, issue_date, certificate_change, create_by, create_time, update_by, update_time, is_del, remarks from t_employed_people_info
<where>
1=1 and is_del='0'
<if test="employedPeopleName != null and employedPeopleName != ''"> and employed_people_name like concat('%', #{employedPeopleName}, '%')</if>
......
gassafetyprogress-system/src/main/resources/mapper/system/TPipeInfoMapper.xml
View file @ 1e5f3ea8
......@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTPipeInfoList" parameterType="TPipeInfo" resultMap="TPipeInfoResult">
<include refid="selectTPipeInfoVo"/>
<where>
is_del='0'
<if test="pipeLength != null "> and pipe_length = #{pipeLength}</if>
<if test="pipeDiameter != null "> and pipe_diameter = #{pipeDiameter}</if>
<if test="pipePressure != null "> and pipe_pressure = #{pipePressure}</if>
......@@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTPipeInfoById" parameterType="Long" resultMap="TPipeInfoResult">
<include refid="selectTPipeInfoVo"/>
where pipe_id = #{pipeId}
where pipe_id = #{pipeId} and is_del='0'
</select>
<insert id="insertTPipeInfo" parameterType="TPipeInfo" useGeneratedKeys="true" keyProperty="pipeId">
......@@ -125,14 +126,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where pipe_id = #{pipeId}
</update>
<delete id="deleteTPipeInfoById" parameterType="Long">
delete from t_pipe_info where pipe_id = #{pipeId}
</delete>
<update id="deleteTPipeInfoById" parameterType="Long">
update t_pipe_info set is_del='1' where pipe_id = #{pipeId}
</update>
<delete id="deleteTPipeInfoByIds" parameterType="String">
delete from t_pipe_info where pipe_id in
<update id="deleteTPipeInfoByIds" parameterType="String">
update t_pipe_info set is_del='1' where pipe_id in
<foreach item="pipeId" collection="array" open="(" separator="," close=")">
#{pipeId}
</foreach>
</delete>
</update>
</mapper>
gassafetyprogress-web/src/api/detector/detectorInfo.js 0 → 100644
View file @ 1e5f3ea8
import request from '@/utils/request'
// 查询探测器列表
export function listDetectorInfo(query) {
return request({
url: '/detector/detectorInfo/list',
method: 'get',
params: query
})
}
// 探测器列表
export function detectorInfoList(query) {
return request({
url: '/detector/detectorInfo/detectorInfoList',
method: 'get',
params: query
})
}
// 新增探测器
export function addDetectorInfo(data) {
return request({
url: '/detector/detectorInfo',
method: 'post',
data: data
})
}
// 修改探测器
export function updateDetectorInfo(data) {
return request({
url: '/detector/detectorInfo',
method: 'put',
data: data
})
}
// 删除探测器
export function delDetectorInfo(detectorId) {
return request({
url: '/detector/detectorInfo/' + detectorId,
method: 'delete'
})
}
// 导出探测器
export function exportDetectorInfo(query) {
return request({
url: '/detector/detectorInfo/export',
method: 'get',
params: query
})
}
// 右上角的综合列表
export function alarmData(query) {
return request({
url: '/detector/detectorInfo/getAlarmData',
method: 'get',
params: query
})
}
gassafetyprogress-web/src/api/detector/detectorUser.js 0 → 100644
View file @ 1e5f3ea8
import request from '@/utils/request'
// 查询探测器用户列表
export function listDetectorUser(query) {
return request({
url: '/detector/detectorUser/list',
method: 'get',
params: query
})
}
// 探测器用户列表
export function detectorUserList(query) {
return request({
url: '/detector/detectorUser/detectorUserList',
method: 'get',
params: query
})
}
// 查询探测器用户详细
export function getDetectorUser(userId) {
return request({
url: '/detector/detectorUser/' + userId,
method: 'get'
})
}
// 新增探测器用户
export function addDetectorUser(data) {
return request({
url: '/detector/detectorUser',
method: 'post',
data: data
})
}
// 修改探测器用户
export function updateDetectorUser(data) {
return request({
url: '/detector/detectorUser',
method: 'put',
data: data
})
}
// 删除探测器用户
export function delDetectorUser(userId) {
return request({
url: '/detector/detectorUser/' + userId,
method: 'delete'
})
}
// 导出探测器用户
export function exportDetectorUser(query) {
return request({
url: '/detector/detectorUser/export',
method: 'get',
params: query
})
}
gassafetyprogress-web/src/components/GetPos/index.vue
View file @ 1e5f3ea8
<!--
* @Author: your name
* @Date: 2022-02-12 11:07:10
* @LastEditTime: 2022-02-16 17:08:55
* @LastEditTime: 2022-02-22 15:08:10
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
......@@ -92,7 +92,9 @@ export default {
methods: {
init() {
this.$nextTick(() => {
this.map = new EditorMap("getposmap", {}, this);
const path = eval(this.$store.state.user.systemSetting.map_center);
console.log("path",path);
this.map = new EditorMap("getposmap", {center:path}, this);
// 如果不传值就是设备,传pipe就是管道
if (this.device == "") {
// 如果传了路径就创建一个marker，如果没传就直接激活手动创建
......
gassafetyprogress-web/src/utils/mapClass/config.js
View file @ 1e5f3ea8
......@@ -119,7 +119,7 @@ export const pipeData = {
isDel: "0",
remarks: null,
companyType: "1",
path:
path:
[ [ 114.236904, 38.239155 ], [ 114.234145, 38.239202 ], [ 114.233368, 38.242778 ], [ 114.233895, 38.249292 ], [ 114.233937, 38.251334 ], [ 114.229746, 38.251479 ], [ 114.226905, 38.25181 ], [ 114.224532, 38.252174 ], [ 114.224474, 38.253066 ], [ 114.224389, 38.254749 ], [ 114.224273, 38.258808 ] ],
},
{
......@@ -303,7 +303,7 @@ export const pipeData = {
[ [ 114.185887, 38.259572 ], [ 114.185973, 38.260098 ], [ 114.18599, 38.260102 ] ]
],
},
{
pipeya: "20Pa",
pipeDiameter: "0.5",
......@@ -572,7 +572,7 @@ export const pipeData = {
isDel: "0",
remarks: null,
companyType: "2",
path:
path:
[ [ 114.206898, 38.259072 ], [ 114.20675, 38.25672 ], [ 114.20636, 38.256667 ], [ 114.206091, 38.254336 ], [ 114.203348, 38.254645 ], [ 114.206094, 38.254333 ], [ 114.204444, 38.241922 ], [ 114.203839, 38.242023 ], [ 114.203782, 38.240171 ], [ 114.202854, 38.240167 ], [ 114.201458, 38.240228 ], [ 114.200296, 38.239421 ], [ 114.200292, 38.240242 ] ],
},
{
......@@ -660,7 +660,7 @@ export const pipeData = {
companyType: "3",
path: [ [ 114.219113, 38.255163 ], [ 114.21852, 38.254677 ], [ 114.218446, 38.249739 ], [ 114.218477, 38.251096 ] ],
},
{
pipeya: "20Pa",
pipeDiameter: "0.5",
......@@ -686,7 +686,7 @@ export const pipeData = {
companyType: "3",
path: [ [ 114.208486, 38.259254 ], [ 114.208521, 38.260195 ], [ 114.208488, 38.261122 ], [ 114.208428, 38.262953 ], [ 114.208522, 38.263256 ], [ 114.208593, 38.263614 ], [ 114.208551, 38.26458 ], [ 114.208647, 38.266885 ] ],
},
{
pipeya: "20Pa",
pipeDiameter: "0.5",
......@@ -2888,6 +2888,7 @@ export const changzhan = {
deviceNum: "500",
reportTime: "2022-01-13 19:25:34",
},
{
deviceNo: "HBS11C0002002",
deviceState: "1",
......
gassafetyprogress-web/src/views/bigWindow/index.vue
View file @ 1e5f3ea8
<!--
* @Author: your name
* @Date: 2022-01-11 13:44:17
* @LastEditTime: 2022-02-17 11:47:53
* @LastEditTime: 2022-02-22 15:09:22
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue
......@@ -175,9 +175,11 @@ export default {
},
},
mounted() {
const path = eval(this.$store.state.user.systemSetting.map_center);
this.map = new EditorMap(
"map",
{
center:path,
mapStyle: "amap://styles/f71d3a3d73e14f5b2bf5508bf1411758",
zoom: 14.5,
},
......
gassafetyprogress-web/src/views/complainDeal/index.vue
View file @ 1e5f3ea8
......@@ -197,15 +197,17 @@
<el-form-item label="转办记录" prop="transferRecord" :style="display">
<el-input v-model="form.transferRecord" type="textarea" placeholder="请输入转办记录" :disabled="readonly"/>
</el-form-item>
<el-form-item label="任务状态" :style="display">
<el-select v-model="form.complainStatus" placeholder="请选择任务状态" :disabled="readonly">
<el-option
v-for="dict in taskStateOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
<el-form-item label="任务状态" :style="display" >
<el-input v-model="form.complainStatus" placeholder="" :disabled="readonly"/>
<!--<el-select v-model="form.complainStatus" placeholder="请选择任务状态" :disabled="readonly">-->
<!--<el-option-->
<!--v-for="dict in taskStateOptions"-->
<!--:key="dict.dictValue"-->
<!--:label="dict.dictLabel"-->
<!--:value="dict.dictValue"-->
<!--&gt;</el-option>-->
<!--</el-select>-->
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" :disabled="readonly"/>
......@@ -359,7 +361,6 @@ export default {
this.form.complainAssignEnterproseName = obj.enterpriseName;
this.form.complainAssignEnterproseId = value;
getUserList(value).then(response => {
console.log(response.data)
//console.log(this.peopleList)
this.peopleList=response.data;
});
......@@ -371,7 +372,6 @@ export default {
});
this.form.complainAssignManId === value;
this.form.complainAssignMan = obj.nickName;
console.log(this.form);
},
// 取消按钮
cancel() {
......@@ -478,8 +478,10 @@ export default {
const complainDealId = row.complainDealId || this.ids
getComplainDeal(complainDealId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改投诉处置";
this.open = true;
this.title = "修改投诉处置";
var statusName = this.selectDictLabel(this.taskStateOptions, row.complainStatus);
this.form.complainStatus=statusName;
});
},
/** 删除按钮操作 */
......
gassafetyprogress-web/src/views/login.vue
View file @ 1e5f3ea8
......@@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
<h3 class="title">泽宏后台管理系统</h3>
<h3 class="title">智慧管网后台管理系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
......@@ -74,7 +74,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
<span> </span>
</div>
</div>
</template>
......
gassafetyprogress-web/src/views/operationMonitor/workOrder/index.vue
View file @ 1e5f3ea8
......@@ -43,28 +43,6 @@
v-hasPermi="['system:order:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:order:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:order:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
......@@ -80,7 +58,7 @@
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!--<el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="任务标题" align="center" prop="workTitle" />
<el-table-column label="任务类型" align="center" prop="workType">
<template slot-scope="scope">
......
gassafetyprogress-web/src/views/regulation/device/index.vue
View file @ 1e5f3ea8
......@@ -294,7 +294,7 @@
<el-col :span="11">
<el-form-item label="设备编号" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入设备编号" />
<el-input v-model="form.deviceCode" placeholder="请输入设备编号" :disabled="true"/>
</el-form-item>
</el-col>
</el-row>
......@@ -564,19 +564,11 @@ export default {
rules: {
deviceName: [
{ required: true, message: "请输入设备名称", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
deviceCode: [
{ required: true, message: "请输入设备编号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
deviceAddr: [
{ required: true, message: "请输入所在地址", trigger: "blur" },
{ min: 0, max: 30, message: "长度30位", trigger: "blur" },
],
deviceModel: [
{ required: true, message: "请输入设备型号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 30, message: "长度30位", trigger: "blur" },
],
deviceType: [
{ required: true, message: "请选择设备类型", trigger: "blur" },
......@@ -746,6 +738,7 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改设备信息";
this.devicePos = [response.data.longitude, response.data.latitude];
});
},
/** 删除按钮操作 */
......
gassafetyprogress-web/src/views/regulation/gasuser/index.vue
View file @ 1e5f3ea8
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户账号" prop="username">
<!--<el-form-item label="用户账号" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入用户账号"
......@@ -9,7 +9,7 @@
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item label="用户名称" prop="nickName">
<el-input
v-model="queryParams.nickName"
......@@ -36,28 +36,6 @@
v-hasPermi="['supervise:user:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['supervise:user:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['supervise:user:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
......@@ -74,7 +52,7 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户账号" align="center" prop="username" />
<!--<el-table-column label="用户账号" align="center" prop="username" />-->
<el-table-column label="用户名称" align="center" prop="nickName" />
<el-table-column label="用户类型" align="center" prop="userType" />
<el-table-column label="地址" align="center" prop="address" />
......@@ -83,7 +61,7 @@
<el-table-column label="联系人" align="center" prop="linkman" />
<el-table-column label="电话" align="center" prop="phone" />
<el-table-column label="邮箱" align="center" prop="email" />
<el-table-column label="备注" align="center" prop="remarks" />
<!--<el-table-column label="备注" align="center" prop="remarks" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -270,20 +248,20 @@ export default {
form: {},
// 表单校验
rules: {
username: [
/*username: [
{ required: true, message: "请输入用户账号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],*/
nickName: [
{ required: true, message: "请输入用户名称", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
userType: [
{ required: true, message: "请选择用户类型", trigger: "blur" },
],
address: [
{ required: true, message: "请输入地址", trigger: "blur" },
{ min: 0, max: 30, message: "长度30位", trigger: "blur" },
// { min: 0, max: 30, message: "长度30位", trigger: "blur" },
],
}
};
......@@ -354,6 +332,7 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改燃气用户";
this.devicePos = [response.data.longitude, response.data.latitude];
});
},
/** 提交按钮 */
......
gassafetyprogress-web/src/views/regulation/info/index.vue
View file @ 1e5f3ea8
......@@ -237,15 +237,15 @@ export default {
rules: {
enterpriseName: [
{ required: true, message: "请输入企业名称", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
registerAddress: [
{ required: true, message: "请输入注册地址", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
legalRepresentative: [
{ required: true, message: "请输入法定代表人", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
}
};
......
gassafetyprogress-web/src/views/regulation/pipe/index.vue
View file @ 1e5f3ea8
......@@ -317,26 +317,26 @@ export default {
rules: {
pipeLength: [
{ required: true, message: "请输入管道长度", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
pipeDiameter: [
{ required: true, message: "请输入管径", trigger: "blur" },
{ min: 0, max: 15, message: "长度15位", trigger: "blur" },
// { min: 0, max: 15, message: "长度15位", trigger: "blur" },
],
pipePressure: [
{ required: true, message: "请输入压力", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
buildDate: [
{ required: true, message: "请选择建设年代", trigger: "blur" },
],
pipeMaterial: [
{ required: true, message: "请输入材质", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
buriedDepth:[
{ required: true, message: "请输入埋深", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
}
};
......
gassafetyprogress-web/src/views/regulation/station/index.vue
View file @ 1e5f3ea8
......@@ -596,7 +596,6 @@ export default {
selectTEnterprise().then(response => {
this.test = response.data;
});
const deviceId = row.siteStationId || this.ids
var tDeviceInfon={
id:deviceId,
......@@ -614,7 +613,9 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改场站信息";
this.devicePos = [response.data.longitude, response.data.latitude];
});
},
......
gassafetyprogress-web/src/views/regulation/supervise/index.vue
View file @ 1e5f3ea8
......@@ -85,12 +85,12 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="姓名" align="center" prop="employedPeopleName" />
<el-table-column label="身份证号" align="center" prop="idCard" />
<el-table-column label="证书编号" align="center" prop="certificateNum" />
<el-table-column label="技能岗位证书编号" align="center" prop="certificateNum" />
<el-table-column label="受聘企业名称" align="center" prop="beyondEnterpriseName" />
<el-table-column label="报考类型" align="center" prop="registerExaminationType" />
<el-table-column label="人员类型" align="center" prop="peopleOccupation" />
<el-table-column label="发证部门" align="center" prop="registerExaminationType" />
<el-table-column label="任职岗位" align="center" prop="peopleOccupation" />
<el-table-column label="发证日期" align="center" prop="issueDate" />
<el-table-column label="证书变更情况" align="center" prop="certificateChange" />
<el-table-column label="复检日期" align="center" prop="certificateChange" />
<el-table-column label="备注" align="center" prop="remarks" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
......@@ -163,16 +163,17 @@
<el-row>
<el-col :span="11">
<el-form-item label="报考类型" prop="registerExaminationType">
<el-input v-model="form.registerExaminationType" placeholder="请输入报考类型" />
<el-form-item label="发证部门" prop="registerExaminationType">
<el-input v-model="form.registerExaminationType" placeholder="请输入发证部门" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="人员类型" prop="peopleOccupation">
<el-select v-model="form.peopleOccupation" placeholder="请选择人员类型">
<el-option label="运行维护人员" value="1" />
<el-option label="抢修人员" value="2" />
<el-form-item label="任职岗位" prop="peopleOccupation">
<el-select v-model="form.peopleOccupation" placeholder="请选择任职岗位">
<el-option label="主要负责人" value="1" />
<el-option label="安全管理人员" value="2" />
<el-option label="运行维护和抢修人员" value="3" />
</el-select>
</el-form-item>
</el-col>
......@@ -180,14 +181,14 @@
<el-row>
<el-col :span="11">
<el-form-item label="证书编号" prop="certificateNum">
<el-input v-model="form.certificateNum" placeholder="请输入证书编号" />
<el-form-item label="技能岗位证书编号" prop="certificateNum">
<el-input v-model="form.certificateNum" placeholder="请输入技能岗位证书编号" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="证书变更情况" prop="certificateChange">
<el-input v-model="form.certificateChange" placeholder="请输入证书变更情况" />
<el-form-item label="复检日期" prop="certificateChange">
<el-input v-model="form.certificateChange" placeholder="请输入复检日期" />
</el-form-item>
</el-col>
</el-row>
......@@ -254,14 +255,14 @@ export default {
rules: {
employedPeopleName: [
{ required: true, message: "请输入姓名", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
beyondEnterpriseId: [
{ required: true, message: "请选择受聘企业名称", trigger: "blur" },
],
idCard: [
{ required: true, message: "请输入身份证号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
}
};
......@@ -274,6 +275,7 @@ export default {
getList() {
this.loading = true;
listInfo(this.queryParams).then(response => {
console.log(response.rows)
this.infoList = response.rows;
this.total = response.total;
this.loading = false;
......
gassafetyprogress-web/src/views/standingBook/equipment/index.vue
View file @ 1e5f3ea8
......@@ -56,7 +56,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['standingBook:equipment:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -67,7 +66,6 @@
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['standingBook:equipment:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -87,21 +85,18 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['standingBook:equipment:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="showDetail(scope.row)"
v-hasPermi="['standingBook:equipment:query']"
>详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['standingBook:equipment:remove']"
>删除</el-button>
</template>
</el-table-column>
......@@ -183,43 +178,44 @@
</el-dialog>
<el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @cancel="cancel2">
<el-form ref="detailForm" :model="detailForm" label-width="120px">
<el-form ref="detailForm" :model="detailForm" label-width="100px">
<el-row>
<el-col :span="11">
<el-form-item label="用户名称:">
<font>{{detailForm.userName}}</font>
<el-input v-model="detailForm.userName" disabled/>
</el-form-item>
<el-form-item label="身份证号:">
<font>{{detailForm.idCard}}</font>
<el-input v-model="detailForm.idCard" disabled/>
</el-form-item>
<el-form-item label="品牌名称:">
<font v-if="detailForm.brandName != '' && detailForm.brandName != null">{{detailForm.brandName}}</font>
<font v-else> - </font>
<el-input v-model="detailForm.brandName" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户编号:">
<font v-if="detailForm.userNo != '' && detailForm.userNo != null">{{detailForm.userNo}}</font>
<font v-else> - </font>
<el-input v-model="detailForm.userNo" disabled style="width: 100%"/>
</el-form-item>
<el-form-item label="联系电话:">
<font>{{detailForm.linkMobile}}</font>
<el-input v-model="detailForm.linkMobile" disabled/>
</el-form-item>
<el-form-item label="安装时间:">
<font>{{detailForm.installTime}}</font>
<el-input v-model="detailForm.installTime" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="详细地址:">
<font>{{detailForm.userAddress}}</font>
</el-form-item>
<el-col :span="23">
<el-form-item label="详细地址:">
<el-input type="textarea" v-model="detailForm.userAddress" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
<el-col :span="23">
<el-form-item label="备注信息:">
<el-input type="textarea" v-model="detailForm.remarks" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
......
gassafetyprogress-web/src/views/standingBook/hidden/index.vue
View file @ 1e5f3ea8
......@@ -49,7 +49,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['standingBook:hidden:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -60,7 +59,6 @@
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['standingBook:hidden:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -103,21 +101,18 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['standingBook:hidden:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="showDetail(scope.row)"
v-hasPermi="['standingBook:hidden:query']"
>详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['standingBook:hidden:remove']"
>删除</el-button>
</template>
</el-table-column>
......@@ -248,54 +243,59 @@
<el-row>
<el-col :span="10">
<el-form-item label="隐患名称:">
<font>{{detailForm.hiddenTitle}}</font>
<el-input v-model="detailForm.hiddenTitle" disabled/>
</el-form-item>
<el-form-item label="隐患发现人员:">
<font>{{detailForm.hiddenFindPeople}}</font>
<el-input v-model="detailForm.hiddenFindPeople" disabled/>
</el-form-item>
<el-form-item label="发现时间:">
<font>{{detailForm.hiddenFindDate}}</font>
<el-input v-model="detailForm.hiddenFindDate" disabled/>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="隐患等级:">
<font v-if="detailForm.hiddenType == '1'">一级隐患</font>
<font v-if="detailForm.hiddenType == '2'">二级隐患</font>
<font v-if="detailForm.hiddenType == '3'">三级隐患</font>
<el-input v-if="detailForm.hiddenType == '1'" value="一级隐患" disabled/>
<el-input v-if="detailForm.hiddenType == '2'" value="二级隐患" disabled/>
<el-input v-if="detailForm.hiddenType == '3'" value="三级隐患" disabled/>
</el-form-item>
<el-form-item label="隐患位置:">
<font>{{detailForm.hiddenLocation}}</font>
<el-input v-model="detailForm.hiddenLocation" disabled/>
</el-form-item>
<el-form-item label="整治情况:">
<el-input v-if="detailForm.remediation == '1'" value="已完成" disabled/>
<el-input v-if="detailForm.remediation == '2'" value="未完成" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="处理方案:">
<span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
<i class="el-icon el-icon-view"></i>查看/下载
</span>
<span v-else>-</span>
<span v-else><el-input disabled/></span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="隐患内容:">
<font>{{detailForm.hiddenContent}}</font>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="整治情况:">
<font v-if="detailForm.remediation == '1'">已完成</font>
<font v-if="detailForm.remediation == '2'">未完成</font>
</el-form-item>
<el-col :span="23">
<el-form-item label="隐患内容:">
<el-input type="textarea" v-model="detailForm.hiddenContent" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
<el-col :span="23">
<el-form-item label="备注信息:">
<el-input type="textarea" v-model="detailForm.remarks" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
<el-col :span="9">
<div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 390px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 100%" id="hiddenContainer"></div>
</div>
</el-col>
......
gassafetyprogress-web/src/views/system/eventInfo/index.vue
View file @ 1e5f3ea8
......@@ -447,7 +447,7 @@ export default {
const eventId = row.eventId || this.ids
getEventInfo(eventId).then(response => {
this.form = response.data;
this.title = "修改事件处置";
this.title = "事件处置详情";
if(row.iconUrl!=null){
this.fileList = [{name: '附件', url: uploadfile}];
}
......
gassafetyprogress-web/vue.config.js
View file @ 1e5f3ea8
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment