注释FireEquipment相关代码

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/bo/FireEquipmentBo.java

+package com.yeejoin.amos.fas.business.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+
+
+/**
+ * The persistent class for the fire_equipment database table.
+ * 
+ */
+@Data
+public class FireEquipmentBo  {
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * id
+	 */
+	private long id;
+
+	private Date createDate;
+
+	private String brand;
+
+	private String code;
+	
+	/**
+	 * 3维坐标
+	 */
+	private String position3d;
+	
+	/**
+	 * 3维楼层
+	 */
+	private String floor3d;
+
+	/**
+	 * 是否室内 0-否 1-是
+	 */
+	private Boolean isIndoor;
+
+	private String createBy;
+
+	private Date effectiveDate;
+
+	private int maintenanceCycle;
+	
+	/**
+	 * 装备分类：0-设备类；1-耗材类
+	 */
+	private int equipClassify;
+
+	private String manufacturer;
+
+	private String model;
+
+	private String name;
+
+	private int number;
+
+	private String orgCode;
+
+	private String productionArea;
+
+	private Date productionDate;
+
+	private String remark;
+
+	private String room;
+	
+	/**
+	 * 装备编码
+	 */
+	private String equipCode;
+	
+	/**
+	 * 装备类型
+	 */
+	private String equipType;
+	
+	/**
+	 * 监测设备状态
+	 */
+	private Integer equipStatus;
+
+
+	private String unit;
+
+
+	private String protectObjNames;
+	
+	/**
+	 * 重量
+	 */
+	private BigDecimal weight;
+	
+	/**
+	 * 动作状态
+	 */
+	private String actionState;
+	
+	/**
+	 * 喷发状态
+	 */
+	private String eruptionState;
+	
+	/**
+	 * 所属风险区域id
+	 */
+	private Long riskSourceId;
+
+	/**
+	 * ue4位置
+	 */
+	private String ue4Location;
+
+	/**
+	 * ue4旋转
+	 */
+	private String ue4Rotation;
+
+	
+}
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java

@@ -12,7 +12,6 @@ import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,44 +42,44 @@ public class FireSourceController extends BaseController {
     private IEquipmentService iEquipService;
     private final Logger log = LoggerFactory.getLogger(FireSourceController.class);
 
-    @Permission
-    @ApiOperation(httpMethod = "POST", value = "添加消防装备", notes = "添加消防装备")
-    @RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse create(@RequestBody FireEquipment fireEquipment) throws Exception {
-    	
-    	if(fireEquipment.getId() == 0l) {//新增
-    		Boolean existByCode = iFireEquipService.isExistByCode(fireEquipment.getCode());
-    		if(existByCode){
-    			return CommonResponseUtil.failure("设备编号重复，请重试！");
-    		}
-    	}
-        ReginParams reginParams = getSelectedOrgInfo();
-        String compCode = getOrgCode(reginParams);
-        fireEquipment.setCreateBy(getUserId());
-        fireEquipment.setCreateDate(new Date());
-        fireEquipment.setOrgCode(compCode);
-        
-        //设备状态默认为正常
-        fireEquipment.setEquipStatus(0);
-        
-        
-        return CommonResponseUtil.success(iFireEquipService.save(fireEquipment));
-    }
-
-    @Permission
-    @ApiOperation(httpMethod = "PUT", value = "编辑消防装备", notes = "编辑消防装备")
-    @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
-    public CommonResponse udpate(@PathVariable Long id, @RequestBody FireEquipment fireEquipment) {
-        fireEquipment.setId(id);
-        return CommonResponseUtil.success(iFireEquipService.save(fireEquipment));
-    }
-
-    @Permission
-    @ApiOperation(httpMethod = "GET", value = "查询单个消防装备", notes = "查询单个消防装备")
-    @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse query(@PathVariable Long id) {
-        return CommonResponseUtil.success(iFireEquipService.queryOne(id));
-    }
+//    @Permission
+//    @ApiOperation(httpMethod = "POST", value = "添加消防装备", notes = "添加消防装备")
+//    @RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+//    public CommonResponse create(@RequestBody FireEquipment fireEquipment) throws Exception {
+//    	
+//    	if(fireEquipment.getId() == 0l) {//新增
+//    		Boolean existByCode = iFireEquipService.isExistByCode(fireEquipment.getCode());
+//    		if(existByCode){
+//    			return CommonResponseUtil.failure("设备编号重复，请重试！");
+//    		}
+//    	}
+//        ReginParams reginParams = getSelectedOrgInfo();
+//        String compCode = getOrgCode(reginParams);
+//        fireEquipment.setCreateBy(getUserId());
+//        fireEquipment.setCreateDate(new Date());
+//        fireEquipment.setOrgCode(compCode);
+//        
+//        //设备状态默认为正常
+//        fireEquipment.setEquipStatus(0);
+//        
+//        
+//        return CommonResponseUtil.success(iFireEquipService.save(fireEquipment));
+//    }
+
+//    @Permission
+//    @ApiOperation(httpMethod = "PUT", value = "编辑消防装备", notes = "编辑消防装备")
+//    @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
+//    public CommonResponse udpate(@PathVariable Long id, @RequestBody FireEquipment fireEquipment) {
+//        fireEquipment.setId(id);
+//        return CommonResponseUtil.success(iFireEquipService.save(fireEquipment));
+//    }
+
+//    @Permission
+//    @ApiOperation(httpMethod = "GET", value = "查询单个消防装备", notes = "查询单个消防装备")
+//    @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+//    public CommonResponse query(@PathVariable Long id) {
+//        return CommonResponseUtil.success(iFireEquipService.queryOne(id));
+//    }
 
     @Permission
     @ApiOperation(httpMethod = "DELETE", value = "删除消防装备", notes = "查询单个消防装备")

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireEquipMapper.java

 package com.yeejoin.amos.fas.business.dao.mapper;
 
+import com.yeejoin.amos.fas.business.bo.FireEquipmentBo;
 import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.param.FireEquipmentParam;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireStation;
 
 import org.apache.ibatis.annotations.Param;
@@ -86,9 +86,9 @@ public interface FireEquipMapper extends BaseMapper {
 
     Long removeIfmeaPointByFireEquipIdAndEquipId(@Param("fireEquipmentId") Long fireEquipmentId,@Param("importantEquipmentId") Long importantEquipmentId);
 
-    FireEquipment findFireEquipById (@Param("id") Long id);
+    FireEquipmentBo findFireEquipById (@Param("id") Long id);
 
-    FireEquipment findVideoById (@Param("id") Long id);
+    FireEquipmentBo findVideoById (@Param("id") Long id);
     
     FireStation findFireStationById(@Param("id") Long id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpAndFireEquipMapper.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.fas.business.dao.mapper;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,9 +25,9 @@ public interface ImpAndFireEquipMapper extends BaseMapper {
      * @param equipmentId
      * @return
      */
-    List<FireEquipment> queryBindFirEqumtPage(@Param("start") long start,@Param("length")int length,@Param("equipmentId") String equipmentId);
-
-    Long queryBindFirEqumtPageCount(@Param("equipmentId") String equipmentId);
+//    List<FireEquipment> queryBindFirEqumtPage(@Param("start") long start,@Param("length")int length,@Param("equipmentId") String equipmentId);
+//
+//    Long queryBindFirEqumtPageCount(@Param("equipmentId") String equipmentId);
 
     Map queryForCamera(@Param("equipmentId") String equipmentId );
     

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireEquipmentDao.java

-package com.yeejoin.amos.fas.business.dao.repository;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
-
-@Repository("iFireEquipmentDao")
-public interface IFireEquipmentDao extends BaseDao<FireEquipment, Long> {
-
-	@Query(value = "select distinct production_area from f_fire_equipment ",nativeQuery = true)
-	List<String> findFireEquipArea();
-	
-	Optional<FireEquipment> findById(Long id);
-
-	@Query(value = "SELECT count(1) FROM `f_fire_station_equipment` WHERE fire_equipment_id in ?1", nativeQuery = true)
-	int countAssociatedEquipStationByIds(String[] ids);
-
-	Optional<FireEquipment> findByCode(String code);
-}
+//package com.yeejoin.amos.fas.business.dao.repository;
+//
+//import java.util.List;
+//import java.util.Optional;
+//
+//import org.springframework.data.jpa.repository.Query;
+//import org.springframework.stereotype.Repository;
+//
+//import com.yeejoin.amos.fas.dao.entity.FireEquipment;
+//
+//@Repository("iFireEquipmentDao")
+//public interface IFireEquipmentDao extends BaseDao<FireEquipment, Long> {
+//
+////	@Query(value = "select distinct production_area from f_fire_equipment ",nativeQuery = true)
+////	List<String> findFireEquipArea();
+//	
+////	Optional<FireEquipment> findById(Long id);
+//
+////	@Query(value = "SELECT count(1) FROM `f_fire_station_equipment` WHERE fire_equipment_id in ?1", nativeQuery = true)
+////	int countAssociatedEquipStationByIds(String[] ids);
+//
+////	Optional<FireEquipment> findByCode(String code);
+//}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java

@@ -40,7 +40,6 @@ import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentFireEquipmentDao;
-import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFmeaEquipmentPointDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
@@ -53,7 +52,6 @@ import com.yeejoin.amos.fas.core.util.DaoCriteria;
 import com.yeejoin.amos.fas.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -83,9 +81,6 @@ public class EquipmentServiceImpl implements IEquipmentService {
     IEquipmentFireEquipmentDao equipmentFireEquipmentDao;
 
     @Autowired
-    IFireEquipmentDao iFireEquipmentDao;
-
-    @Autowired
     ImpAndFireEquipMapper impAndFireEquipMapper;
 
     @Autowired
@@ -251,20 +246,20 @@ public class EquipmentServiceImpl implements IEquipmentService {
      */
     @Override
     public Page queryBindFirEqumtList(CommonPageable commonPageable, Long equipmentId) {
-    	long start = -1;
-        int length = -1;
-        if (null != commonPageable) {
-            start = commonPageable.getOffset();
-            length = commonPageable.getPageSize();
-        }
-        long total = this.impAndFireEquipMapper.queryBindFirEqumtPageCount(String.valueOf(equipmentId));
-        List<FireEquipment> list = this.impAndFireEquipMapper.queryBindFirEqumtPage(start, length, String.valueOf(equipmentId));
-        if(commonPageable==null)
-        {
-        	commonPageable = new CommonPageable();
-        }
-        Page result = new PageImpl(list, commonPageable, total);
-        return result;
+//    	long start = -1;
+//        int length = -1;
+//        if (null != commonPageable) {
+//            start = commonPageable.getOffset();
+//            length = commonPageable.getPageSize();
+//        }
+//        long total = this.impAndFireEquipMapper.queryBindFirEqumtPageCount(String.valueOf(equipmentId));
+//        List<FireEquipment> list = this.impAndFireEquipMapper.queryBindFirEqumtPage(start, length, String.valueOf(equipmentId));
+//        if(commonPageable==null)
+//        {
+//        	commonPageable = new CommonPageable();
+//        }
+//        Page result = new PageImpl(list, commonPageable, total);
+        return null;
     }
 
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java

 package com.yeejoin.amos.fas.business.service.impl;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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.FireEquipMapper;
 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.IFireStationDao;
 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.service.intfc.IFireEquipService;
 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.response.CommonPage;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireStation;
-import com.yeejoin.amos.fas.dao.entity.WaterResource;
-import org.apache.commons.beanutils.BeanUtils;
-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;
-import java.util.Optional;
 
 @Service("fireEquipService")
 public class FireEquipServiceImpl implements IFireEquipService {
@@ -33,9 +29,6 @@ public class FireEquipServiceImpl implements IFireEquipService {
     FireEquipMapper fireEquipMapper;
 
     @Autowired
-    IFireEquipmentDao iFireEquipmentDao;
-
-    @Autowired
     ImpEquipMapper impEquipMapper;
 
     @Autowired
@@ -44,35 +37,35 @@ public class FireEquipServiceImpl implements IFireEquipService {
     @Autowired
     IFireStationDao iFireStationDao;
 
-    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;
-    }
+//    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;
+//    }
 
     public String[] delete(String[] idArray) throws Exception {
-        for (String id : idArray) {
-            Optional<FireEquipment> fireEquipment1 = iFireEquipmentDao.findById(Long.parseLong(id));
-            FireEquipment fireEquipment=null;
-            if(fireEquipment1.isPresent()){
-            	fireEquipment= fireEquipment1.get();
-        	}
-
-            if (fireEquipment != null) {
-                this.iFireEquipmentDao.deleteById(Long.parseLong(id));
-            } else {
-                throw new Exception("找不到指定的对象:" + id);
-            }
-        }
+//        for (String id : idArray) {
+//            Optional<FireEquipment> fireEquipment1 = iFireEquipmentDao.findById(Long.parseLong(id));
+//            FireEquipment fireEquipment=null;
+//            if(fireEquipment1.isPresent()){
+//            	fireEquipment= fireEquipment1.get();
+//        	}
+//
+//            if (fireEquipment != null) {
+//                this.iFireEquipmentDao.deleteById(Long.parseLong(id));
+//            } else {
+//                throw new Exception("找不到指定的对象:" + id);
+//            }
+//        }
 
         return idArray;
     }
@@ -96,7 +89,8 @@ public class FireEquipServiceImpl implements IFireEquipService {
 
     @Override
     public List<String> findFireEquipArea() {
-        return iFireEquipmentDao.findFireEquipArea();
+    	return null;
+//        return iFireEquipmentDao.findFireEquipArea();
     }
 
 
@@ -167,23 +161,20 @@ public class FireEquipServiceImpl implements IFireEquipService {
             case extinguisher:
             case hydrant:
             case monitorEquipment:
-                FireEquipment fireEquipment=fireEquipMapper.findFireEquipById(id);
+            	FireEquipmentBo fireEquipment=fireEquipMapper.findFireEquipById(id);
                 fireEquipment.setEquipClassify(Integer.parseInt(EquipClassifyEnum.EQUIPMENT.getCode()));
                 returnEntity = fireEquipment;
                 break;
             case video:
-                FireEquipment fireVideo = fireEquipMapper.findVideoById(id);
+            	FireEquipmentBo fireVideo = fireEquipMapper.findVideoById(id);
                 fireVideo.setEquipClassify(Integer.parseInt(EquipClassifyEnum.VIDEO.getCode()));
                 returnEntity = fireVideo;
                 break;
 
             case fireDetection:
-                Optional<FireEquipment> fireDetection1 = this.iFireEquipmentDao.findById(id);
-                FireEquipment fireDetection=null;
-                if(fireDetection1.isPresent()){
-                	fireDetection=fireDetection1.get();
-            	}
-                fireDetection.setProtectObjNames(this.impEquipMapper.queryProtectObjNames(fireDetection.getId()));
+            	FireEquipmentBo fireDetection=fireEquipMapper.findFireEquipById(id);
+                
+            	fireDetection.setProtectObjNames(this.impEquipMapper.queryProtectObjNames(fireDetection.getId()));
                 returnEntity = fireDetection;
                 break;
             default:
@@ -195,13 +186,14 @@ public class FireEquipServiceImpl implements IFireEquipService {
 
     @Override
     public int countAssociatedEquipStationByIds(String[] ids) {
-        return iFireEquipmentDao.countAssociatedEquipStationByIds(ids);
+//        return iFireEquipmentDao.countAssociatedEquipStationByIds(ids);
+    	return 0;
     }
 
 
-	@Override
-	public Boolean isExistByCode(String code) {
-		Optional<FireEquipment> optional = iFireEquipmentDao.findByCode(code);
-		return optional.isPresent();
-	}
+//	@Override
+//	public Boolean isExistByCode(String code) {
+//		Optional<FireEquipment> optional = iFireEquipmentDao.findByCode(code);
+//		return optional.isPresent();
+//	}
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireStationServiceImpl.java

@@ -4,12 +4,10 @@ import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireStationEquipmentMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FireStationMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentFireEquipmentDao;
-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.IFireStationEquipmentDao;
 import com.yeejoin.amos.fas.business.service.intfc.IFireStationService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireStation;
 import com.yeejoin.amos.fas.dao.entity.FireStationFireEquipment;
 import com.yeejoin.amos.fas.exception.YeeException;
@@ -43,8 +41,6 @@ public class FireStationServiceImpl implements IFireStationService {
 	@Autowired
 	IFireStationEquipmentDao iFireStationEquipmentDao;
 
-	@Autowired
-	IFireEquipmentDao iFireEquipmentDao;
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -61,52 +57,52 @@ public class FireStationServiceImpl implements IFireStationService {
 	public List<FireStationFireEquipment> saveStationFireEquipment(
 			List<FireStationFireEquipment> fireStationFireEquipments) throws Exception {
 
-		for (FireStationFireEquipment fireStationFireEquipment : fireStationFireEquipments) {
-			Optional<FireStation> fireStation1 = iFireStationDao.findById(fireStationFireEquipment.getFireStationId());
-			Optional<FireEquipment> fireEquipment1 = iFireEquipmentDao.findById(fireStationFireEquipment.getFireEquipmentId());
-			FireStation fireStation=null;
-			FireEquipment fireEquipment=null;
-			if(fireStation1.isPresent()){
-				 fireStation=fireStation1.get();
-			}
-			if(fireEquipment1.isPresent()){
-				fireEquipment=fireEquipment1.get();
-			}
-			
-			if (fireStation == null)
-				throw new Exception("找不到指定的消防站");
-			if (fireEquipment == null)
-				throw new Exception("消防设备不存在");
-			
-//			if (!CollectionUtils.isEmpty(map))
-//				throw new Exception("绑定关系已经存在.");
-			
-			Map map = fireStationEquipmentMapper.queryRelation(fireStationFireEquipment.getFireStationId(),
-					fireStationFireEquipment.getFireEquipmentId());
-			if (!CollectionUtils.isEmpty(map)) {
-				if(fireEquipment.getEquipClassify() == 1) {//耗材类
-					
-					Long stationEquiId = (Long) map.get("id");
-					Double number = (Double) map.get("number");//当前数量
-					Double number2 = fireStationFireEquipment.getNumber();//添加的数量
-					Double number3 = (double)fireEquipment.getNumber();//库存
-					Double diff = number3 - number2;
-					if(diff < 0){
-						throw new Exception("添加数量超过现有数量！.");
-					}else {
-						Double curNumber = number + number2;
-						fireStationEquipmentMapper.updateNumberById(stationEquiId,curNumber);
-						fireEquipment.setNumber(diff.intValue());
-						iFireEquipmentDao.saveAndFlush(fireEquipment);
-					}
-				}
-			}else {
-				fireStationFireEquipment = iFireStationEquipmentDao.save(fireStationFireEquipment);
-			}
-			
-			
-
-		}
+//		for (FireStationFireEquipment fireStationFireEquipment : fireStationFireEquipments) {
+//			Optional<FireStation> fireStation1 = iFireStationDao.findById(fireStationFireEquipment.getFireStationId());
+//			Optional<FireEquipment> fireEquipment1 = iFireEquipmentDao.findById(fireStationFireEquipment.getFireEquipmentId());
+//			FireStation fireStation=null;
+//			FireEquipment fireEquipment=null;
+//			if(fireStation1.isPresent()){
+//				 fireStation=fireStation1.get();
+//			}
+//			if(fireEquipment1.isPresent()){
+//				fireEquipment=fireEquipment1.get();
+//			}
+//			
+//			if (fireStation == null)
+//				throw new Exception("找不到指定的消防站");
+//			if (fireEquipment == null)
+//				throw new Exception("消防设备不存在");
+//			
+////			if (!CollectionUtils.isEmpty(map))
+////				throw new Exception("绑定关系已经存在.");
+//			
+//			Map map = fireStationEquipmentMapper.queryRelation(fireStationFireEquipment.getFireStationId(),
+//					fireStationFireEquipment.getFireEquipmentId());
+//			if (!CollectionUtils.isEmpty(map)) {
+//				if(fireEquipment.getEquipClassify() == 1) {//耗材类
+//					
+//					Long stationEquiId = (Long) map.get("id");
+//					Double number = (Double) map.get("number");//当前数量
+//					Double number2 = fireStationFireEquipment.getNumber();//添加的数量
+//					Double number3 = (double)fireEquipment.getNumber();//库存
+//					Double diff = number3 - number2;
+//					if(diff < 0){
+//						throw new Exception("添加数量超过现有数量！.");
+//					}else {
+//						Double curNumber = number + number2;
+//						fireStationEquipmentMapper.updateNumberById(stationEquiId,curNumber);
+//						fireEquipment.setNumber(diff.intValue());
+//						iFireEquipmentDao.saveAndFlush(fireEquipment);
+//					}
+//				}
+//			}else {
+//				fireStationFireEquipment = iFireStationEquipmentDao.save(fireStationFireEquipment);
+//			}
+//			
+//			
+//
+//		}
 		return fireStationFireEquipments;
 	}
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -114,8 +114,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Autowired
     private FireEquipMapper fireEquipMapper;
 
-    @Autowired
-    private IFireEquipmentDao iFireEquipmentDao;
 
     @Autowired
     private ImpAndFireEquipMapper impAndFireEquipMapper;
@@ -530,7 +528,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     }
 
 
-    public void alermContingency(String batchNo, FireEquipment fireEquipment, Equipment equipment) throws Exception {
+    public void alermContingency(String batchNo, FireEquipmentBo fireEquipment, Equipment equipment) throws Exception {
         Object oldContingencyRo = redisTemplate.opsForValue().get("contingencyRo");
         ContingencyRo contingencyRo = new ContingencyRo();
         contingencyRo.setBatchNo(batchNo);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -46,7 +46,6 @@ import com.yeejoin.amos.fas.business.dao.mapper.PatrolMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskSourceMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.View3dMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
-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.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
@@ -80,7 +79,6 @@ import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireStation;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
@@ -88,7 +86,6 @@ import com.yeejoin.amos.fas.dao.entity.SafetyIndexChangeLog;
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
 import com.yeejoin.amos.fas.exception.YeeException;
 
-import io.swagger.annotations.ApiOperation;
 
 /**
  * @author DELL
@@ -103,8 +100,6 @@ public class View3dServiceImpl implements IView3dService {
     @Autowired
     private IRiskSourceDao iRiskSourceDao;
     @Autowired
-    private IFireEquipmentDao iFireEquipmentDao;
-    @Autowired
     private IFireStationDao iFireStationDao;
     @Autowired
     private IEquipmentDao iEquipmentDao;
@@ -217,17 +212,17 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateFireEquipmentPosition(BindPointBo pointBo) {
-       Optional<FireEquipment> data = iFireEquipmentDao.findById(pointBo.getPointId());
-       if(data.isPresent()){
-           FireEquipment fireEquipment = data.get();
-           String ue4Location = pointBo.getUe4Location();
-           String ue4Rotation = pointBo.getUe4Rotation();
-           String position3d = pointBo.getPosition3d();
-           if(ue4Location != null) fireEquipment.setUe4Location(ue4Location);
-           if(ue4Rotation != null) fireEquipment.setUe4Rotation(ue4Rotation);
-           if(position3d != null) fireEquipment.setPosition3d(position3d);
-           iFireEquipmentDao.save(fireEquipment);
-       }
+//       Optional<FireEquipment> data = iFireEquipmentDao.findById(pointBo.getPointId());
+//       if(data.isPresent()){
+//           FireEquipment fireEquipment = data.get();
+//           String ue4Location = pointBo.getUe4Location();
+//           String ue4Rotation = pointBo.getUe4Rotation();
+//           String position3d = pointBo.getPosition3d();
+//           if(ue4Location != null) fireEquipment.setUe4Location(ue4Location);
+//           if(ue4Rotation != null) fireEquipment.setUe4Rotation(ue4Rotation);
+//           if(position3d != null) fireEquipment.setPosition3d(position3d);
+//           iFireEquipmentDao.save(fireEquipment);
+//       }
     }
 
     public void updateEquipmentPosition(BindPointBo pointBo) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFireEquipService.java

@@ -2,13 +2,10 @@ package com.yeejoin.amos.fas.business.service.intfc;
 
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
-import com.yeejoin.amos.fas.dao.entity.BasicEntity;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import org.springframework.data.domain.Page;
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public interface IFireEquipService {
 
@@ -18,9 +15,9 @@ public interface IFireEquipService {
 
 	List<String> findFireEquipArea();
 
-	FireEquipment save(FireEquipment fireEquipment);
+//	FireEquipment save(FireEquipment fireEquipment);
 
-	FireEquipment queryOne(Long id);
+//	FireEquipment queryOne(Long id);
 
 	/**
 	 * 删除单个风险点
@@ -47,5 +44,5 @@ public interface IFireEquipService {
 	 */
 	int countAssociatedEquipStationByIds(String[] ids);
 
-	Boolean isExistByCode(String code);
+//	Boolean isExistByCode(String code);
 }

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -61,28 +61,7 @@
             alter table `f_equipment` add column `ue4_rotation` text default null  comment 'ue4旋转' after `position3d`;
         </sql>
     </changeSet>
-    <changeSet author="suhuiguang" id="1587350445716-1">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <columnExists tableName="f_fire_car" columnName="ue4_location"/>
-            </not>
-        </preConditions>
-        <comment>f_fire_car add column ue4_location</comment>
-        <sql>
-            alter table `f_fire_car` add column `ue4_location` text default null  comment 'ue4位置' after `position3d`;
-        </sql>
-    </changeSet>
-    <changeSet author="suhuiguang" id="1587350445716-2">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <columnExists tableName="f_fire_car" columnName="ue4_rotation"/>
-            </not>
-        </preConditions>
-        <comment>f_fire_car add column ue4_rotation</comment>
-        <sql>
-            alter table `f_fire_car` add column `ue4_rotation` text default null  comment 'ue4旋转' after `position3d`;
-        </sql>
-    </changeSet>
+   
     <changeSet author="suhuiguang" id="1587350552716-1">
     <preConditions onFail="MARK_RAN">
         <not>

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -512,7 +512,7 @@
 			WHERE esi.equipment_specific_id = #{fireEquipmentId} AND fmep.important_equipment_id = #{importantEquipmentId}
     </select>
 
-    <select id="findFireEquipById" resultType="com.yeejoin.amos.fas.dao.entity.FireEquipment">
+    <select id="findFireEquipById" resultType="com.yeejoin.amos.fas.business.bo.FireEquipmentBo">
         SELECT
         spec.id AS id,
         spec.org_code AS org_code,
@@ -559,7 +559,7 @@
             spec.id = #{id}
         </if>
     </select>
-    <select id="findVideoById" resultType="com.yeejoin.amos.fas.dao.entity.FireEquipment">
+    <select id="findVideoById" resultType="com.yeejoin.amos.fas.business.bo.FireEquipmentBo">
         SELECT
         risk.*,
         video.id AS id,

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_impAndfire_equip.xml

@@ -54,7 +54,7 @@
 
 
 
-
+<!-- 
 	<select id="queryBindFirEqumtPage" resultType="com.yeejoin.amos.fas.dao.entity.FireEquipment">
 		SELECT
 			rs.`name` production_area,
@@ -87,7 +87,7 @@
 	<if test="start != -1 and length != -1">
 	   LIMIT ${start},${length} ;
     </if>
-	</select>
+	</select> 
 
 	<select id="queryBindFirEqumtPageCount" resultType="long">
 
@@ -105,7 +105,7 @@
 					efe.equipment_id = ${equipmentId}
 				AND efe.fire_equipment_id = fe.id
 	)
-	</select>
+	</select>-->
 
 	<select id="queryForCamera" resultType="map">
 				SELECT