Commit 32a014fc authored by 吴俊凯's avatar 吴俊凯

三维接口SQL修改

parent 0f8335d7
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author wjk
*/
public enum EquipClassifyEnum {
EQUIPMENT("设备类","0"),
CONSUMABLES("耗材类;","1"),
VIDEO("视频监控", "2"),
FIRE_FIGHTING("灭火器材", "3");
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private String code;
private EquipClassifyEnum(String name, String code){
this.name = name;
this.code = code;
}
public static EquipClassifyEnum getEnum(String code) {
EquipClassifyEnum checkStatusEnum = null;
for(EquipClassifyEnum type: EquipClassifyEnum.values()) {
if (type.getCode().equals(code)) {
checkStatusEnum = type;
break;
}
}
return checkStatusEnum;
}
public static List<Map<String,String>> getEnumList() {
List<Map<String,String>> nameList = new ArrayList<>();
for (EquipClassifyEnum c: EquipClassifyEnum.values()) {
Map<String, String> map = new HashMap<String, String>();
map.put("name", c.getName());
map.put("code", c.getCode());
nameList.add(map);
}
return nameList;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
...@@ -5,6 +5,7 @@ import com.yeejoin.amos.fas.business.param.CommonPageInfoParam; ...@@ -5,6 +5,7 @@ import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.param.FireEquipmentParam; import com.yeejoin.amos.fas.business.param.FireEquipmentParam;
import com.yeejoin.amos.fas.business.vo.EquipCommunicationData; import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse; import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse;
import com.yeejoin.amos.fas.dao.entity.FireEquipment;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.HashMap; import java.util.HashMap;
...@@ -78,6 +79,10 @@ public interface FireEquipMapper extends BaseMapper { ...@@ -78,6 +79,10 @@ public interface FireEquipMapper extends BaseMapper {
@Param("fname") String fname); @Param("fname") String fname);
FireEquipmentEntity findById(@Param("id") Long id); FireEquipmentEntity findById(@Param("id") Long id);
Long removeIfmeaPointByFireEquipIdAndEquipId(@Param("fireEquipmentId") Long fireEquipmentId,@Param("importantEquipmentId") Long importantEquipmentId); Long removeIfmeaPointByFireEquipIdAndEquipId(@Param("fireEquipmentId") Long fireEquipmentId,@Param("importantEquipmentId") Long importantEquipmentId);
FireEquipment findFireEquipById (@Param("id") Long id);
FireEquipment findVideoById (@Param("id") Long id);
} }
...@@ -5,14 +5,17 @@ import com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper; ...@@ -5,14 +5,17 @@ import com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper;
import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao; import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
import com.yeejoin.amos.fas.business.dao.repository.IFireStationDao; import com.yeejoin.amos.fas.business.dao.repository.IFireStationDao;
import com.yeejoin.amos.fas.business.dao.repository.IWaterResourceDao; import com.yeejoin.amos.fas.business.dao.repository.IWaterResourceDao;
import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity;
import com.yeejoin.amos.fas.business.param.CommonPageInfoParam; import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.service.intfc.IFireEquipService; import com.yeejoin.amos.fas.business.service.intfc.IFireEquipService;
import com.yeejoin.amos.fas.business.util.FireEquipmentType; import com.yeejoin.amos.fas.business.util.FireEquipmentType;
import com.yeejoin.amos.fas.common.enums.EquipClassifyEnum;
import com.yeejoin.amos.fas.core.common.request.CommonPageable; import com.yeejoin.amos.fas.core.common.request.CommonPageable;
import com.yeejoin.amos.fas.core.common.response.CommonPage; import com.yeejoin.amos.fas.core.common.response.CommonPage;
import com.yeejoin.amos.fas.dao.entity.FireEquipment; import com.yeejoin.amos.fas.dao.entity.FireEquipment;
import com.yeejoin.amos.fas.dao.entity.FireStation; import com.yeejoin.amos.fas.dao.entity.FireStation;
import com.yeejoin.amos.fas.dao.entity.WaterResource; import com.yeejoin.amos.fas.dao.entity.WaterResource;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
...@@ -63,7 +66,7 @@ public class FireEquipServiceImpl implements IFireEquipService { ...@@ -63,7 +66,7 @@ public class FireEquipServiceImpl implements IFireEquipService {
if(fireEquipment1.isPresent()){ if(fireEquipment1.isPresent()){
fireEquipment= fireEquipment1.get(); fireEquipment= fireEquipment1.get();
} }
if (fireEquipment != null) { if (fireEquipment != null) {
this.iFireEquipmentDao.deleteById(Long.parseLong(id)); this.iFireEquipmentDao.deleteById(Long.parseLong(id));
} else { } else {
...@@ -149,8 +152,8 @@ public class FireEquipServiceImpl implements IFireEquipService { ...@@ -149,8 +152,8 @@ public class FireEquipServiceImpl implements IFireEquipService {
if(waterResource.isPresent()){ if(waterResource.isPresent()){
returnEntity = waterResource.get(); returnEntity = waterResource.get();
} }
break; break;
case fireFoamRoom: case fireFoamRoom:
case fireChamber: case fireChamber:
...@@ -163,16 +166,17 @@ public class FireEquipServiceImpl implements IFireEquipService { ...@@ -163,16 +166,17 @@ public class FireEquipServiceImpl implements IFireEquipService {
returnEntity = fireStation; returnEntity = fireStation;
break; break;
case extinguisher: case extinguisher:
case video:
case monitorEquipment: case monitorEquipment:
Optional<FireEquipment> fireEquipment1 = this.iFireEquipmentDao.findById(id); FireEquipment fireEquipment=fireEquipMapper.findFireEquipById(id);
FireEquipment fireEquipment=null; fireEquipment.setEquipClassify(Integer.parseInt(EquipClassifyEnum.EQUIPMENT.getCode()));
if(fireEquipment1.isPresent()){
fireEquipment=fireEquipment1.get();
}
fireEquipment.setProtectObjNames(this.impEquipMapper.queryProtectObjNames(fireEquipment.getId()));
returnEntity = fireEquipment; returnEntity = fireEquipment;
break; break;
case video:
FireEquipment fireVideo = fireEquipMapper.findVideoById(id);
fireVideo.setEquipClassify(Integer.parseInt(EquipClassifyEnum.VIDEO.getCode()));
returnEntity = fireVideo;
break;
case fireDetection: case fireDetection:
Optional<FireEquipment> fireDetection1 = this.iFireEquipmentDao.findById(id); Optional<FireEquipment> fireDetection1 = this.iFireEquipmentDao.findById(id);
FireEquipment fireDetection=null; FireEquipment fireDetection=null;
......
...@@ -487,4 +487,92 @@ ...@@ -487,4 +487,92 @@
LEFT JOIN wl_equipment_specific_index esi ON esi.id = fmep.equipment_point_id LEFT JOIN wl_equipment_specific_index esi ON esi.id = fmep.equipment_point_id
WHERE esi.equipment_specific_id = #{fireEquipmentId} AND fmep.important_equipment_id = #{importantEquipmentId} WHERE esi.equipment_specific_id = #{fireEquipmentId} AND fmep.important_equipment_id = #{importantEquipmentId}
</select> </select>
<select id="findFireEquipById" resultType="com.yeejoin.amos.fas.dao.entity.FireEquipment">
SELECT
spec.id AS id,
spec.org_code AS org_code,
spec.CODE AS CODE,
detail.code AS equip_code,
detail.NAME AS NAME,
detail.standard AS model,
detail.maintenance_cycle AS maintenance_cycle,
manufatcturer.NAME AS manufatcturer,
detail.brand AS detail,
detail.production_date AS production_date,
-- detail.expiry_date AS effective_date,
sd.amount as number,
unit.name as unit,
detail.remark,
detail.creator_id AS create_by,
spec.create_date AS create_date,
'1' equip_status,
detail.video AS video_url,
warehouse.source_id AS risk_source_id,
'' AS position3d,
'' AS floor3d,
'' AS is_indoor,
'' AS room,
(
SELECT
GROUP_CONCAT( fe.NAME )
FROM
f_equipment_fire_equipment ffe
LEFT JOIN f_equipment fe ON fe.id = ffe.equipment_id
WHERE
ffe.fire_equipment_id = spec.id
) protectObjNames
FROM
wl_equipment_specific spec
LEFT JOIN wl_equipment_detail detail ON detail.id = spec.equipment_detail_id
LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = spec.id
LEFT JOIN wl_manufacturer_info manufatcturer ON manufatcturer.id = detail.manufacturer_id
LEFT JOIN wl_equipment equipment ON equipment.id = detail.equipment_id
LEFT JOIN wl_unit unit ON equipment.unit_id = unit.id
LEFT JOIN wl_warehouse_structure warehouse ON warehouse.id = sd.warehouse_structure_id
WHERE
<if test="id != null">
spec.id = #{id}
</if>
</select>
<select id="findVideoById" resultType="com.yeejoin.amos.fas.dao.entity.FireEquipment">
SELECT
video.id AS id,
video.org_code AS org_code,
video.CODE AS CODE,
video.CODE AS equip_code,
video.NAME AS NAME,
'' AS model,
'' AS maintenance_cycle,
'' AS manufatcturer,
'' AS detail,
video.create_date AS production_date,
'' AS number,
'' AS unit,
video.position3d AS position3d,
'' AS floor3d,
'' AS is_indoor,
'' AS room,
video.remark,
video.creator_id AS create_by,
video.create_date AS create_date,
'1' equip_status,
video.url AS video_url,
source.source_id AS risk_source_id,
(
SELECT
GROUP_CONCAT( fe.NAME )
FROM
wl_video_important_equipment ffe
LEFT JOIN f_equipment fe ON fe.id = ffe.important_equipment_id
WHERE
ffe.video_id = video.id
) protectObjNames
FROM wl_video video
LEFT JOIN wl_video_source source ON source.id =video.id
WHERE
<if test="id != null">
video.id = #{id}
</if>
</select>
</mapper> </mapper>
\ 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