Skip to content

G
gassafety-progress
Commit 8df69ec2 authored by 王晓倩's avatar 王晓倩
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents d3fc6257 037d696b
Show whitespace changes
Inline Side-by-side
Showing with 251 additions and 88 deletions
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java
View file @ 8df69ec2
...@@ -78,8 +78,10 @@ public class TDeviceInfoController extends BaseController ...@@ -78,8 +78,10 @@ public class TDeviceInfoController extends BaseController
{ {
//添加设备信息表数据 并且返回新增id //添加设备信息表数据 并且返回新增id
tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo()); tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
if (!"null".equals(listaw.gettDeviceInfoS())){
//将关联设备信息与设备进行绑定 //将关联设备信息与设备进行绑定
tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId()); tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId());
}
TDeviceInfo tDeviceInfo = new TDeviceInfo(); TDeviceInfo tDeviceInfo = new TDeviceInfo();
//根据企业id查询企业名称 //根据企业id查询企业名称
String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tDeviceInfo.getBeyondEnterpriseId()); String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tDeviceInfo.getBeyondEnterpriseId());
...@@ -143,13 +145,22 @@ public class TDeviceInfoController extends BaseController ...@@ -143,13 +145,22 @@ public class TDeviceInfoController extends BaseController
} }
/** /**
* 关联设备批量数据删除接口 * 关联设备数据删除接口
*/ */
@RequestMapping("/deleteDetailInfo") @RequestMapping("/deleteDetailInfo")
public void deleteDetailInfo(@RequestBody int deviceId){ public void deleteDetailInfo(@RequestBody int deviceId){
tDeviceInfoService.deleteDetailinfOS(deviceId); tDeviceInfoService.deleteDetailinfOS(deviceId);
} }
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
@RequestMapping("/deleteDeviceDetailInfo")
public void deleteDeviceDetailInfo(@RequestBody int deviceId){
tDeviceInfoService.deleteDeviceDetailInfo(deviceId);
}
/** /**
* 关联设备批量数据删除接口 * 关联设备批量数据删除接口
* @param deviceId * @param deviceId
...@@ -158,4 +169,29 @@ public class TDeviceInfoController extends BaseController ...@@ -158,4 +169,29 @@ public class TDeviceInfoController extends BaseController
public void deleteeListDetailInfo(@RequestBody Long[] deviceId){ public void deleteeListDetailInfo(@RequestBody Long[] deviceId){
tDeviceInfoService.deleteDetailInfo(deviceId); tDeviceInfoService.deleteDetailInfo(deviceId);
} }
/**
* 查询设备已经关联的关联设备接口
* @param id
* @return
*/
@RequestMapping("/selectDetailInfoList")
public TableDataInfo selectDetailInfoList(@RequestBody int id){
List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoService.selectDetailInfoList(id);
return getDataTable(tDeviceInfoS);
}
/**
* 关联设备绑定接口
* @param listaw
*/
@RequestMapping("/updateDetailInfoList")
public void updateDetailInfoList(@RequestBody Listaw listaw){
if (!"null".equals(listaw.gettDeviceInfoS())){
//将关联设备信息与设备进行绑定
tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId());
}
}
} }
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java
View file @ 8df69ec2
...@@ -38,7 +38,7 @@ public class TDeviceInfo extends BaseEntity ...@@ -38,7 +38,7 @@ public class TDeviceInfo extends BaseEntity
private String deviceModel; private String deviceModel;
/** 设备类型：1.阀井 2.调压箱 3.巡检员 4.视频 */ /** 设备类型：1.阀井 2.调压箱 3.巡检员 4.视频 */
@Excel(name = "设备类型：1.阀井 2.调压箱 3.巡检员 4.视频") @Excel(name = "设备类型")
private String deviceType; private String deviceType;
/** 权属单位 */ /** 权属单位 */
...@@ -49,18 +49,22 @@ public class TDeviceInfo extends BaseEntity ...@@ -49,18 +49,22 @@ public class TDeviceInfo extends BaseEntity
private String beyondEnterpriseName; private String beyondEnterpriseName;
/** 经度 */ /** 经度 */
private BigDecimal longitude; @Excel(name = "经度")
private String longitude;
/** 纬度 */ /** 纬度 */
private BigDecimal latitude; @Excel(name = "纬度")
private String latitude;
/** 设备图片路径 */ /** 设备图片路径 */
private String iconUrl; private String iconUrl;
/** 联系人 */ /** 联系人 */
@Excel(name = "联系人")
private String linkman; private String linkman;
/** 电话 */ /** 电话 */
@Excel(name = "电话")
private String phone; private String phone;
/** 安装时间 */ /** 安装时间 */
...@@ -149,24 +153,27 @@ public class TDeviceInfo extends BaseEntity ...@@ -149,24 +153,27 @@ public class TDeviceInfo extends BaseEntity
{ {
return beyondEnterpriseName; return beyondEnterpriseName;
} }
public void setLongitude(BigDecimal longitude)
{ public static long getSerialVersionUID() {
this.longitude = longitude; return serialVersionUID;
} }
public BigDecimal getLongitude() public String getLongitude() {
{
return longitude; return longitude;
} }
public void setLatitude(BigDecimal latitude)
{ public void setLongitude(String longitude) {
this.latitude = latitude; this.longitude = longitude;
} }
public BigDecimal getLatitude() public String getLatitude() {
{
return latitude; return latitude;
} }
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public void setIconUrl(String iconUrl) public void setIconUrl(String iconUrl)
{ {
this.iconUrl = iconUrl; this.iconUrl = iconUrl;
......
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDeviceInfoMapper.java
View file @ 8df69ec2
...@@ -97,4 +97,17 @@ public interface TDeviceInfoMapper ...@@ -97,4 +97,17 @@ public interface TDeviceInfoMapper
* @param gettDeviceInfoS * @param gettDeviceInfoS
*/ */
void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id); void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
/**
* 查询设备已经关联的关联设备
* @param id
* @return
*/
List<TDeviceInfoS> selectDetailInfoList(int id);
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
void deleteDeviceDetailInfo(int deviceId);
} }
gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDeviceInfoService.java
View file @ 8df69ec2
...@@ -97,4 +97,17 @@ public interface ITDeviceInfoService ...@@ -97,4 +97,17 @@ public interface ITDeviceInfoService
* @param gettDeviceInfoS * @param gettDeviceInfoS
*/ */
void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id); void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
/**
* 查询设备已经关联的关联设备
* @param id
* @return
*/
List<TDeviceInfoS> selectDetailInfoList(int id);
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
void deleteDeviceDetailInfo(int deviceId);
} }
gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java
View file @ 8df69ec2
...@@ -152,4 +152,24 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService ...@@ -152,4 +152,24 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
public void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id) { public void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id) {
tDeviceInfoMapper.updatetRelationDeviceDetailInfo(gettDeviceInfoS,id); tDeviceInfoMapper.updatetRelationDeviceDetailInfo(gettDeviceInfoS,id);
} }
/**
* 查询设备已经关联的关联设备
* @param id
* @return
*/
@Override
public List<TDeviceInfoS> selectDetailInfoList(int id) {
List<TDeviceInfoS> tDeviceInfoS = tDeviceInfoMapper.selectDetailInfoList(id);
return tDeviceInfoS;
}
/**
* 解绑 设备与关联设备关系
* @param deviceId
*/
@Override
public void deleteDeviceDetailInfo(int deviceId) {
tDeviceInfoMapper.deleteDeviceDetailInfo(deviceId);
}
} }
gassafetyprogress-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml
View file @ 8df69ec2
...@@ -173,6 +173,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -173,6 +173,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by relation_device_detail_id desc group by relation_device_detail_id desc
</select> </select>
<!--查询设备已经关联的关联设备-->
<select id="selectDetailInfoList" resultMap="TDeviceInfoResultS">
select relation_device_detail_id,relation_device_id,device_name,device_model,iot_no,remarks, (CASE device_type WHEN '1' THEN '压力表' WHEN '2' THEN '流量计' end) as device_type
from t_relation_device_detail_info where relation_device_id=#{id}
</select>
<!--关联设备数据删除接口--> <!--关联设备数据删除接口-->
<update id="deleteDetailInfo"> <update id="deleteDetailInfo">
update t_relation_device_detail_info set is_del='1' where relation_device_detail_id in update t_relation_device_detail_info set is_del='1' where relation_device_detail_id in
...@@ -197,4 +203,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -197,4 +203,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</update> </update>
<!--解绑 设备与关联设备关系-->
<update id="deleteDeviceDetailInfo">
update t_relation_device_detail_info set relation_device_id='0' where relation_device_detail_id=#{deviceId}
</update>
</mapper> </mapper>
gassafetyprogress-web/src/api/regulation/device.js
View file @ 8df69ec2
...@@ -87,6 +87,17 @@ export function addDetailInfos(data) { ...@@ -87,6 +87,17 @@ export function addDetailInfos(data) {
}) })
} }
// 解除 设备与关联设备信息
export function deleteDeviceDetailInfo(deviceId) {
return request({
url: '/device/device/deleteDeviceDetailInfo',
method: 'delete',
data:deviceId
})
}
// 删除关联设备信息 // 删除关联设备信息
export function deleteeListDetailInfo(deviceId) { export function deleteeListDetailInfo(deviceId) {
return request({ return request({
...@@ -96,4 +107,20 @@ export function deleteeListDetailInfo(deviceId) { ...@@ -96,4 +107,20 @@ export function deleteeListDetailInfo(deviceId) {
}) })
} }
//查询已经关联的关联设备信息
export function selectDetailInfoList(data){
return request({
url: '/device/device/selectDetailInfoList',
method: 'post',
data: data
})
}
// 新增设备信息
export function updateDetailInfoLists(data) {
return request({
url: '/device/device/updateDetailInfoList',
method: 'post',
data: data
})
}
gassafetyprogress-web/src/views/regulation/device/index.vue
View file @ 8df69ec2
...@@ -193,17 +193,17 @@ ...@@ -193,17 +193,17 @@
v-hasPermi="['device:device:remove']" v-hasPermi="['device:device:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
:loading="exportLoading" <!-- :loading="exportLoading"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['device:device:export']" <!-- v-hasPermi="['device:device:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getDataList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getDataList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loadings" ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" max-height="250" @selection-change="tableDataSelectionChange"> <el-table v-loading="loadings" ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" max-height="250" @selection-change="tableDataSelectionChange">
...@@ -337,13 +337,13 @@ ...@@ -337,13 +337,13 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="经度" prop="longitude"> <el-form-item label="经度" prop="longitude">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.longitude" placeholder="请输入经度" /> <el-input v-model="form.longitude" placeholder="请输入经度" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="纬度" prop="latitude"> <el-form-item label="纬度" prop="latitude">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.latitude" placeholder="请输入纬度" /> <el-input v-model="form.latitude" placeholder="请输入纬度" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
<script> <script>
import { listDevice, getDevice, delDevice, addDevice, updateDevice, exportDevice, selectTEnterprise,getDdeviceDetailInfo,addDetailInfos,deleteDetailInfo,deleteeListDetailInfo } from "@/api/regulation/device"; import { listDevice, getDevice, delDevice, addDevice, updateDevice, exportDevice, selectTEnterprise,getDdeviceDetailInfo,addDetailInfos,deleteDetailInfo,deleteeListDetailInfo,selectDetailInfoList,deleteDeviceDetailInfo,updateDetailInfoLists} from "@/api/regulation/device";
export default { export default {
name: "Device", name: "Device",
...@@ -631,7 +631,6 @@ export default { ...@@ -631,7 +631,6 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
...@@ -674,6 +673,8 @@ export default { ...@@ -674,6 +673,8 @@ export default {
selectTEnterprise().then(response => { selectTEnterprise().then(response => {
this.test = response.data; this.test = response.data;
}); });
//清空关联设备数据
this.DetailInfoList=''
this.loadings = true; this.loadings = true;
//查询下级设备数据 //查询下级设备数据
getDdeviceDetailInfo(this.dateQueryParams).then(response => { getDdeviceDetailInfo(this.dateQueryParams).then(response => {
...@@ -694,10 +695,13 @@ export default { ...@@ -694,10 +695,13 @@ export default {
this.test = response.data; this.test = response.data;
}); });
const deviceId = row.deviceId || this.ids const deviceId = row.deviceId || this.ids
//查询关联设备信息数据 //查询关联设备信息数据
// getDdeviceDetailInfo(deviceId).then(response => { selectDetailInfoList(deviceId).then(response => {
// this.dynamicValidateForm.domains = response.data; this.DetailInfoList = response.rows;
// }); this.loadings = false;
});
this.reset(); this.reset();
getDevice(deviceId).then(response => { getDevice(deviceId).then(response => {
...@@ -736,7 +740,6 @@ export default { ...@@ -736,7 +740,6 @@ export default {
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => {});
}, },
/**动态添加输入框方法*/ /**动态添加输入框方法*/
addDomain() { addDomain() {
this.dynamicValidateForm.domains.push({ this.dynamicValidateForm.domains.push({
...@@ -764,7 +767,19 @@ export default { ...@@ -764,7 +767,19 @@ export default {
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
if ( this.datalist !=null){
var tDeviceInfon={
tDeviceInfo:this.form,
tDeviceInfoS:this.datalist
}
//重新绑定修改后的关联设备
updateDetailInfoLists(JSON.stringify(tDeviceInfon)).then(response => {
this.open = false;
this.getList();
});
}
} else { } else {
alert("走的新增")
if (valid) { if (valid) {
//获取已经选中的下级设备id //获取已经选中的下级设备id
const deviceIds = this.ids; const deviceIds = this.ids;
...@@ -811,7 +826,6 @@ export default { ...@@ -811,7 +826,6 @@ export default {
}); });
}, },
/**关联设备单条删除方法*/ /**关联设备单条删除方法*/
deleteDetailInfo(row){ deleteDetailInfo(row){
const deviceIds = row.relationDeviceDetailId; const deviceIds = row.relationDeviceDetailId;
...@@ -829,7 +843,18 @@ export default { ...@@ -829,7 +843,18 @@ export default {
}, },
/**关联设备已经选中数据删除方法*/ /**关联设备已经选中数据删除方法*/
deleteDataListilInfo(row,index){ deleteDataListilInfo(row,index){
const deviceIds = row.relationDeviceDetailId;
//判断form表单是否有id来验证是修改的删除还是添加的删除
if (this.form.deviceId != null) {
deleteDeviceDetailInfo(deviceIds).then(response => {
this.msgSuccess("删除成功");
this.DetailInfoList.splice(index,1); this.DetailInfoList.splice(index,1);
});
}else {
this.DetailInfoList.splice(index,1);
this.msgSuccess("删除成功");
}
}, },
/** /**
* 批量删除关联设备方法 * 批量删除关联设备方法
...@@ -860,6 +885,16 @@ export default { ...@@ -860,6 +885,16 @@ export default {
}).then(function() { }).then(function() {
}).then(() => { }).then(() => {
if (this.form.deviceId != null) {
//修改
this.DetailInfoList=this.DetailInfoList.concat(this.datalist)
//添加到数组中 以便下次使用
this.DetailInfoListId.push(deviceIds);
// alert(this.DetailInfoListId)
this.dialogTableVisible=false
this.msgSuccess("添加成功");
}else {
//添加
// this.DetailInfoList.push(this.datalist) // this.DetailInfoList.push(this.datalist)
//清空数组数据 将之前的数据清空 //清空数组数据 将之前的数据清空
this.DetailInfoListId.splice(row); this.DetailInfoListId.splice(row);
...@@ -869,6 +904,7 @@ export default { ...@@ -869,6 +904,7 @@ export default {
// alert(this.DetailInfoListId) // alert(this.DetailInfoListId)
this.dialogTableVisible=false this.dialogTableVisible=false
this.msgSuccess("添加成功"); this.msgSuccess("添加成功");
}
}).catch(() => {}); }).catch(() => {});
}, },
/** /**
......
gassafetyprogress-web/src/views/system/eventInfo/index.vue
View file @ 8df69ec2
...@@ -476,7 +476,7 @@ export default { ...@@ -476,7 +476,7 @@ export default {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改事件处置"; this.title = "修改事件处置";
if(row.iconUrl!=null){ if(this.form.iconUrl!=null){
this.fileList = [{name: '附件', url: uploadfile}]; this.fileList = [{name: '附件', url: uploadfile}];
} }
this.display=""; this.display="";
......
gassafetyprogress-web/src/views/system/planInfo/index.vue
View file @ 8df69ec2
...@@ -456,7 +456,7 @@ export default { ...@@ -456,7 +456,7 @@ export default {
this.form = response.data; this.form = response.data;
this.title = "应急预案详情"; this.title = "应急预案详情";
this.fileList = [{name: 'file', url:uploadfile}]; this.fileList = [{name: '附件', url:uploadfile}];
this.fileurl = row.iconUrl; this.fileurl = row.iconUrl;
document.getElementById("yesbutton").style.display="none" ; document.getElementById("yesbutton").style.display="none" ;
document.getElementById("fujian").style.display="none" document.getElementById("fujian").style.display="none"
...@@ -473,7 +473,7 @@ export default { ...@@ -473,7 +473,7 @@ export default {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改应急预案"; this.title = "修改应急预案";
if(row.iconUrl!=null||row.iconUrl==""){ if(this.form.iconUrl!=null||this.form.iconUrl==""){
this.fileList = [{name: 'file', url:uploadfile}]; this.fileList = [{name: 'file', url:uploadfile}];
this.$nextTick(()=>{ this.$nextTick(()=>{
document.getElementsByClassName("el-upload--picture-card")[0].style.display="none" document.getElementsByClassName("el-upload--picture-card")[0].style.display="none"
......
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