Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 3e7b24fb authored by 高建强's avatar 高建强
Browse files
Options

item:修改view3d/info/detail接口业务

parent 5dcf07f3
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 56 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IEquipManageFeign.java
View file @ 3e7b24fb
......@@ -5,6 +5,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Map;
/**
* @author DELL
*/
......@@ -22,4 +24,10 @@ public interface IEquipManageFeign {
*/
@GetMapping(value = "/equip/building/getBuildingCodeKeyMap")
Object getBuildingCodeKey();
/**
* 通过instanceId获取实例部分信息
*/
@GetMapping(value = "/equip/building/getFormInstanceById")
Map<String, Object> findByInstanceId(@RequestParam(value ="instanceId") Long instanceId);
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java
View file @ 3e7b24fb
package com.yeejoin.amos.fas.business.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.fas.business.bo.FireEquipmentBo;
import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificIndexMapper;
import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
import com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper;
import com.yeejoin.amos.fas.business.feign.IEquipManageFeign;
import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.service.intfc.IFireEquipService;
import com.yeejoin.amos.fas.business.util.FireEquipmentType;
import com.yeejoin.amos.fas.business.vo.FireStationVo;
import com.yeejoin.amos.fas.common.enums.EquipClassifyEnum;
import com.yeejoin.amos.fas.core.common.request.CommonPageable;
import com.yeejoin.amos.fas.core.common.response.CommonPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service("fireEquipService")
public class FireEquipServiceImpl implements IFireEquipService {
/**
* 液位
*/
private final static String NAME_KEY = "liquidLevel";
@Autowired
FireEquipMapper fireEquipMapper;
@Autowired
ImpEquipMapper impEquipMapper;
// @Autowired
// IWaterResourceDao iWaterResourceDao;
//
// @Autowired
// IFireStationDao iFireStationDao;
@Autowired
EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
// public FireEquipment save(FireEquipment fireEquipment) {
// Long id = fireEquipment.getId();
// iFireEquipmentDao.save(fireEquipment);
// return fireEquipment;
// }
//
//
// public FireEquipment queryOne(Long id) {
// Optional<FireEquipment> fireEquipment1 = iFireEquipmentDao.findById(id);
// if (fireEquipment1.isPresent()) {
// return fireEquipment1.get();
// }
// return null;
// }
@Autowired
private IEquipManageFeign equipManageFeign;
public String[] delete(String[] idArray) throws Exception {
// for (String id : idArray) {
......@@ -95,7 +72,7 @@ public class FireEquipServiceImpl implements IFireEquipService {
@Override
public List<String> findFireEquipArea() {
return null;
return null;
// return iFireEquipmentDao.findFireEquipArea();
}
......@@ -143,43 +120,51 @@ public class FireEquipServiceImpl implements IFireEquipService {
Object returnEntity = null;
FireEquipmentType fireEquipmentType = FireEquipmentType.valueOf(type);
switch (fireEquipmentType)
{
// case pool:
// FireStation fireStation = fireEquipMapper.findFireStationById(id);
// fireStation.setType("2");
// fireStation.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
// returnEntity = fireStation;
// break;
switch (fireEquipmentType) {
case pool:
case fireFoamRoom:
Object obj = equipManageFeign.findByInstanceId(id).get("result");
if (obj != null) {
ObjectMapper objectMapper = new ObjectMapper();
FireStationVo fireStationVo = objectMapper.convertValue(obj, FireStationVo.class);
fireStationVo.setType("2");
fireStationVo.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
returnEntity = fireStationVo;
}
break;
// case fireFoamRoom:
// FireStation fireStation1 = fireEquipMapper.findFireStationById(id);
// fireStation1.setType("2");
// fireStation1.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
// returnEntity = fireStation1;
// break;
// case fireChamber:
// FireStation fireStation11 = fireEquipMapper.findFireStationById(id);
// fireStation11.setType("1");
// fireStation11.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
// returnEntity = fireStation11;
// break;
case fireChamber:
Object obj1 = equipManageFeign.findByInstanceId(id).get("result");
if (obj1 != null) {
ObjectMapper objectMapper = new ObjectMapper();
FireStationVo fireStationVo = objectMapper.convertValue(obj1, FireStationVo.class);
fireStationVo.setType("1");
fireStationVo.setFireEquipmentInfo(this.fireEquipMapper.queryStorageEquips(id));
returnEntity = fireStationVo;
}
break;
case extinguisher:
case hydrant:
case monitorEquipment:
FireEquipmentBo fireEquipment=fireEquipMapper.findFireEquipById(id);
FireEquipmentBo fireEquipment = fireEquipMapper.findFireEquipById(id);
fireEquipment.setEquipClassify(Integer.parseInt(EquipClassifyEnum.EQUIPMENT.getCode()));
returnEntity = fireEquipment;
break;
case video:
FireEquipmentBo fireVideo = fireEquipMapper.findVideoById(id);
FireEquipmentBo fireVideo = fireEquipMapper.findVideoById(id);
fireVideo.setEquipClassify(Integer.parseInt(EquipClassifyEnum.VIDEO.getCode()));
returnEntity = fireVideo;
break;
case fireDetection:
FireEquipmentBo fireDetection=fireEquipMapper.findFireEquipById(id);
fireDetection.setProtectObjNames(this.impEquipMapper.queryProtectObjNames(fireDetection.getId()));
FireEquipmentBo fireDetection = fireEquipMapper.findFireEquipById(id);
fireDetection.setProtectObjNames(this.impEquipMapper.queryProtectObjNames(fireDetection.getId()));
returnEntity = fireDetection;
break;
......@@ -196,7 +181,6 @@ public class FireEquipServiceImpl implements IFireEquipService {
// }
// @Override
// public Boolean isExistByCode(String code) {
// Optional<FireEquipment> optional = iFireEquipmentDao.findByCode(code);
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/FireStationVo.java 0 → 100644
View file @ 3e7b24fb
package com.yeejoin.amos.fas.business.vo;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @ProjectName: YeeAmosFireAutoSysRoot
* @Package: com.yeejoin.amos.fas.business.vo
* @ClassName: FireStationVo
* @Author: Jianqiang Gao
* @Description: FireStationVo
* @Date: 2021/5/18 11:45
* @Version: 1.0
*/
@Data
public class FireStationVo {
/**
* id
*/
private Long instanceId;
/**
* 名称
*/
private String name;
/**
* 编号
*/
private String code;
/**
* 类型 1：消防小室，2：消防泡沫间
*/
private String type;
/**
* 所属风险区域id
*/
private Long riskSourceId;
/**
* 位置
*/
private String address;
private List<Map> fireEquipmentInfo;
}
\ No newline at end of file
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