Skip to content

G
gassafety-progress
Commit a79807b0 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	gassafetyprogress-web/src/utils/mapClass/config.js
parents 96ad431d 413e4894
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3806 additions and 73 deletions
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TVehicleInfoController.java 0 → 100644
View file @ a79807b0
package com.zehong.web.controller.operationMonitor;
import java.util.List;
import com.zehong.system.domain.TVehicleLocationInfo;
import com.zehong.system.service.ITVehicleLocationInfoService;
import io.jsonwebtoken.lang.Collections;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TVehicleInfo;
import com.zehong.system.service.ITVehicleInfoService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 燃气车辆信息Controller
*
* @author zehong
* @date 2022-03-17
*/
@RestController
@RequestMapping("/system/vehicleInfo")
public class TVehicleInfoController extends BaseController
{
@Autowired
private ITVehicleInfoService tVehicleInfoService;
@Autowired
private ITVehicleLocationInfoService itVehicleLocationInfoService;
/**
* 查询燃气车辆信息列表
*/
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:list')")
@GetMapping("/list")
public TableDataInfo list(TVehicleInfo tVehicleInfo)
{
startPage();
List<TVehicleInfo> list = tVehicleInfoService.selectTVehicleInfoList(tVehicleInfo);
return getDataTable(list);
}
/**
* 查询车辆最终位置
* @param vehicleId 车辆信息id
* @return
*/
@GetMapping("/getLastLocation")
public AjaxResult getLastLocation(@RequestParam(value="vehicleId") Long vehicleId){
//获取车辆信息
TVehicleInfo tVehicleInfo = tVehicleInfoService.selectTVehicleInfoById(vehicleId);
//获取最后位置信息
TVehicleLocationInfo tVehicleLocationInfo = new TVehicleLocationInfo();
tVehicleLocationInfo.setCarNum(tVehicleInfo.getCarNum());
tVehicleLocationInfo.setLast(true);
List<TVehicleLocationInfo> tVehicleLocationInfoList=itVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
//车辆最后位置
if(!Collections.isEmpty(tVehicleLocationInfoList) && tVehicleLocationInfoList.size() > 0){
tVehicleInfo.setLongitude(tVehicleLocationInfoList.get(0).getLongitude());
tVehicleInfo.setLatitude(tVehicleLocationInfoList.get(0).getLatitude());
}
return AjaxResult.success(tVehicleInfo);
}
/**
* 导出燃气车辆信息列表
*/
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:export')")
@Log(title = "燃气车辆信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TVehicleInfo tVehicleInfo)
{
List<TVehicleInfo> list = tVehicleInfoService.selectTVehicleInfoList(tVehicleInfo);
ExcelUtil<TVehicleInfo> util = new ExcelUtil<TVehicleInfo>(TVehicleInfo.class);
return util.exportExcel(list, "燃气车辆信息数据");
}
/**
* 获取燃气车辆信息详细信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:query')")
@GetMapping(value = "/{vehicleId}")
public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId)
{
return AjaxResult.success(tVehicleInfoService.selectTVehicleInfoById(vehicleId));
}
/**
* 新增燃气车辆信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:add')")
@Log(title = "燃气车辆信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo)
{
return toAjax(tVehicleInfoService.insertTVehicleInfo(tVehicleInfo));
}
/**
* 修改燃气车辆信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:edit')")
@Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo)
{
return toAjax(tVehicleInfoService.updateTVehicleInfo(tVehicleInfo));
}
/**
* 删除燃气车辆信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleInfo:remove')")
@Log(title = "燃气车辆信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleIds}")
public AjaxResult remove(@PathVariable Long[] vehicleIds)
{
return toAjax(tVehicleInfoService.deleteTVehicleInfoByIds(vehicleIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TVehicleLocationInfoController.java 0 → 100644
View file @ a79807b0
package com.zehong.web.controller.operationMonitor;
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.utils.poi.ExcelUtil;
import com.zehong.system.domain.TVehicleLocationInfo;
import com.zehong.system.service.ITVehicleLocationInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 燃气车辆位置信息Controller
*
* @author zehong
* @date 2022-03-17
*/
@RestController
@RequestMapping("/system/vehicleLocationInfo")
public class TVehicleLocationInfoController extends BaseController
{
@Autowired
private ITVehicleLocationInfoService tVehicleLocationInfoService;
/**
* 查询燃气车辆位置信息列表
*/
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:list')")
@GetMapping("/list")
public TableDataInfo list(TVehicleLocationInfo tVehicleLocationInfo)
{
startPage();
List<TVehicleLocationInfo> list = tVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
return getDataTable(list);
}
/**
* 获取车辆位置信息
* @param tVehicleLocationInfo
* @return
*/
@GetMapping("/getVehicleLocations")
public AjaxResult getVehicleLocations(TVehicleLocationInfo tVehicleLocationInfo){
return AjaxResult.success( tVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo));
}
/**
* 导出燃气车辆位置信息列表
*/
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:export')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TVehicleLocationInfo tVehicleLocationInfo)
{
List<TVehicleLocationInfo> list = tVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
ExcelUtil<TVehicleLocationInfo> util = new ExcelUtil<TVehicleLocationInfo>(TVehicleLocationInfo.class);
return util.exportExcel(list, "燃气车辆位置信息数据");
}
/**
* 获取燃气车辆位置信息详细信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:query')")
@GetMapping(value = "/{vehicleLocationId}")
public AjaxResult getInfo(@PathVariable("vehicleLocationId") Long vehicleLocationId)
{
return AjaxResult.success(tVehicleLocationInfoService.selectTVehicleLocationInfoById(vehicleLocationId));
}
/**
* 新增燃气车辆位置信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:add')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TVehicleLocationInfo tVehicleLocationInfo)
{
return toAjax(tVehicleLocationInfoService.insertTVehicleLocationInfo(tVehicleLocationInfo));
}
/**
* 修改燃气车辆位置信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:edit')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TVehicleLocationInfo tVehicleLocationInfo)
{
return toAjax(tVehicleLocationInfoService.updateTVehicleLocationInfo(tVehicleLocationInfo));
}
/**
* 删除燃气车辆位置信息
*/
@PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:remove')")
@Log(title = "燃气车辆位置信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleLocationIds}")
public AjaxResult remove(@PathVariable Long[] vehicleLocationIds)
{
return toAjax(tVehicleLocationInfoService.deleteTVehicleLocationInfoByIds(vehicleLocationIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java
View file @ a79807b0
......@@ -54,7 +54,7 @@ public class PipeInterfaceController extends BaseController {
/**
* 调压箱数据查询接口
* 调压箱数据查询接口 使用中
* @return
*/
@RequestBody
......@@ -65,22 +65,25 @@ public class PipeInterfaceController extends BaseController {
List<DeviceData> list=new ArrayList<>();
//调压箱数据查询方法
List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData();
//查询下级全部数据方法
List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
// //查询下级全部数据方法
// List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
// for (int i=0;i<deviceData.size();i++){
// boolean bo=false;
// for (int s=0;s<pressureFlows1.size();s++){
// if (pressureFlows1.get(s).getDeviceId().equals(deviceData.get(i).getDeviceId())){
// bo=true;
// break;
// }
// }
// if (bo){
// deviceData.get(i).setIconType(2);
// list.add(deviceData.get(i));
// }
// }
for (int i=0;i<deviceData.size();i++){
boolean bo=false;
for (int s=0;s<pressureFlows1.size();s++){
if (pressureFlows1.get(s).getDeviceId().equals(deviceData.get(i).getDeviceId())){
bo=true;
break;
}
}
if (bo){
deviceData.get(i).setIconType(2);
list.add(deviceData.get(i));
}
}
deviceData.get(i).setIconType(2);
list.add(deviceData.get(i));
}
deviceList.setData(list);
return deviceList;
}
......@@ -302,7 +305,7 @@ public class PipeInterfaceController extends BaseController {
/**
* 场站信息查询接口
* 场站信息查询接口 使用中
* @return
*/
@RequestBody
......@@ -311,23 +314,28 @@ public class PipeInterfaceController extends BaseController {
TSiteStationInfoDataList tSiteStationInfoDataList=new TSiteStationInfoDataList();
//场站信息查询方法
List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData();
//查询下级全部数据方法
List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("2");
List<TSiteStationInfoData> list=new ArrayList<>();
// //查询下级全部数据方法
// List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("2");
// for (int i=0;i<tSiteStationInfoData.size();i++){
// boolean bo=false;
// for (int s=0;s<pressureFlows1.size();s++){
// if (pressureFlows1.get(s).getDeviceId()!=null){
// if (pressureFlows1.get(s).getDeviceId().equals(tSiteStationInfoData.get(i).getSiteStationId())){
// bo=true;
// break;
// }
// }
// }
// if (bo){
// tSiteStationInfoData.get(i).setIconType(4);
// list.add(tSiteStationInfoData.get(i));
// }
// }
for (int i=0;i<tSiteStationInfoData.size();i++){
boolean bo=false;
for (int s=0;s<pressureFlows1.size();s++){
if (pressureFlows1.get(s).getDeviceId()!=null){
if (pressureFlows1.get(s).getDeviceId().equals(tSiteStationInfoData.get(i).getSiteStationId())){
bo=true;
break;
}
}
}
if (bo){
tSiteStationInfoData.get(i).setIconType(4);
list.add(tSiteStationInfoData.get(i));
}
tSiteStationInfoData.get(i).setIconType(4);
list.add(tSiteStationInfoData.get(i));
}
tSiteStationInfoDataList.setData(list);
return tSiteStationInfoDataList;
......@@ -531,7 +539,7 @@ public class PipeInterfaceController extends BaseController {
/**
* 阀门数据查询接口
* 阀门数据查询接口 使用中
* @return
*/
@RequestBody
......@@ -542,20 +550,24 @@ public class PipeInterfaceController extends BaseController {
List<DeviceData> list =new ArrayList<>();
//查询阀门井数据
List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData();
//查询下级全部数据方法
List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
// //查询下级全部数据方法
// List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
// for (int i=0;i<pipeDates.size();i++){
// boolean bo=false;
// for (int s=0;s<pressureFlows1.size();s++){
// if (pressureFlows1.get(s).getDeviceId().equals(pipeDates.get(i).getDeviceId())){
// bo=true;
// break;
// }
// }
// if (bo){
// pipeDates.get(i).setIconType(3);
// list.add(pipeDates.get(i));
// }
// }
for (int i=0;i<pipeDates.size();i++){
boolean bo=false;
for (int s=0;s<pressureFlows1.size();s++){
if (pressureFlows1.get(s).getDeviceId().equals(pipeDates.get(i).getDeviceId())){
bo=true;
break;
}
}
if (bo){
pipeDates.get(i).setIconType(3);
list.add(pipeDates.get(i));
}
pipeDates.get(i).setIconType(3);
list.add(pipeDates.get(i));
}
deviceDataList.setData(list);
return deviceDataList;
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TProjectInfoController.java 0 → 100644
View file @ a79807b0
package com.zehong.web.controller.supervise;
import java.io.File;
import java.util.List;
import com.zehong.common.config.GassafetyProgressConfig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TProjectInfo;
import com.zehong.system.service.ITProjectInfoService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 工程项目信息Controller
*
* @author zehong
* @date 2022-03-16
*/
@RestController
@RequestMapping("/project/info")
public class TProjectInfoController extends BaseController
{
@Autowired
private ITProjectInfoService tProjectInfoService;
/**
* 查询工程项目信息列表
*/
@PreAuthorize("@ss.hasPermi('project:info:list')")
@GetMapping("/list")
public TableDataInfo list(TProjectInfo tProjectInfo)
{
startPage();
List<TProjectInfo> list = tProjectInfoService.selectTProjectInfoList(tProjectInfo);
return getDataTable(list);
}
/**
* 导出工程项目信息列表
*/
@PreAuthorize("@ss.hasPermi('project:info:export')")
@Log(title = "工程项目信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TProjectInfo tProjectInfo)
{
List<TProjectInfo> list = tProjectInfoService.selectTProjectInfoList(tProjectInfo);
ExcelUtil<TProjectInfo> util = new ExcelUtil<TProjectInfo>(TProjectInfo.class);
return util.exportExcel(list, "工程项目信息数据");
}
/**
* 获取工程项目信息详细信息
*/
@PreAuthorize("@ss.hasPermi('project:info:query')")
@GetMapping(value = "/{projectId}")
public AjaxResult getInfo(@PathVariable("projectId") Long projectId)
{
return AjaxResult.success(tProjectInfoService.selectTProjectInfoById(projectId));
}
/**
* 新增工程项目信息
*/
@PreAuthorize("@ss.hasPermi('project:info:add')")
@Log(title = "工程项目信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TProjectInfo tProjectInfo)
{
//查询是否已经有重复的年份数据
List<TProjectInfo> tProjectInfos = tProjectInfoService.selectSameYear(tProjectInfo.getProjectYear());
//说明有重复的年份 将重复的年份删除
if (tProjectInfos.size()!=0){
//重复年份删除方法
tProjectInfoService.deleteisSameYear(tProjectInfo.getProjectYear());
}
return toAjax(tProjectInfoService.insertTProjectInfo(tProjectInfo));
}
/**
* 修改工程项目信息
*/
@PreAuthorize("@ss.hasPermi('project:info:edit')")
@Log(title = "工程项目信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TProjectInfo tProjectInfo)
{
//查询修改文件之前的路径
TProjectInfo tProjectInfos = tProjectInfoService.selectNearbyAddress(tProjectInfo.getProjectId());
if (tProjectInfos.getNearbyAddress()!=null){
// 上传文件路径
String filePath = GassafetyProgressConfig.getUploadPath();
String[] strs = tProjectInfos.getNearbyAddress().split("upload");
//删除
File file = new File(filePath+strs[1].toString());
// 上传文件路径
if(file.isFile()){
file.delete();
}
}
return toAjax(tProjectInfoService.updateTProjectInfo(tProjectInfo));
}
/**
* 删除工程项目信息
*/
@PreAuthorize("@ss.hasPermi('project:info:remove')")
@Log(title = "工程项目信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{projectIds}")
public AjaxResult remove(@PathVariable Long[] projectIds)
{
return toAjax(tProjectInfoService.deleteTProjectInfoByIds(projectIds));
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/DeviceData.java
View file @ a79807b0
......@@ -30,6 +30,8 @@ public class DeviceData {
private int iconType;
private String iconUrl;
//下级设备数据封装类数组
private List<SubordinateEquipmentList> subordinateEquipmentList;
......@@ -87,6 +89,13 @@ public class DeviceData {
//探测器报警中
private int detectorInAlarm;
public String getIconUrl() {
return iconUrl;
}
public void setIconUrl(String iconUrl) {
this.iconUrl = iconUrl;
}
public List<SubordinateEquipmentList> getSubordinateEquipmentList() {
return subordinateEquipmentList;
......@@ -351,6 +360,7 @@ public class DeviceData {
", pressureFlows=" + pressureFlows +
", beyondEnterpriseName='" + beyondEnterpriseName + '\'' +
", iconType=" + iconType +
", iconUrl='" + iconUrl + '\'' +
", subordinateEquipmentList=" + subordinateEquipmentList +
", numberPressureGauges=" + numberPressureGauges +
", onlineEquipment=" + onlineEquipment +
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TProjectInfo.java 0 → 100644
View file @ a79807b0
package com.zehong.system.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 工程项目信息对象 t_project_info
*
* @author zehong
* @date 2022-03-16
*/
public class TProjectInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 工程项目主键ID */
private Long projectId;
/** 工程项目年度 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "工程项目年度", width = 30, dateFormat = "yyyy-MM-dd")
private Date projectYear;
/** 门站地址 */
@Excel(name = "门站地址")
private String gateStationAddress;
/** 门站金额 */
@Excel(name = "门站金额")
private BigDecimal gateStationInvestment;
/** 门站数量 */
@Excel(name = "门站数量")
private Long numberGateStations;
/** 管道长度 */
@Excel(name = "管道长度")
private Long pipeLength;
/** 管道金额 */
@Excel(name = "管道金额")
private BigDecimal pipeInvestment;
/** 附件地址 */
private String nearbyAddress;
/** 是否删除(0正常，1删除) */
private String isDel;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setProjectId(Long projectId)
{
this.projectId = projectId;
}
public Long getProjectId()
{
return projectId;
}
public void setProjectYear(Date projectYear)
{
this.projectYear = projectYear;
}
public Date getProjectYear()
{
return projectYear;
}
public void setGateStationAddress(String gateStationAddress)
{
this.gateStationAddress = gateStationAddress;
}
public String getGateStationAddress()
{
return gateStationAddress;
}
public void setGateStationInvestment(BigDecimal gateStationInvestment)
{
this.gateStationInvestment = gateStationInvestment;
}
public BigDecimal getGateStationInvestment()
{
return gateStationInvestment;
}
public void setNumberGateStations(Long numberGateStations)
{
this.numberGateStations = numberGateStations;
}
public Long getNumberGateStations()
{
return numberGateStations;
}
public void setPipeLength(Long pipeLength)
{
this.pipeLength = pipeLength;
}
public Long getPipeLength()
{
return pipeLength;
}
public void setPipeInvestment(BigDecimal pipeInvestment)
{
this.pipeInvestment = pipeInvestment;
}
public BigDecimal getPipeInvestment()
{
return pipeInvestment;
}
public void setNearbyAddress(String nearbyAddress)
{
this.nearbyAddress = nearbyAddress;
}
public String getNearbyAddress()
{
return nearbyAddress;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("projectId", getProjectId())
.append("projectYear", getProjectYear())
.append("gateStationAddress", getGateStationAddress())
.append("gateStationInvestment", getGateStationInvestment())
.append("numberGateStations", getNumberGateStations())
.append("pipeLength", getPipeLength())
.append("pipeInvestment", getPipeInvestment())
.append("nearbyAddress", getNearbyAddress())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("remarks", getRemarks())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSafeEquipmentStandingBook.java
View file @ a79807b0
......@@ -43,9 +43,6 @@ public class TSafeEquipmentStandingBook extends BaseEntity
/** 安全装置类型 */
private String equipmentType;
/** 安全装置类型 */
private String equipments;
/** 安装时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSiteStationInfoData.java
View file @ a79807b0
......@@ -22,6 +22,8 @@ public class TSiteStationInfoData {
private String buildCompany;
private String powerCompany;
private String pictureAddress;
//流量计数组
private List<PressureFlow> pressureFlows;
......@@ -86,6 +88,14 @@ public class TSiteStationInfoData {
//探测器报警中
private int detectorInAlarm;
public String getPictureAddress() {
return pictureAddress;
}
public void setPictureAddress(String pictureAddress) {
this.pictureAddress = pictureAddress;
}
public List<SubordinateEquipmentList> getSubordinateEquipmentList() {
return subordinateEquipmentList;
}
......@@ -357,6 +367,7 @@ public class TSiteStationInfoData {
", buildyear='" + buildyear + '\'' +
", buildCompany='" + buildCompany + '\'' +
", powerCompany='" + powerCompany + '\'' +
", pictureAddress='" + pictureAddress + '\'' +
", pressureFlows=" + pressureFlows +
", subordinateEquipmentList=" + subordinateEquipmentList +
", iconType=" + iconType +
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleInfo.java 0 → 100644
View file @ a79807b0
package com.zehong.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import java.math.BigDecimal;
/**
* 燃气车辆信息对象 t_vehicle_info
*
* @author zehong
* @date 2022-03-17
*/
public class TVehicleInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 车辆id */
private Long vehicleId;
/** 车牌号 */
@Excel(name = "车牌号")
private String carNum;
/** 品牌型号 */
@Excel(name = "品牌型号")
private String brandModel;
/** 车辆类型: 1.罐车 2.卡车 */
@Excel(name = "车辆类型: 1.罐车 2.卡车")
private String vehicleType;
/** 车辆载重 */
@Excel(name = "车辆载重")
private String vehicleLoad;
/** 车辆大小 */
@Excel(name = "车辆大小")
private String vehicleSize;
/** 车辆限乘 */
@Excel(name = "车辆限乘")
private String vehicleLimt;
/** 车辆检测信息 */
@Excel(name = "车辆检测信息")
private String vehicleInspect;
/** 所属企业 */
@Excel(name = "所属企业")
private String beyondEnterpriseId;
/** 责任人 */
@Excel(name = "责任人")
private String personLiable;
/** 联系电话 */
@Excel(name = "联系电话")
private String phone;
/** 是否删除(0正常，1删除) */
@Excel(name = "是否删除(0正常，1删除)")
private String isDel;
/** 备注 */
@Excel(name = "备注")
private String remarks;
/**
* 经度
*/
private BigDecimal longitude;
/**
* 纬度
*/
private BigDecimal latitude;
public BigDecimal getLongitude() {
return longitude;
}
public void setLongitude(BigDecimal longitude) {
this.longitude = longitude;
}
public BigDecimal getLatitude() {
return latitude;
}
public void setLatitude(BigDecimal latitude) {
this.latitude = latitude;
}
public void setVehicleId(Long vehicleId)
{
this.vehicleId = vehicleId;
}
public Long getVehicleId()
{
return vehicleId;
}
public void setCarNum(String carNum)
{
this.carNum = carNum;
}
public String getCarNum()
{
return carNum;
}
public void setBrandModel(String brandModel)
{
this.brandModel = brandModel;
}
public String getBrandModel()
{
return brandModel;
}
public void setVehicleType(String vehicleType)
{
this.vehicleType = vehicleType;
}
public String getVehicleType()
{
return vehicleType;
}
public void setVehicleLoad(String vehicleLoad)
{
this.vehicleLoad = vehicleLoad;
}
public String getVehicleLoad()
{
return vehicleLoad;
}
public void setVehicleSize(String vehicleSize)
{
this.vehicleSize = vehicleSize;
}
public String getVehicleSize()
{
return vehicleSize;
}
public void setVehicleLimt(String vehicleLimt)
{
this.vehicleLimt = vehicleLimt;
}
public String getVehicleLimt()
{
return vehicleLimt;
}
public void setVehicleInspect(String vehicleInspect)
{
this.vehicleInspect = vehicleInspect;
}
public String getVehicleInspect()
{
return vehicleInspect;
}
public void setBeyondEnterpriseId(String beyondEnterpriseId)
{
this.beyondEnterpriseId = beyondEnterpriseId;
}
public String getBeyondEnterpriseId()
{
return beyondEnterpriseId;
}
public void setPersonLiable(String personLiable)
{
this.personLiable = personLiable;
}
public String getPersonLiable()
{
return personLiable;
}
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
{
return phone;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("vehicleId", getVehicleId())
.append("carNum", getCarNum())
.append("brandModel", getBrandModel())
.append("vehicleType", getVehicleType())
.append("vehicleLoad", getVehicleLoad())
.append("vehicleSize", getVehicleSize())
.append("vehicleLimt", getVehicleLimt())
.append("vehicleInspect", getVehicleInspect())
.append("beyondEnterpriseId", getBeyondEnterpriseId())
.append("personLiable", getPersonLiable())
.append("phone", getPhone())
.append("isDel", getIsDel())
.append("remarks", getRemarks())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleLocationInfo.java 0 → 100644
View file @ a79807b0
package com.zehong.system.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 燃气车辆位置信息对象 t_vehicle_location_info
*
* @author zehong
* @date 2022-03-17
*/
public class TVehicleLocationInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 车辆id */
private Long vehicleLocationId;
/** 车牌号 */
@Excel(name = "车牌号")
private String carNum;
/** 经度 */
@Excel(name = "经度")
private BigDecimal longitude;
/** 纬度 */
@Excel(name = "纬度")
private BigDecimal latitude;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date reportTime;
/** 是否删除(0正常，1删除) */
@Excel(name = "是否删除(0正常，1删除)")
private String isDel;
/** 备注 */
@Excel(name = "备注")
private String remarks;
/**是否获取最后一次位置*/
private boolean isLast;
/**位置查询开始时间*/
private Date beginTime;
/**位置查询结束时间*/
private Date endTime;
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public boolean isLast() {
return isLast;
}
public void setLast(boolean last) {
isLast = last;
}
public void setVehicleLocationId(Long vehicleLocationId)
{
this.vehicleLocationId = vehicleLocationId;
}
public Long getVehicleLocationId()
{
return vehicleLocationId;
}
public void setCarNum(String carNum)
{
this.carNum = carNum;
}
public String getCarNum()
{
return carNum;
}
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 setReportTime(Date reportTime)
{
this.reportTime = reportTime;
}
public Date getReportTime()
{
return reportTime;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("vehicleLocationId", getVehicleLocationId())
.append("carNum", getCarNum())
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("reportTime", getReportTime())
.append("isDel", getIsDel())
.append("remarks", getRemarks())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TProjectInfoMapper.java 0 → 100644
View file @ a79807b0
package com.zehong.system.mapper;
import java.util.Date;
import java.util.List;
import com.zehong.system.domain.TProjectInfo;
/**
* 工程项目信息Mapper接口
*
* @author zehong
* @date 2022-03-16
*/
public interface TProjectInfoMapper
{
/**
* 查询工程项目信息
*
* @param projectId 工程项目信息ID
* @return 工程项目信息
*/
public TProjectInfo selectTProjectInfoById(Long projectId);
/**
* 查询工程项目信息列表
*
* @param tProjectInfo 工程项目信息
* @return 工程项目信息集合
*/
public List<TProjectInfo> selectTProjectInfoList(TProjectInfo tProjectInfo);
/**
* 新增工程项目信息
*
* @param tProjectInfo 工程项目信息
* @return 结果
*/
public int insertTProjectInfo(TProjectInfo tProjectInfo);
/**
* 修改工程项目信息
*
* @param tProjectInfo 工程项目信息
* @return 结果
*/
public int updateTProjectInfo(TProjectInfo tProjectInfo);
/**
* 删除工程项目信息
*
* @param projectId 工程项目信息ID
* @return 结果
*/
public int deleteTProjectInfoById(Long projectId);
/**
* 批量删除工程项目信息
*
* @param projectIds 需要删除的数据ID
* @return 结果
*/
public int deleteTProjectInfoByIds(Long[] projectIds);
/**
* 查询是否已经有重复的年份数据
* @param projectYear
* @return
*/
List<TProjectInfo> selectSameYear(Date projectYear);
/**
* 重复年份删除方法
* @param isSameYear
*/
void deleteisSameYear(Date isSameYear);
/**
* 查询修改文件之前的路径
* @param projectId
* @return
*/
TProjectInfo selectNearbyAddress(Long projectId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TVehicleInfoMapper.java 0 → 100644
View file @ a79807b0
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TVehicleInfo;
/**
* 燃气车辆信息Mapper接口
*
* @author zehong
* @date 2022-03-17
*/
public interface TVehicleInfoMapper
{
/**
* 查询燃气车辆信息
*
* @param vehicleId 燃气车辆信息ID
* @return 燃气车辆信息
*/
public TVehicleInfo selectTVehicleInfoById(Long vehicleId);
/**
* 查询燃气车辆信息列表
*
* @param tVehicleInfo 燃气车辆信息
* @return 燃气车辆信息集合
*/
public List<TVehicleInfo> selectTVehicleInfoList(TVehicleInfo tVehicleInfo);
/**
* 新增燃气车辆信息
*
* @param tVehicleInfo 燃气车辆信息
* @return 结果
*/
public int insertTVehicleInfo(TVehicleInfo tVehicleInfo);
/**
* 修改燃气车辆信息
*
* @param tVehicleInfo 燃气车辆信息
* @return 结果
*/
public int updateTVehicleInfo(TVehicleInfo tVehicleInfo);
/**
* 删除燃气车辆信息
*
* @param vehicleId 燃气车辆信息ID
* @return 结果
*/
public int deleteTVehicleInfoById(Long vehicleId);
/**
* 批量删除燃气车辆信息
*
* @param vehicleIds 需要删除的数据ID
* @return 结果
*/
public int deleteTVehicleInfoByIds(Long[] vehicleIds);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TVehicleLocationInfoMapper.java 0 → 100644
View file @ a79807b0
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TVehicleLocationInfo;
/**
* 燃气车辆位置信息Mapper接口
*
* @author zehong
* @date 2022-03-17
*/
public interface TVehicleLocationInfoMapper
{
/**
* 查询燃气车辆位置信息
*
* @param vehicleLocationId 燃气车辆位置信息ID
* @return 燃气车辆位置信息
*/
public TVehicleLocationInfo selectTVehicleLocationInfoById(Long vehicleLocationId);
/**
* 查询燃气车辆位置信息列表
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 燃气车辆位置信息集合
*/
public List<TVehicleLocationInfo> selectTVehicleLocationInfoList(TVehicleLocationInfo tVehicleLocationInfo);
/**
* 新增燃气车辆位置信息
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 结果
*/
public int insertTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
/**
* 修改燃气车辆位置信息
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 结果
*/
public int updateTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
/**
* 删除燃气车辆位置信息
*
* @param vehicleLocationId 燃气车辆位置信息ID
* @return 结果
*/
public int deleteTVehicleLocationInfoById(Long vehicleLocationId);
/**
* 批量删除燃气车辆位置信息
*
* @param vehicleLocationIds 需要删除的数据ID
* @return 结果
*/
public int deleteTVehicleLocationInfoByIds(Long[] vehicleLocationIds);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITProjectInfoService.java 0 → 100644
View file @ a79807b0
package com.zehong.system.service;
import java.util.Date;
import java.util.List;
import com.zehong.system.domain.TProjectInfo;
/**
* 工程项目信息Service接口
*
* @author zehong
* @date 2022-03-16
*/
public interface ITProjectInfoService
{
/**
* 查询工程项目信息
*
* @param projectId 工程项目信息ID
* @return 工程项目信息
*/
public TProjectInfo selectTProjectInfoById(Long projectId);
/**
* 查询工程项目信息列表
*
* @param tProjectInfo 工程项目信息
* @return 工程项目信息集合
*/
public List<TProjectInfo> selectTProjectInfoList(TProjectInfo tProjectInfo);
/**
* 新增工程项目信息
*
* @param tProjectInfo 工程项目信息
* @return 结果
*/
public int insertTProjectInfo(TProjectInfo tProjectInfo);
/**
* 修改工程项目信息
*
* @param tProjectInfo 工程项目信息
* @return 结果
*/
public int updateTProjectInfo(TProjectInfo tProjectInfo);
/**
* 批量删除工程项目信息
*
* @param projectIds 需要删除的工程项目信息ID
* @return 结果
*/
public int deleteTProjectInfoByIds(Long[] projectIds);
/**
* 删除工程项目信息信息
*
* @param projectId 工程项目信息ID
* @return 结果
*/
public int deleteTProjectInfoById(Long projectId);
/**
* 查询是否已经有重复的年份数据
* @param projectYear
* @return
*/
List<TProjectInfo> selectSameYear(Date projectYear);
/**
* 重复年份删除方法
* @param isSameYear
*/
void deleteisSameYear(Date isSameYear);
/**
* 查询修改文件之前的路径
* @param projectId
*/
TProjectInfo selectNearbyAddress(Long projectId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITVehicleInfoService.java 0 → 100644
View file @ a79807b0
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TVehicleInfo;
/**
* 燃气车辆信息Service接口
*
* @author zehong
* @date 2022-03-17
*/
public interface ITVehicleInfoService
{
/**
* 查询燃气车辆信息
*
* @param vehicleId 燃气车辆信息ID
* @return 燃气车辆信息
*/
public TVehicleInfo selectTVehicleInfoById(Long vehicleId);
/**
* 查询燃气车辆信息列表
*
* @param tVehicleInfo 燃气车辆信息
* @return 燃气车辆信息集合
*/
public List<TVehicleInfo> selectTVehicleInfoList(TVehicleInfo tVehicleInfo);
/**
* 新增燃气车辆信息
*
* @param tVehicleInfo 燃气车辆信息
* @return 结果
*/
public int insertTVehicleInfo(TVehicleInfo tVehicleInfo);
/**
* 修改燃气车辆信息
*
* @param tVehicleInfo 燃气车辆信息
* @return 结果
*/
public int updateTVehicleInfo(TVehicleInfo tVehicleInfo);
/**
* 批量删除燃气车辆信息
*
* @param vehicleIds 需要删除的燃气车辆信息ID
* @return 结果
*/
public int deleteTVehicleInfoByIds(Long[] vehicleIds);
/**
* 删除燃气车辆信息信息
*
* @param vehicleId 燃气车辆信息ID
* @return 结果
*/
public int deleteTVehicleInfoById(Long vehicleId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITVehicleLocationInfoService.java 0 → 100644
View file @ a79807b0
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TVehicleLocationInfo;
/**
* 燃气车辆位置信息Service接口
*
* @author zehong
* @date 2022-03-17
*/
public interface ITVehicleLocationInfoService
{
/**
* 查询燃气车辆位置信息
*
* @param vehicleLocationId 燃气车辆位置信息ID
* @return 燃气车辆位置信息
*/
public TVehicleLocationInfo selectTVehicleLocationInfoById(Long vehicleLocationId);
/**
* 查询燃气车辆位置信息列表
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 燃气车辆位置信息集合
*/
public List<TVehicleLocationInfo> selectTVehicleLocationInfoList(TVehicleLocationInfo tVehicleLocationInfo);
/**
* 新增燃气车辆位置信息
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 结果
*/
public int insertTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
/**
* 修改燃气车辆位置信息
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 结果
*/
public int updateTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
/**
* 批量删除燃气车辆位置信息
*
* @param vehicleLocationIds 需要删除的燃气车辆位置信息ID
* @return 结果
*/
public int deleteTVehicleLocationInfoByIds(Long[] vehicleLocationIds);
/**
* 删除燃气车辆位置信息信息
*
* @param vehicleLocationId 燃气车辆位置信息ID
* @return 结果
*/
public int deleteTVehicleLocationInfoById(Long vehicleLocationId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TProjectInfoServiceImpl.java 0 → 100644
View file @ a79807b0
package com.zehong.system.service.impl;
import java.util.Date;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TProjectInfoMapper;
import com.zehong.system.domain.TProjectInfo;
import com.zehong.system.service.ITProjectInfoService;
/**
* 工程项目信息Service业务层处理
*
* @author zehong
* @date 2022-03-16
*/
@Service
public class TProjectInfoServiceImpl implements ITProjectInfoService
{
@Autowired
private TProjectInfoMapper tProjectInfoMapper;
/**
* 查询工程项目信息
*
* @param projectId 工程项目信息ID
* @return 工程项目信息
*/
@Override
public TProjectInfo selectTProjectInfoById(Long projectId)
{
return tProjectInfoMapper.selectTProjectInfoById(projectId);
}
/**
* 查询工程项目信息列表
*
* @param tProjectInfo 工程项目信息
* @return 工程项目信息
*/
@Override
public List<TProjectInfo> selectTProjectInfoList(TProjectInfo tProjectInfo)
{
return tProjectInfoMapper.selectTProjectInfoList(tProjectInfo);
}
/**
* 新增工程项目信息
*
* @param tProjectInfo 工程项目信息
* @return 结果
*/
@Override
public int insertTProjectInfo(TProjectInfo tProjectInfo)
{
tProjectInfo.setCreateTime(DateUtils.getNowDate());
return tProjectInfoMapper.insertTProjectInfo(tProjectInfo);
}
/**
* 修改工程项目信息
*
* @param tProjectInfo 工程项目信息
* @return 结果
*/
@Override
public int updateTProjectInfo(TProjectInfo tProjectInfo)
{
tProjectInfo.setUpdateTime(DateUtils.getNowDate());
return tProjectInfoMapper.updateTProjectInfo(tProjectInfo);
}
/**
* 批量删除工程项目信息
*
* @param projectIds 需要删除的工程项目信息ID
* @return 结果
*/
@Override
public int deleteTProjectInfoByIds(Long[] projectIds)
{
return tProjectInfoMapper.deleteTProjectInfoByIds(projectIds);
}
/**
* 删除工程项目信息信息
*
* @param projectId 工程项目信息ID
* @return 结果
*/
@Override
public int deleteTProjectInfoById(Long projectId)
{
return tProjectInfoMapper.deleteTProjectInfoById(projectId);
}
/**
* 查询是否已经有重复的年份数据
* @param projectYear
* @return
*/
@Override
public List<TProjectInfo> selectSameYear(Date projectYear) {
List<TProjectInfo> tProjectInfos = tProjectInfoMapper.selectSameYear(projectYear);
return tProjectInfos;
}
/**
* 重复年份删除方法
* @param isSameYear
*/
@Override
public void deleteisSameYear(Date isSameYear) {
tProjectInfoMapper.deleteisSameYear(isSameYear);
}
/**
* 查询修改文件之前的路径
* @param projectId
* @return
*/
@Override
public TProjectInfo selectNearbyAddress(Long projectId) {
TProjectInfo tProjectInfo = tProjectInfoMapper.selectNearbyAddress(projectId);
return tProjectInfo;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TVehicleInfoServiceImpl.java 0 → 100644
View file @ a79807b0
package com.zehong.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TVehicleInfoMapper;
import com.zehong.system.domain.TVehicleInfo;
import com.zehong.system.service.ITVehicleInfoService;
/**
* 燃气车辆信息Service业务层处理
*
* @author zehong
* @date 2022-03-17
*/
@Service
public class TVehicleInfoServiceImpl implements ITVehicleInfoService
{
@Autowired
private TVehicleInfoMapper tVehicleInfoMapper;
/**
* 查询燃气车辆信息
*
* @param vehicleId 燃气车辆信息ID
* @return 燃气车辆信息
*/
@Override
public TVehicleInfo selectTVehicleInfoById(Long vehicleId)
{
return tVehicleInfoMapper.selectTVehicleInfoById(vehicleId);
}
/**
* 查询燃气车辆信息列表
*
* @param tVehicleInfo 燃气车辆信息
* @return 燃气车辆信息
*/
@Override
public List<TVehicleInfo> selectTVehicleInfoList(TVehicleInfo tVehicleInfo)
{
return tVehicleInfoMapper.selectTVehicleInfoList(tVehicleInfo);
}
/**
* 新增燃气车辆信息
*
* @param tVehicleInfo 燃气车辆信息
* @return 结果
*/
@Override
public int insertTVehicleInfo(TVehicleInfo tVehicleInfo)
{
return tVehicleInfoMapper.insertTVehicleInfo(tVehicleInfo);
}
/**
* 修改燃气车辆信息
*
* @param tVehicleInfo 燃气车辆信息
* @return 结果
*/
@Override
public int updateTVehicleInfo(TVehicleInfo tVehicleInfo)
{
return tVehicleInfoMapper.updateTVehicleInfo(tVehicleInfo);
}
/**
* 批量删除燃气车辆信息
*
* @param vehicleIds 需要删除的燃气车辆信息ID
* @return 结果
*/
@Override
public int deleteTVehicleInfoByIds(Long[] vehicleIds)
{
return tVehicleInfoMapper.deleteTVehicleInfoByIds(vehicleIds);
}
/**
* 删除燃气车辆信息信息
*
* @param vehicleId 燃气车辆信息ID
* @return 结果
*/
@Override
public int deleteTVehicleInfoById(Long vehicleId)
{
return tVehicleInfoMapper.deleteTVehicleInfoById(vehicleId);
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TVehicleLocationInfoServiceImpl.java 0 → 100644
View file @ a79807b0
package com.zehong.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TVehicleLocationInfoMapper;
import com.zehong.system.domain.TVehicleLocationInfo;
import com.zehong.system.service.ITVehicleLocationInfoService;
/**
* 燃气车辆位置信息Service业务层处理
*
* @author zehong
* @date 2022-03-17
*/
@Service
public class TVehicleLocationInfoServiceImpl implements ITVehicleLocationInfoService
{
@Autowired
private TVehicleLocationInfoMapper tVehicleLocationInfoMapper;
/**
* 查询燃气车辆位置信息
*
* @param vehicleLocationId 燃气车辆位置信息ID
* @return 燃气车辆位置信息
*/
@Override
public TVehicleLocationInfo selectTVehicleLocationInfoById(Long vehicleLocationId)
{
return tVehicleLocationInfoMapper.selectTVehicleLocationInfoById(vehicleLocationId);
}
/**
* 查询燃气车辆位置信息列表
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 燃气车辆位置信息
*/
@Override
public List<TVehicleLocationInfo> selectTVehicleLocationInfoList(TVehicleLocationInfo tVehicleLocationInfo)
{
return tVehicleLocationInfoMapper.selectTVehicleLocationInfoList(tVehicleLocationInfo);
}
/**
* 新增燃气车辆位置信息
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 结果
*/
@Override
public int insertTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo)
{
return tVehicleLocationInfoMapper.insertTVehicleLocationInfo(tVehicleLocationInfo);
}
/**
* 修改燃气车辆位置信息
*
* @param tVehicleLocationInfo 燃气车辆位置信息
* @return 结果
*/
@Override
public int updateTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo)
{
return tVehicleLocationInfoMapper.updateTVehicleLocationInfo(tVehicleLocationInfo);
}
/**
* 批量删除燃气车辆位置信息
*
* @param vehicleLocationIds 需要删除的燃气车辆位置信息ID
* @return 结果
*/
@Override
public int deleteTVehicleLocationInfoByIds(Long[] vehicleLocationIds)
{
return tVehicleLocationInfoMapper.deleteTVehicleLocationInfoByIds(vehicleLocationIds);
}
/**
* 删除燃气车辆位置信息信息
*
* @param vehicleLocationId 燃气车辆位置信息ID
* @return 结果
*/
@Override
public int deleteTVehicleLocationInfoById(Long vehicleLocationId)
{
return tVehicleLocationInfoMapper.deleteTVehicleLocationInfoById(vehicleLocationId);
}
}
gassafetyprogress-system/src/main/resources/mapper/system/PipeInterfaceMapper.xml
View file @ a79807b0
......@@ -30,6 +30,7 @@
<result property="companyType" column="device_id" />
<result property="beyondEnterpriseName" column="beyond_enterprise_name" />
<result property="companyType" column="beyond_enterprise_id" />
<result property="iconUrl" column="icon_url" />
</resultMap>
<!--下级设备数据-->
......@@ -52,6 +53,7 @@
<result property="buildCompany" column="build_unit" />
<result property="powerCompany" column="beyond_enterprise_name" />
<result property="companyType" column="beyond_enterprise_id" />
<result property="pictureAddress" column="picture_address" />
</resultMap>
<!--监控数据-->
......@@ -109,7 +111,7 @@
<!--调压箱数据查询方法-->
<select id="selectDeviceData" resultMap="DeviceDateResult">
select beyond_enterprise_id,device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
select beyond_enterprise_id,icon_url,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>
......@@ -121,7 +123,7 @@
<!--场站信息查询方法-->
<select id="selectTSiteStationInfoData" resultMap="TSiteStationInfoDataResult">
select beyond_enterprise_id,site_station_id,site_station_name,site_station_type,longitude,latitude,create_time,build_unit,beyond_enterprise_name
select beyond_enterprise_id,picture_address,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>
......@@ -150,7 +152,7 @@
<!--查询阀门井数据-->
<select id="selectvalveData" resultMap="DeviceDateResult">
select beyond_enterprise_id,device_id,device_type,device_name,device_code,device_addr,longitude,latitude,beyond_enterprise_name from t_device_info
select beyond_enterprise_id,device_id,icon_url,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>
......
gassafetyprogress-system/src/main/resources/mapper/system/TProjectInfoMapper.xml 0 → 100644
View file @ a79807b0
<?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.TProjectInfoMapper">
<resultMap type="TProjectInfo" id="TProjectInfoResult">
<result property="projectId" column="project_id" />
<result property="projectYear" column="project_year" />
<result property="gateStationAddress" column="gate_station_address" />
<result property="gateStationInvestment" column="gate_station_investment" />
<result property="numberGateStations" column="number_gate_stations" />
<result property="pipeLength" column="pipe_length" />
<result property="pipeInvestment" column="pipe_investment" />
<result property="nearbyAddress" column="nearby_address" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="isDel" column="is_del" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTProjectInfoVo">
select project_id, project_year, gate_station_address, gate_station_investment, number_gate_stations, pipe_length, pipe_investment, nearby_address, create_by, create_time, update_by, update_time, is_del, remarks from t_project_info
</sql>
<select id="selectTProjectInfoList" parameterType="TProjectInfo" resultMap="TProjectInfoResult">
<include refid="selectTProjectInfoVo"/>
<where>
is_del='0'
<if test="projectYear != null "> and project_year = #{projectYear}</if>
<if test="gateStationAddress != null and gateStationAddress != ''"> and gate_station_address = #{gateStationAddress}</if>
<if test="gateStationInvestment != null "> and gate_station_investment = #{gateStationInvestment}</if>
<if test="numberGateStations != null "> and number_gate_stations = #{numberGateStations}</if>
<if test="pipeLength != null "> and pipe_length = #{pipeLength}</if>
<if test="pipeInvestment != null "> and pipe_investment = #{pipeInvestment}</if>
<if test="nearbyAddress != null and nearbyAddress != ''"> and nearby_address = #{nearbyAddress}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
group by project_id desc
</select>
<select id="selectTProjectInfoById" parameterType="Long" resultMap="TProjectInfoResult">
<include refid="selectTProjectInfoVo"/>
where project_id = #{projectId} and is_del='0'
</select>
<insert id="insertTProjectInfo" parameterType="TProjectInfo" useGeneratedKeys="true" keyProperty="projectId">
insert into t_project_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="projectYear != null">project_year,</if>
<if test="gateStationAddress != null">gate_station_address,</if>
<if test="gateStationInvestment != null">gate_station_investment,</if>
<if test="numberGateStations != null">number_gate_stations,</if>
<if test="pipeLength != null">pipe_length,</if>
<if test="pipeInvestment != null">pipe_investment,</if>
<if test="nearbyAddress != null">nearby_address,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="isDel != null">is_del,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectYear != null">#{projectYear},</if>
<if test="gateStationAddress != null">#{gateStationAddress},</if>
<if test="gateStationInvestment != null">#{gateStationInvestment},</if>
<if test="numberGateStations != null">#{numberGateStations},</if>
<if test="pipeLength != null">#{pipeLength},</if>
<if test="pipeInvestment != null">#{pipeInvestment},</if>
<if test="nearbyAddress != null">#{nearbyAddress},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
<update id="updateTProjectInfo" parameterType="TProjectInfo">
update t_project_info
<trim prefix="SET" suffixOverrides=",">
<if test="projectYear != null">project_year = #{projectYear},</if>
<if test="gateStationAddress != null">gate_station_address = #{gateStationAddress},</if>
<if test="gateStationInvestment != null">gate_station_investment = #{gateStationInvestment},</if>
<if test="numberGateStations != null">number_gate_stations = #{numberGateStations},</if>
<if test="pipeLength != null">pipe_length = #{pipeLength},</if>
<if test="pipeInvestment != null">pipe_investment = #{pipeInvestment},</if>
<if test="nearbyAddress != null">nearby_address = #{nearbyAddress},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where project_id = #{projectId}
</update>
<update id="deleteTProjectInfoById" parameterType="Long">
update t_project_info set is_del='1' where project_id = #{projectId}
</update>
<update id="deleteTProjectInfoByIds" parameterType="String">
update t_project_info set is_del='1' where project_id in
<foreach item="projectId" collection="array" open="(" separator="," close=")">
#{projectId}
</foreach>
</update>
<!--查询是否已经有重复的年份数据-->
<select id="selectSameYear" resultMap="TProjectInfoResult">
select project_id from t_project_info where project_year=#{projectYear}
</select>
<!--重复年份删除方法-->
<update id="deleteisSameYear">
update t_project_info set is_del='1' where project_year=#{isSameYear}
</update>
<!--查询修改文件之前的路径-->
<select id="selectNearbyAddress" resultMap="TProjectInfoResult">
select nearby_address from t_project_info where project_id=#{projectId}
</select>
</mapper>
gassafetyprogress-system/src/main/resources/mapper/system/TVehicleInfoMapper.xml 0 → 100644
View file @ a79807b0
<?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.TVehicleInfoMapper">
<resultMap type="TVehicleInfo" id="TVehicleInfoResult">
<result property="vehicleId" column="vehicle_id" />
<result property="carNum" column="car_num" />
<result property="brandModel" column="brand_model" />
<result property="vehicleType" column="vehicle_type" />
<result property="vehicleLoad" column="vehicle_load" />
<result property="vehicleSize" column="vehicle_size" />
<result property="vehicleLimt" column="vehicle_limt" />
<result property="vehicleInspect" column="vehicle_inspect" />
<result property="beyondEnterpriseId" column="beyond_enterprise_id" />
<result property="personLiable" column="person_liable" />
<result property="phone" column="phone" />
<result property="isDel" column="is_del" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTVehicleInfoVo">
select vehicle_id, car_num, brand_model, vehicle_type, vehicle_load, vehicle_size, vehicle_limt, vehicle_inspect, beyond_enterprise_id, person_liable, phone, is_del, remarks from t_vehicle_info
</sql>
<select id="selectTVehicleInfoList" parameterType="TVehicleInfo" resultMap="TVehicleInfoResult">
<include refid="selectTVehicleInfoVo"/>
<where>
<if test="carNum != null and carNum != ''"> and car_num like concat('%', #{carNum}, '%') </if>
<if test="brandModel != null and brandModel != ''"> and brand_model = #{brandModel}</if>
<if test="vehicleType != null and vehicleType != ''"> and vehicle_type = #{vehicleType}</if>
<if test="vehicleLoad != null and vehicleLoad != ''"> and vehicle_load = #{vehicleLoad}</if>
<if test="vehicleSize != null and vehicleSize != ''"> and vehicle_size = #{vehicleSize}</if>
<if test="vehicleLimt != null and vehicleLimt != ''"> and vehicle_limt = #{vehicleLimt}</if>
<if test="vehicleInspect != null and vehicleInspect != ''"> and vehicle_inspect = #{vehicleInspect}</if>
<if test="beyondEnterpriseId != null and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="personLiable != null and personLiable != ''"> and person_liable = #{personLiable}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
<select id="selectTVehicleInfoById" parameterType="Long" resultMap="TVehicleInfoResult">
<include refid="selectTVehicleInfoVo"/>
where vehicle_id = #{vehicleId}
</select>
<insert id="insertTVehicleInfo" parameterType="TVehicleInfo" useGeneratedKeys="true" keyProperty="vehicleId">
insert into t_vehicle_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="carNum != null">car_num,</if>
<if test="brandModel != null">brand_model,</if>
<if test="vehicleType != null">vehicle_type,</if>
<if test="vehicleLoad != null">vehicle_load,</if>
<if test="vehicleSize != null">vehicle_size,</if>
<if test="vehicleLimt != null">vehicle_limt,</if>
<if test="vehicleInspect != null">vehicle_inspect,</if>
<if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
<if test="personLiable != null">person_liable,</if>
<if test="phone != null">phone,</if>
<if test="isDel != null">is_del,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="carNum != null">#{carNum},</if>
<if test="brandModel != null">#{brandModel},</if>
<if test="vehicleType != null">#{vehicleType},</if>
<if test="vehicleLoad != null">#{vehicleLoad},</if>
<if test="vehicleSize != null">#{vehicleSize},</if>
<if test="vehicleLimt != null">#{vehicleLimt},</if>
<if test="vehicleInspect != null">#{vehicleInspect},</if>
<if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
<if test="personLiable != null">#{personLiable},</if>
<if test="phone != null">#{phone},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
<update id="updateTVehicleInfo" parameterType="TVehicleInfo">
update t_vehicle_info
<trim prefix="SET" suffixOverrides=",">
<if test="carNum != null">car_num = #{carNum},</if>
<if test="brandModel != null">brand_model = #{brandModel},</if>
<if test="vehicleType != null">vehicle_type = #{vehicleType},</if>
<if test="vehicleLoad != null">vehicle_load = #{vehicleLoad},</if>
<if test="vehicleSize != null">vehicle_size = #{vehicleSize},</if>
<if test="vehicleLimt != null">vehicle_limt = #{vehicleLimt},</if>
<if test="vehicleInspect != null">vehicle_inspect = #{vehicleInspect},</if>
<if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
<if test="personLiable != null">person_liable = #{personLiable},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where vehicle_id = #{vehicleId}
</update>
<delete id="deleteTVehicleInfoById" parameterType="Long">
delete from t_vehicle_info where vehicle_id = #{vehicleId}
</delete>
<delete id="deleteTVehicleInfoByIds" parameterType="String">
delete from t_vehicle_info where vehicle_id in
<foreach item="vehicleId" collection="array" open="(" separator="," close=")">
#{vehicleId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
gassafetyprogress-system/src/main/resources/mapper/system/TVehicleLocationInfoMapper.xml 0 → 100644
View file @ a79807b0
<?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.TVehicleLocationInfoMapper">
<resultMap type="TVehicleLocationInfo" id="TVehicleLocationInfoResult">
<result property="vehicleLocationId" column="vehicle_location_id" />
<result property="carNum" column="car_num" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="reportTime" column="report_time" />
<result property="isDel" column="is_del" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTVehicleLocationInfoVo">
select vehicle_location_id, car_num, longitude, latitude, report_time, is_del, remarks from t_vehicle_location_info
</sql>
<select id="selectTVehicleLocationInfoList" parameterType="TVehicleLocationInfo" resultMap="TVehicleLocationInfoResult">
<include refid="selectTVehicleLocationInfoVo"/>
<where>
<if test="carNum != null and carNum != ''"> and car_num = #{carNum}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="latitude != null "> and latitude = #{latitude}</if>
<if test="beginTime != null and endTime!= null"> and report_time BETWEEN #{ beginTime } AND #{ endTime }</if>
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
ORDER BY report_time DESC
<if test="isLast">
limit 1
</if>
</select>
<select id="selectTVehicleLocationInfoById" parameterType="Long" resultMap="TVehicleLocationInfoResult">
<include refid="selectTVehicleLocationInfoVo"/>
where vehicle_location_id = #{vehicleLocationId}
</select>
<insert id="insertTVehicleLocationInfo" parameterType="TVehicleLocationInfo" useGeneratedKeys="true" keyProperty="vehicleLocationId">
insert into t_vehicle_location_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="carNum != null">car_num,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="reportTime != null">report_time,</if>
<if test="isDel != null">is_del,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="carNum != null">#{carNum},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="reportTime != null">#{reportTime},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
<update id="updateTVehicleLocationInfo" parameterType="TVehicleLocationInfo">
update t_vehicle_location_info
<trim prefix="SET" suffixOverrides=",">
<if test="carNum != null">car_num = #{carNum},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="reportTime != null">report_time = #{reportTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where vehicle_location_id = #{vehicleLocationId}
</update>
<delete id="deleteTVehicleLocationInfoById" parameterType="Long">
delete from t_vehicle_location_info where vehicle_location_id = #{vehicleLocationId}
</delete>
<delete id="deleteTVehicleLocationInfoByIds" parameterType="String">
delete from t_vehicle_location_info where vehicle_location_id in
<foreach item="vehicleLocationId" collection="array" open="(" separator="," close=")">
#{vehicleLocationId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
gassafetyprogress-web/package.json
View file @ a79807b0
......@@ -46,6 +46,7 @@
"js-beautify": "1.13.0",
"js-cookie": "2.2.1",
"jsencrypt": "3.0.0-rc.1",
"moment": "^2.29.1",
"nprogress": "0.2.0",
"quill": "1.3.7",
"screenfull": "5.0.2",
......
gassafetyprogress-web/src/api/operationMonitor/vehicleInfo.js 0 → 100644
View file @ a79807b0
import request from '@/utils/request'
// 查询燃气车辆信息列表
export function listInfo(query) {
return request({
url: '/system/vehicleInfo/list',
method: 'get',
params: query
})
}
//获取车辆最终位置
export function getLastLocation(query){
return request({
url: '/system/vehicleInfo/getLastLocation',
method: 'get',
params: query
})
}
// 查询燃气车辆信息详细
export function getInfo(vehicleId) {
return request({
url: '/system/vehicleInfo/' + vehicleId,
method: 'get'
})
}
// 新增燃气车辆信息
export function addInfo(data) {
return request({
url: '/system/vehicleInfo',
method: 'post',
data: data
})
}
// 修改燃气车辆信息
export function updateInfo(data) {
return request({
url: '/system/vehicleInfo',
method: 'put',
data: data
})
}
// 删除燃气车辆信息
export function delInfo(vehicleId) {
return request({
url: '/system/vehicleInfo/' + vehicleId,
method: 'delete'
})
}
// 导出燃气车辆信息
export function exportInfo(query) {
return request({
url: '/system/vehicleInfo/export',
method: 'get',
params: query
})
}
gassafetyprogress-web/src/api/operationMonitor/vehicleLocationInfo.js 0 → 100644
View file @ a79807b0
import request from '@/utils/request'
// 查询燃气车辆位置信息列表
export function listInfo(query) {
return request({
url: '/system/vehicleLocationInfo/list',
method: 'get',
params: query
})
}
//获取车辆位置信息
export function getVehicleLocations(query){
return request({
url: '/system/vehicleLocationInfo/getVehicleLocations',
method: 'get',
params: query
})
}
// 查询燃气车辆位置信息详细
export function getInfo(vehicleLocationId) {
return request({
url: '/system/vehicleLocationInfo/' + vehicleLocationId,
method: 'get'
})
}
// 新增燃气车辆位置信息
export function addInfo(data) {
return request({
url: '/system/vehicleLocationInfo',
method: 'post',
data: data
})
}
// 修改燃气车辆位置信息
export function updateInfo(data) {
return request({
url: '/system/vehicleLocationInfo',
method: 'put',
data: data
})
}
// 删除燃气车辆位置信息
export function delInfo(vehicleLocationId) {
return request({
url: '/system/vehicleLocationInfo/' + vehicleLocationId,
method: 'delete'
})
}
// 导出燃气车辆位置信息
export function exportInfo(query) {
return request({
url: '/system/vehicleLocationInfo/export',
method: 'get',
params: query
})
}
gassafetyprogress-web/src/api/regulation/project.js 0 → 100644
View file @ a79807b0
import request from '@/utils/request'
// 查询工程项目信息列表
export function listInfo(query) {
return request({
url: '/project/info/list',
method: 'get',
params: query
})
}
// 查询工程项目信息详细
export function getInfo(projectId) {
return request({
url: '/project/info/' + projectId,
method: 'get'
})
}
// 新增工程项目信息
export function addInfo(data) {
return request({
url: '/project/info',
method: 'post',
data: data
})
}
// 修改工程项目信息
export function updateInfo(data) {
return request({
url: '/project/info',
method: 'put',
data: data
})
}
// 删除工程项目信息
export function delInfo(projectId) {
return request({
url: '/project/info/' + projectId,
method: 'delete'
})
}
// 导出工程项目信息
export function exportInfo(query) {
return request({
url: '/project/info/export',
method: 'get',
params: query
})
}
\ No newline at end of file
gassafetyprogress-web/src/assets/styles/all.scss
View file @ a79807b0
......@@ -613,7 +613,7 @@
// overflow-y: none !important;
}
}
// map里的label
......@@ -624,7 +624,7 @@
.amap-marker-label{
background-color: rgba(9, 18, 32, 0.6) !important;
color: #fff !important;
border:none !important;
border:none !important;
padding:10px;
}
.left {
......@@ -633,3 +633,11 @@
overflow-y: hidden !important;
}
}
//去除高德logo
.amap-logo{
display: none;
opacity:0 !important;
}
.amap-copyright {
opacity:0;
}
gassafetyprogress-web/src/assets/styles/gassVehiche.scss 0 → 100644
View file @ a79807b0
.gass-vehiche {
.el-table {
background-color: rgba(0, 0, 0, 0) !important;
.el-table__body {
width: 100% !important;
}
&::before {
height: 0px !important;
}
td {
border-bottom: none !important;
}
.el-table__header-wrapper,
.el-table__fixed-header-wrapper {
tr {
background-color: #213b52 !important;
}
th {
word-break: break-word;
background-color: #213b52 !important;
color: rgba(123, 248, 244, 1);
height: 30px;
font-size: 13px;
padding: 0;
&.is-leaf {
border-bottom: none;
}
}
}
.el-table__body-wrapper {
.el-table__row:nth-child(2n + 1) {
background-color: #213b52;
&:hover td {
background-color: #7bf8f430 !important;
}
td {
.cell {
// color: #525252;
color: rgba(123, 248, 244, 1);
}
}
}
.el-table__row:nth-child(2n) {
background-color:#063157 !important;
&:hover td {
background-color: #7bf8f430 !important;
}
td {
background-color: #213b52 !important;
.cell {
color: #fff;
}
}
}
}
.el-table__body-wrapper {
.el-button [class*="el-icon-"] + span {
// margin-left: 1px;
}
}
}
// 滚动条样式
.drawer{
::-webkit-scrollbar {
width: 10px;
background: #012a53;
position: absolute;
top: 0;
//display:none
}
::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
// border-radius: 10px;
// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
background: #cccccccc;
border-radius: 8px;
}
::-webkit-scrollbar-track {
/*滚动条里面轨道*/
// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
// border-radius: 10px;
// background-color: red;
}
::-webkit-scrollbar-button:start {
// overflow: hidden;
}
::-webkit-scrollbar-button:end {
// overflow: hidden;
}
}
.el-pagination {
button:disabled {
background-color: rgba(0, 0, 0, 0);
}
.el-pager li {
background-color: rgba(0, 0, 0, 0);
color: #fff;
cursor: pointer;
&.active {
color: #1890ff;
}
&:hover {
color: #7bf8f4;
}
}
.btn-prev,
.el-pagination .btn-next {
background-color: rgba(0, 0, 0, 0);
}
}
.el-pagination .btn-prev,
.el-pagination .btn-next {
background-color: rgba(0, 0, 0, 0);
}
// 禁用状态的左箭头
button[disabled] {
&:hover {
.el-icon-arrow-left,
.el-icon-arrow-right {
&::before {
color: #909399 !important;
}
}
}
.el-icon-arrow-left,
.el-icon-arrow-right {
&::before {
color: #909399;
}
}
}
button {
&:hover {
.el-icon-arrow-left,
.el-icon-arrow-right {
&::before {
color: #7bf8f4 !important;
}
}
}
}
// 平常状态下的
.el-icon-arrow-left,
.el-icon-arrow-right {
&::before {
color: #ffffff;
}
}
.el-pagination__jump {
color: #fff;
}
.el-input__inner {
background-color: rgba(0, 0, 0, 0);
border-color: #1890ff;
//color: #fff;
}
}
gassafetyprogress-web/src/components/bigWindow/User.vue
View file @ a79807b0
<!--
* @Author: your name
* @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-16 15:35:48
* @LastEditTime: 2022-03-17 09:05:30
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
......@@ -16,10 +16,10 @@
<img src="@/assets/mapImages/closeBtn.png" alt="" />
</div>
<div class="top flex">
<div class="top flex top-top">
<div class="group">
<div class="left">联系人：</div>
<div class="right zzz">{{ deviceData.nickName }}</div>
<div class="right zzz">{{ 1 }}</div>
</div>
<div class="group">
<div class="left">联系电话:</div>
......@@ -169,6 +169,11 @@ export default {
margin-bottom: 10px;
border: 1px solid #cccccc;
box-sizing: border-box;
&.top-top {
div{
width: 33%;
}
}
.group {
height: 30px;
flex: 1;
......@@ -184,6 +189,7 @@ export default {
color: #ffffff;
line-height: 30px;
padding: 0 5px;
&.last {
border-right: none;
}
......@@ -195,7 +201,7 @@ export default {
}
&.top-bottom {
.left {
flex:none;
flex: none;
width: 192px !important;
}
.right {
......
gassafetyprogress-web/src/components/bigWindow/leftBar.vue
View file @ a79807b0
......@@ -53,11 +53,21 @@
<div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
</div>
</div>
<div id="myCharttwo" :style="{width: '450px', height: '250px'}"></div>
<div class="titleTex">
<span :style="{color: '#00ffff'}"> ● 已完成:{{allNum.typeOne}}</span>
<span :style="{color: '#0099ff'}"> ● 未完成:{{allNum.typeTwo}}</span>
<div class="pieone">
<div id="myChartpieone" :style="{width: '225px', height: '250px'}"></div>
<div class="titleTex">
<span :style="{color: '#00ffff'}"> ● 已完成:{{allNum.typeOne}}</span>
<span :style="{color: '#0099ff'}"> ● 未完成:{{allNum.typeTwo}}</span>
</div>
</div>
<div class="pietwo">
<div id="myChartpietwo" :style="{width: '225px', height: '250px'}"></div>
<div class="titleTex">
<span :style="{color: '#00ffff'}"> ● 已完成:{{allNum.typeOne}}</span>
<span :style="{color: '#0099ff'}"> ● 未完成:{{allNum.typeTwo}}</span>
</div>
</div>
<!-- <div class="echarts-two" style="margin-top: 30px;width: 430px;margin-left: 10px;"> -->
......@@ -190,11 +200,12 @@
initdata(){
// 基于准备好的dom，初始化echarts实例
//console.log(data.renwu[0]+"=-=-=-"+data.renwu[1])
let myChart2 = this.$echarts.init(document.getElementById('myCharttwo'))
let pieone = this.$echarts.init(document.getElementById('myChartpieone'));
let pietwo = this.$echarts.init(document.getElementById('myChartpietwo'));
// 绘制图表
myChart2.setOption({
pieone.setOption({
title: {
text: '任务总数量:'+(this.allNum.typeOne+this.allNum.typeTwo),
text: '巡检任务完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
left: 'center',
top :20,
textStyle:{
......@@ -212,7 +223,83 @@
{
name: '任务概况',
type: 'pie',
radius: '60%',
radius: '55%',
center: ['50%','58%'],
data: [
{
value: this.allNum.typeTwo,
name: '未完成',
itemStyle: { color: '#09f' }
},
{
value: this.allNum.typeOne,
name: '已完成' ,
itemStyle: { color: '#00ffff' }
},
],
labelLine:{
length:20,
length2:50,
},
label:{
color:'#fff',
fontSize: 14,
// formatter:"{b}\n\n",
// padding:[0,-55],
normal: {
show: true,
position: 'outer',
// formatter: '{d}%, {c} \n\n',
//模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。
formatter: "{a_set|{b}}\n{b_set|{d}%}\n\n\n",
// formatter: "{a_set|{b}}\n{c_set|{d}%}\n{b|}\n\n",
borderWidth: 20,
borderRadius: 4,
padding: [0, -55],
rich: {
a_set: {
color: "#cddbe4",
lineHeight: 20,
align: "center",
padding: [55, -40, -15, -40],
},
b_set:{
color: "auto",
},
}
}
},
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}
]
});
pietwo.setOption({
title: {
text: '隐患整治完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
left: 'center',
top :20,
textStyle:{
color: "#00ffff"
}
},
grid: {
bottom: "7%",
containLabel: true,
},
tooltip: {
trigger: 'item',
},
series: [
{
name: '任务概况',
type: 'pie',
radius: '55%',
center: ['50%','58%'],
data: [
{
......@@ -511,4 +598,14 @@
align-items: center;
padding: 0px 30px;
}
.pieone{
width: 50%;
height: 50%;
float: left;
}
.pietwo{
width: 50%;
height: 50%;
float: right;
}
</style>
gassafetyprogress-web/src/components/bigWindow/rightBar.vue
View file @ a79807b0
......@@ -48,6 +48,37 @@
></div>
</div>
</div>
<div class="" style="padding: 0px 10px;">
<div class="yujingleft yujing" style="width: 33%;height: 90px;float: left;">
<div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
<img src="@/assets/mapinages/group786.png" alt="" style="width: 60px;height: 60px;" />
</div>
<div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
<p>设备预警</p>
<span>2</span>
</div>
</div>
<div class="yujingcenter yujing" style="width: 33%;height: 90px;float: left;">
<div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
<img src="@/assets/mapinages/group787.png" alt="" style="width: 60px;height: 60px;" />
</div>
<div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
<p>事件情况</p>
<span>2</span>
</div>
</div>
<div class="yujingright yujing" style="width: 33%;height: 90px;float: left;">
<div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
<img src="@/assets/mapinages/group788.png" alt="" style="width: 60px;height: 60px;" />
</div>
<div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
<p>隐患数量</p>
<span>2</span>
</div>
</div>
</div>
<div class="left">
<div
class="bottom right-bottom-data-left"
......@@ -325,7 +356,7 @@ export default {
changeTimer: false,
repeatFinshed: false,
tableHeight: 215,
tableHeight: 135,
tableData: [],
scrollHeight: 0,
};
......
gassafetyprogress-web/src/main.js
View file @ a79807b0
......@@ -17,6 +17,8 @@ import "@/assets/styles/index.scss"; // global css
import "@/assets/styles/zehong.scss"; // zehong css
import "./assets/css/font.css";
import "./assets/styles/all.scss";
//燃气车辆信息页面表格
import "./assets/styles/gassVehiche.scss";
import App from "./App";
import store from "./store";
......
gassafetyprogress-web/src/utils/mapClass/config.js
View file @ a79807b0
......@@ -31,7 +31,7 @@ export const svgUrl = {
6: require("@/assets/image/user1.svg"),
7: require("@/assets/image/zrxk.svg"),
8: require("@/assets/image/zcrq.svg"),
9: require("@/assets/mapImages/mark01.png"),
9: require("@/assets/image/car.png"),
10: require("@/assets/mapImages/mark02.png"),
11: require("@/assets/mapImages/mark03.png"),
12: require("@/assets/mapImages/mark04.png"),
......
gassafetyprogress-web/src/utils/mapClass/map.js
View file @ a79807b0
/*
* @Author: your name
* @Date: 2022-01-11 13:45:12
* @LastEditTime: 2022-03-16 15:06:43
* @LastEditTime: 2022-03-21 08:57:08
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/mapClass.js
......@@ -79,7 +79,7 @@ export class EditorMap {
// 获取朝阳区的边界信息
var bounds = result.districtList[0].boundaries;
var polygons = [];
console.log("boundsboundsboundsboundsbounds",bounds)
console.log("boundsboundsboundsboundsbounds", bounds);
if (bounds) {
for (var i = 0, l = bounds.length; i < l; i++) {
......@@ -97,7 +97,7 @@ export class EditorMap {
strokeWeight: 4,
strokeColor: "#09f",
path: bounds[i],
})
});
// polygons.push(polygon);
}
}
......@@ -409,6 +409,7 @@ export class EditorMap {
createMarker(MarkerOptions) {
return new AMap.Marker(MarkerOptions);
}
// 地图上add管道
addPipeLine(objData, component) {
const { path, pipePressure, iconType } = objData;
......@@ -672,4 +673,73 @@ export class EditorMap {
}
}
}
// 轨迹回放
/**
* @description:
* @param {*} vehicleId 设备id
* @param {*} path 轨迹回访率丼
* @return {*}
*/
backTrack(vehicleId, path) {
this.infowindowClose();
AMap.plugin("AMap.MoveAnimation", () => {
let marker = this.allDevice[9].filter(item => item.getExtData().vehicleId == vehicleId)[0];
// 绘制轨迹
marker.polyline = new AMap.Polyline({
map: this.map,
path,
showDir: true,
strokeColor: "#28F", //线颜色
// strokeOpacity: 1, //线透明度
strokeWeight: 6, //线宽
// strokeStyle: "solid" //线样式
});
marker.passedPolyline = new AMap.Polyline({
map: this.map,
strokeColor: "#AF5", //线颜色
strokeWeight: 6, //线宽
});
marker.on("moving", (e) => {
marker.passedPolyline.setPath(e.passedPath);
this.map.setCenter(e.target.getPosition(), true);
console.log(marker.passedPolyline)
});
marker.moveAlong(path , {
// 每一段的时长
duration: 8000,//可根据实际采集时间间隔设置
// JSAPI2.0 是否延道路自动设置角度在 moveAlong 里设置
autoRotation: true,
});
});
}
clearbackTrack(vehicleId) {
// let marker = this.allDevice[9].filter(
// (item) => item.getExtData().vehicleId == vehicleId
// )[0];
this.allDevice["9"]?.forEach(item=>{
if (item) {
// 停止运动
item.stopMove();
if(item.polyline){
this.map.remove(item.polyline);
}
if(item.passedPolyline){
this.map.remove(item.passedPolyline);
}
this.map.remove(item);
}
})
// 最后把数组清空
this.allDevice["9"]=[];
this.infowindowClose();
}
}
gassafetyprogress-web/src/views/operationMonitor/gassVehicle/component/MapCar.vue 0 → 100644
View file @ a79807b0
<template>
<div class="devicea-wrapper">
</div>
</template>
<script>
import moment from "moment";
export default {
data() {
return {
};
},
mounted() {
this.vueRoot.getCar(this.deviceData.carNum);
},
};
</script>
<style lang="scss" scoped>
</style>
gassafetyprogress-web/src/views/operationMonitor/gassVehicle/component/drawer.vue 0 → 100644
View file @ a79807b0
<template>
<div class="drawer">
<div :class="maskClass" @click="closeByMask"></div>
<div :class="mainClass" :style="mainStyle" class="main">
<div class="drawer-head">
<span>{{ title }}</span>
<span class="close-btn" v-show="closable" @click="closeByButton">X</span>
</div>
<div class="drawer-body">
<slot/>
</div>
<div class="switch" @click="display = !display">
<img v-if="display" src="@/assets/images/l.png" alt="" />
<img v-else src="@/assets/images/r.png" alt="" />
</div>
</div>
</div>
</template>
<script>
export default {
props: {
// 是否打开
/* display: {
type: Boolean
},*/
// 标题
title: {
type: String,
default: '标题'
},
// 是否显示关闭按钮
closable: {
type: Boolean,
default: true
},
// 是否显示遮罩
mask: {
type: Boolean,
default: true
},
// 是否点击遮罩关闭
maskClosable: {
type: Boolean,
default: true
},
// 宽度
width: {
type: String,
default: '400px'
},
// 是否在父级元素中打开
inner: {
type: Boolean,
default: false
}
},
data(){
return{
//抽屉是否收回
display: true
}
},
computed: {
maskClass: function () {
return {
'mask-show': (this.mask && this.display),
'mask-hide': !(this.mask && this.display),
'inner': this.inner
}
},
mainClass: function () {
return {
'main-show': this.display,
'main-hide': !this.display,
'inner': this.inner
}
},
mainStyle: function () {
return {
width: this.width,
left: this.display ? '0' : `-${+this.width.substr(0,this.width.length-2) + 20 }px`,
borderLeft: this.mask ? 'none' : '1px solid #eee'
}
}
},
mounted () {
this.display = true;
if (this.inner) {
let box = this.$el.parentNode
box.style.position = 'relative'
}
},
methods: {
closeByMask () {
this.maskClosable && this.$emit('update:display', false)
},
closeByButton () {
//this.$emit('update:display', false)
this.display = false;
}
}
}
</script>
<style lang="scss" scoped>
.drawer {
position: absolute;
top: 20px;
bottom:0;
z-index:99;
/* 遮罩 */
.mask-show {
position: fixed;
top: 0;
left: 0;
width: 100%;
z-index: 10;
background-color: rgba(0,0,0,.5);
opacity: 1;
transition: opacity .5s;
}
.mask-hide {
opacity: 0;
transition: opacity .5s;
}
/* 滑块 */
.main {
position: fixed;
z-index: 10;
top: 0;
height: 100%;
background: rgb(49 114 195 / 24%);
transition: all 0.5s;
}
.main-show {
opacity: 1;
}
.main-hide {
opacity: 1;
}
/* 某个元素内部显示 */
.inner {
position: absolute;
}
/* 其他样式 */
.drawer-head {
display: flex;
justify-content: space-between;
height: 45px;
line-height: 45px;
padding: 0 15px;
font-size: 15px;
font-weight: bold;
background: rgb(87 114 153 / 44%);
color: white;
/* border-bottom: 1px solid #eee;*/
.close-btn {
display: inline-block;
cursor: pointer;
height: 100%;
padding-left: 20px;
}
}
.drawer-body {
font-size: 14px;
padding: 15px;
padding-bottom:30px;
height: 100%;
width: 100%;
overflow-y: scroll;
overflow-x: scroll;
}
}
.switch {
position: absolute;
right: -35px;
top: 250px;
i {
background: #fff;
}
overflow: hidden;
cursor: pointer;
opacity: 1;
}
</style>
gassafetyprogress-web/src/views/regulation/project/index.vue 0 → 100644
View file @ a79807b0
This diff is collapsed.
gassafetyprogress-web/src/views/standingBook/equipment/index.vue
View file @ a79807b0
......@@ -422,11 +422,12 @@ export default {
this.options = response.data;
});
getEquipment(row.safeEquipmentId).then(response => {
this.form = response.data;
let data = response.data;
data.equipments = [];
this.form = data;
if(this.form.equipmentType){
this.form.equipments = this.form.equipmentType.split(",");
}
// this.form.equipments = ["1","2","3"];
this.open1 = true;
this.title1 = "修改用户加装安全装置台账";
});
......
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