删除fireCar实体，注释相关代码

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireCar.java

-package com.yeejoin.amos.fas.dao.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-
-
-/**
- * The persistent class for the fire_car database table.
- * 
- */
-@Entity
-@Table(name="f_fire_car")
-@NamedQuery(name="FireCar.findAll", query="SELECT f FROM FireCar f")
-public class FireCar extends BasicEntity  {
-	private static final long serialVersionUID = 1L;
-
-	@Column(name="car_num")
-	private String carNum;
-
-	private String country;
-
-	@Column(name="create_by")
-	private String createBy;
-
-	@Column(name="engine_num")
-	private String engineNum;
-
-	private String model;
-
-	private String name;
-
-	@Column(name="org_code")
-	private String orgCode;
-
-	@Column(name="dept_id")
-	private String deptId;
-
-	@Lob
-	@Column(name="performance_index")
-	private String performanceIndex;
-
-	private String remark;
-
-	private String state;
-
-	private String type;
-	
-	/**
-	 * 所属风险区域id
-	 */
-	@Column(name="risk_source_id")
-	private Long riskSourceId;
-	
-	/**
-	 * 3维坐标
-	 */
-	private String position3d;
-	
-	/**
-	 * 3维楼层
-	 */
-	private String floor3d;	
-	
-	/**
-	 * 是否室内
-	 */
-	@Column(name="is_indoor")
-	private Boolean isIndoor=true;
-
-	/**
-	 * 消防车图片路径
-	 */
-	@Column(name="photo_path")
-	private String photoPath;
-
-	/**
-	 * ue4位置
-	 */
-	@Lob
-	private String ue4Location;
-
-	/**
-	 * ue4旋转
-	 */
-	@Lob
-	private String ue4Rotation;
-
-	public FireCar() {
-	}
-
-	public String getCarNum() {
-		return this.carNum;
-	}
-
-	public void setCarNum(String carNum) {
-		this.carNum = carNum;
-	}
-
-	public String getCountry() {
-		return this.country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	public String getCreateBy() {
-		return this.createBy;
-	}
-
-	public void setCreateBy(String createBy) {
-		this.createBy = createBy;
-	}
-
-	public String getEngineNum() {
-		return this.engineNum;
-	}
-
-	public void setEngineNum(String engineNum) {
-		this.engineNum = engineNum;
-	}
-
-	public String getModel() {
-		return this.model;
-	}
-
-	public void setModel(String model) {
-		this.model = model;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getOrgCode() {
-		return this.orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public String getPerformanceIndex() {
-		return this.performanceIndex;
-	}
-
-	public void setPerformanceIndex(String performanceIndex) {
-		this.performanceIndex = performanceIndex;
-	}
-
-	public String getRemark() {
-		return this.remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getState() {
-		return this.state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public String getType() {
-		return this.type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	public String getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
-	}
-	
-
-	public String getPosition3d() {
-		return position3d;
-	}
-
-	public void setPosition3d(String position3d) {
-		this.position3d = position3d;
-	}
-
-	public String getFloor3d() {
-		return floor3d;
-	}
-
-	public void setFloor3d(String floor3d) {
-		this.floor3d = floor3d;
-	}
-
-	public Boolean getIsIndoor() {
-		return isIndoor;
-	}
-
-	public void setIsIndoor(Boolean isIndoor) {
-		this.isIndoor = isIndoor;
-	}
-
-
-	public String getPhotoPath() {
-		return photoPath;
-	}
-
-	public void setPhotoPath(String photoPath) {
-		this.photoPath = photoPath;
-	}
-
-	public Long getRiskSourceId() {
-		return riskSourceId;
-	}
-
-	public void setRiskSourceId(Long riskSourceId) {
-		this.riskSourceId = riskSourceId;
-	}
-
-	@Column(name = "ue4_location")
-	public String getUe4Location() {
-		return ue4Location;
-	}
-
-	public void setUe4Location(String ue4Location) {
-		this.ue4Location = ue4Location;
-	}
-
-	@Column(name = "ue4_rotation")
-	public String getUe4Rotation() {
-		return ue4Rotation;
-	}
-
-	public void setUe4Rotation(String ue4Rotation) {
-		this.ue4Rotation = ue4Rotation;
-	}
-}
\ No newline at end of file

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

-package com.yeejoin.amos.fas.business.controller;
-
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-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.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
-import com.yeejoin.amos.fas.business.vo.ReginParams;
-import com.yeejoin.amos.fas.config.Permission;
-import com.yeejoin.amos.fas.core.util.CommonResponse;
-import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
-import com.yeejoin.amos.fas.dao.entity.FireCar;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-
-@RestController
-@RequestMapping(value = "/api/firecar")
-@Api(tags = "消防车API")
-public class FireCarController extends BaseController {
-	@Autowired
-	private IFireCarService fireCarService;
-
-	@Permission
-	@ApiOperation(httpMethod = "POST", value = "添加消防车", notes = "添加消防车")
-	@RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-	public CommonResponse create(@RequestBody FireCar fireCar) throws Exception {
-
-		ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
-		
-		fireCar.setCreateBy(getUserId());
-		fireCar.setCreateDate(new Date());
-		fireCar.setOrgCode(compCode);
-		return CommonResponseUtil.success(fireCarService.save(fireCar));
-	}
-
-	@Permission
-	//@Authorization(ingore = true)
-	@ApiOperation(httpMethod = "PUT", value = "编辑消防车", notes = "编辑消防车")
-	@RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
-	public CommonResponse udpate(@PathVariable Long id, @RequestBody FireCar fireCar) {
-		fireCar.setId(id);
-		return CommonResponseUtil.success(fireCarService.save(fireCar));
-	}
-
-	@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(fireCarService.queryOne(id));
-	}
-
-	@Permission
-	@ApiOperation(httpMethod = "DELETE", value = "删除消防车", notes = "查询单个消防车")
-	@RequestMapping(value = "/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
-	public CommonResponse delete(@PathVariable String ids) throws Exception {
-		String[] idArray = ids.split(",");
-		return CommonResponseUtil.success(fireCarService.delete(idArray));
-	}
-
-	@Permission
-	//@Authorization(ingore = true)
-	@ApiOperation(httpMethod = "POST", value = "上传消防车图片", notes = "上传消防车图片")
-	@RequestMapping(value = "/uploadCarImg", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-	public CommonResponse uploadCarImg(@ApiParam(value = "消防车图片", required = false) @RequestParam(value = "file" ,required = false) MultipartFile[] file,FireCar fireCar, BindingResult bindingResult) {
-
-		System.out.print(fireCar);
-		ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
-		fireCar.setOrgCode(compCode);
-		fireCar.setCreateBy(getUserId());
-		fireCarService.saveFireCarAndPhoto(fireCar,file);
-		return CommonResponseUtil.success();
-	}
-}
+//package com.yeejoin.amos.fas.business.controller;
+//
+//import java.util.Date;
+//
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.BindingResult;
+//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.RequestMethod;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
+//import com.yeejoin.amos.fas.business.vo.ReginParams;
+//import com.yeejoin.amos.fas.config.Permission;
+//import com.yeejoin.amos.fas.core.util.CommonResponse;
+//import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+//import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import io.swagger.annotations.ApiParam;
+//
+//
+//@RestController
+//@RequestMapping(value = "/api/firecar")
+//@Api(tags = "消防车API")
+//public class FireCarController extends BaseController {
+//	@Autowired
+//	private IFireCarService fireCarService;
+//
+//	@Permission
+//	@ApiOperation(httpMethod = "POST", value = "添加消防车", notes = "添加消防车")
+//	@RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+//	public CommonResponse create(@RequestBody FireCar fireCar) throws Exception {
+//
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String compCode=getOrgCode(reginParams);
+//		
+//		fireCar.setCreateBy(getUserId());
+//		fireCar.setCreateDate(new Date());
+//		fireCar.setOrgCode(compCode);
+//		return CommonResponseUtil.success(fireCarService.save(fireCar));
+//	}
+//
+//	@Permission
+//	//@Authorization(ingore = true)
+//	@ApiOperation(httpMethod = "PUT", value = "编辑消防车", notes = "编辑消防车")
+//	@RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
+//	public CommonResponse udpate(@PathVariable Long id, @RequestBody FireCar fireCar) {
+//		fireCar.setId(id);
+//		return CommonResponseUtil.success(fireCarService.save(fireCar));
+//	}
+//
+//	@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(fireCarService.queryOne(id));
+//	}
+//
+//	@Permission
+//	@ApiOperation(httpMethod = "DELETE", value = "删除消防车", notes = "查询单个消防车")
+//	@RequestMapping(value = "/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
+//	public CommonResponse delete(@PathVariable String ids) throws Exception {
+//		String[] idArray = ids.split(",");
+//		return CommonResponseUtil.success(fireCarService.delete(idArray));
+//	}
+//
+//	@Permission
+//	//@Authorization(ingore = true)
+//	@ApiOperation(httpMethod = "POST", value = "上传消防车图片", notes = "上传消防车图片")
+//	@RequestMapping(value = "/uploadCarImg", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+//	public CommonResponse uploadCarImg(@ApiParam(value = "消防车图片", required = false) @RequestParam(value = "file" ,required = false) MultipartFile[] file,FireCar fireCar, BindingResult bindingResult) {
+//
+//		System.out.print(fireCar);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String compCode=getOrgCode(reginParams);
+//		fireCar.setOrgCode(compCode);
+//		fireCar.setCreateBy(getUserId());
+//		fireCarService.saveFireCarAndPhoto(fireCar,file);
+//		return CommonResponseUtil.success();
+//	}
+//}

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

@@ -6,7 +6,6 @@ import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipService;
 import com.yeejoin.amos.fas.business.service.intfc.IWaterResourceService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
-import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
@@ -126,8 +125,8 @@ public class FireSourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "查询消防车", notes = "查询消防车")
     @RequestMapping(value = "/fire-car/det/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryFireCar(@ApiParam(value = "查询条件", required = true) @PathVariable Long id) {
-        FireCarDetailVo car = fireCarService.findFireCarById(getToken(), getProduct(), getAppKey(), id);
-        return CommonResponseUtil.success(car);
+//        FireCarDetailVo car = fireCarService.findFireCarById(getToken(), getProduct(), getAppKey(), id);
+        return CommonResponseUtil.success();
     }
 
     /**

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
-import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
-
 public interface FireCarMapper extends BaseMapper {
 
-	long countPageData(CommonPageInfoParam param);
+//	long countPageData(CommonPageInfoParam param);
 
-	List<HashMap<String, Object>> getFireCarPage(CommonPageInfoParam param);
+//	List<HashMap<String, Object>> getFireCarPage(CommonPageInfoParam param);
 	
 	/**
 	 * 根据ID获取消防车详细信息
@@ -20,5 +12,5 @@ public interface FireCarMapper extends BaseMapper {
 	 * @param truckId
 	 * @return
 	 */
-	FireCarDetailVo getFireCarDetailById(@Param(value = "truckId") Long truckId);
+//	FireCarDetailVo getFireCarDetailById(@Param(value = "truckId") Long truckId);
 }

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
-import org.apache.ibatis.annotations.Param;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public interface PlanVisual3dMapper extends BaseMapper {
-    List<HashMap<String,Object>> getResourceListByType(@Param("type") String type);
-
-    Map<String, Object> queryOneByTypeAndId(@Param("type") String type, @Param("id") Long id);
+//    List<HashMap<String,Object>> getResourceListByType(@Param("type") String type);
+//
+//    Map<String, Object> queryOneByTypeAndId(@Param("type") String type, @Param("id") Long id);
 }

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

-package com.yeejoin.amos.fas.business.dao.repository;
-
-import java.util.Optional;
-
-import org.springframework.stereotype.Repository;
-
-import com.yeejoin.amos.fas.dao.entity.FireCar;
-
-@Repository("iFireCarDao")
-public interface IFireCarDao extends BaseDao<FireCar, Long> {
-	Optional<FireCar> findById(Long id);
-}
+//package com.yeejoin.amos.fas.business.dao.repository;
+//
+//import java.util.Optional;
+//
+//import org.springframework.stereotype.Repository;
+//
+//import com.yeejoin.amos.fas.dao.entity.FireCar;
+//
+//@Repository("iFireCarDao")
+//public interface IFireCarDao extends BaseDao<FireCar, Long> {
+//	Optional<FireCar> findById(Long id);
+//}

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

@@ -26,12 +26,9 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireCarMapper;
-import com.yeejoin.amos.fas.business.dao.repository.IFireCarDao;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
-import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
-import com.yeejoin.amos.fas.dao.entity.FireCar;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 
@@ -41,8 +38,8 @@ public class FireCarServiceImpl implements IFireCarService {
 
 	@Autowired 
 	FireCarMapper fireCarMapper;
-	@Autowired 
-	IFireCarDao iFireCarDao;
+//	@Autowired 
+//	IFireCarDao iFireCarDao;
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -53,41 +50,41 @@ public class FireCarServiceImpl implements IFireCarService {
 	@Autowired
 	private RemoteSecurityService remoteSecurityService;
 
-	public FireCar save(FireCar fireCar)
-	{
-		Long carId = fireCar.getId();
-		iFireCarDao.save(fireCar);
-		return fireCar;
-	}
+//	public FireCar save(FireCar fireCar)
+//	{
+//		Long carId = fireCar.getId();
+//		iFireCarDao.save(fireCar);
+//		return fireCar;
+//	}
 
 
-	public FireCar queryOne(Long id)
-	{
-		Optional<FireCar> FireCar1=	iFireCarDao.findById(id);
-		FireCar fireCar=null;
-		if(FireCar1.isPresent()){
-			fireCar=FireCar1.get();
-		}
-		return fireCar;
-	}
+//	public FireCar queryOne(Long id)
+//	{
+//		Optional<FireCar> FireCar1=	iFireCarDao.findById(id);
+//		FireCar fireCar=null;
+//		if(FireCar1.isPresent()){
+//			fireCar=FireCar1.get();
+//		}
+//		return fireCar;
+//	}
 
 	public String [] delete(String []idArray) throws Exception
 	{
-		for(String id:idArray)
-		{
-			Optional<FireCar> fireCar1 = iFireCarDao.findById(Long.parseLong(id));
-			FireCar fireCar=null;
-			if(fireCar1.isPresent()){
-				fireCar=fireCar1.get();
-			}
-			if(fireCar != null)
-			{
-				this.iFireCarDao.deleteById(Long.parseLong(id));
-			}else
-			{
-				throw new Exception("找不到指定的对象:"+id);
-			}
-		}
+//		for(String id:idArray)
+//		{
+//			Optional<FireCar> fireCar1 = iFireCarDao.findById(Long.parseLong(id));
+//			FireCar fireCar=null;
+//			if(fireCar1.isPresent()){
+//				fireCar=fireCar1.get();
+//			}
+//			if(fireCar != null)
+//			{
+//				this.iFireCarDao.deleteById(Long.parseLong(id));
+//			}else
+//			{
+//				throw new Exception("找不到指定的对象:"+id);
+//			}
+//		}
 
 		return idArray;
 	}
@@ -96,74 +93,74 @@ public class FireCarServiceImpl implements IFireCarService {
 
 	@Override
 	public Page<HashMap<String, Object>> queryFireCar(String toke,String product,String appKey,CommonPageInfoParam param) {
-		long total = fireCarMapper.countPageData(param);
-		List<HashMap<String, Object>> content = fireCarMapper.getFireCarPage(param);
-        if (!CollectionUtils.isEmpty(content)) {
-            Set<String> deptIds =  Sets.newHashSet(Lists.transform(content, Map->Map.get("dept_id")+""));
-            deptIds.remove("");
-            deptIds.remove(null);
-            if(!CollectionUtils.isEmpty(deptIds)){
-				List<DepartmentModel> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIds));
-				Map<Long, String>  deptMap = depts.stream().collect(Collectors.toMap(DepartmentModel::getSequenceNbr,DepartmentModel::getDepartmentName));
-				if (!ObjectUtils.isEmpty(deptMap)){
-					content.forEach(e -> {
-						e.put("departmentName",deptMap.get(Long.valueOf(e.get("dept_id").toString())));
-					});
-				}
-            }
-        }
-		Page<HashMap<String, Object>> result = new PageImpl<HashMap<String, Object>>(content, param, total);
-		return result;
+//		long total = fireCarMapper.countPageData(param);
+//		List<HashMap<String, Object>> content = fireCarMapper.getFireCarPage(param);
+//        if (!CollectionUtils.isEmpty(content)) {
+//            Set<String> deptIds =  Sets.newHashSet(Lists.transform(content, Map->Map.get("dept_id")+""));
+//            deptIds.remove("");
+//            deptIds.remove(null);
+//            if(!CollectionUtils.isEmpty(deptIds)){
+//				List<DepartmentModel> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIds));
+//				Map<Long, String>  deptMap = depts.stream().collect(Collectors.toMap(DepartmentModel::getSequenceNbr,DepartmentModel::getDepartmentName));
+//				if (!ObjectUtils.isEmpty(deptMap)){
+//					content.forEach(e -> {
+//						e.put("departmentName",deptMap.get(Long.valueOf(e.get("dept_id").toString())));
+//					});
+//				}
+//            }
+//        }
+//		Page<HashMap<String, Object>> result = new PageImpl<HashMap<String, Object>>(content, param, total);
+		return null;
 	}
 	
-	@Override
-	public FireCarDetailVo findFireCarById(String toke,String product,String appKey,Long truckId) {
-		FireCarDetailVo carVo = fireCarMapper.getFireCarDetailById(truckId);
-		DepartmentModel departmentModel= remoteSecurityService.getDepartmentByDeptId(toke, product, appKey, carVo.getDeptId());
-		carVo.setDepartmentName(departmentModel != null ? departmentModel.getDepartmentName() : "");
-		return carVo;
-	}
-
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public FireCar saveFireCarAndPhoto(FireCar fireCar, MultipartFile[] files) {
-		Long carId = fireCar.getId();
-		fireCar.setCreateDate(new Date());
-		fireCar = iFireCarDao.saveAndFlush(fireCar);
-		String photoPath = "";
-		for (int i = 0; i < files.length; i++) {
-			MultipartFile file = files[i];
-			if (file.isEmpty()) {
-				continue;
-			}
-			String path = FasConstant.UPLOAD_ROOT_PATH + File.separator + FasConstant.UPLOAD_CAR_PATH + File.separator + fireCar.getId();
-			String filePath = getRootPath() + path;
-			String fileName = File.separator + file.getOriginalFilename();
-			try {
-				File dest = new File(filePath + File.separator + fileName);
-				if (!dest.exists()) {
-					if (dest.getParentFile() != null && !dest.getParentFile().exists()) {
-						dest.getParentFile().mkdirs();
-					}
-					dest.createNewFile();
-				}
-				file.transferTo(dest);
-			} catch (IOException e) {
-				throw new YeeException("上传图片失败");
-			}
-			String photoFile = path + fileName;
-			if (photoPath != null && photoPath != "") {
-				photoPath += "," + photoFile;
-			} else {
-				photoPath = photoFile;
-			}
-
-		}
-		fireCar.setPhotoPath(photoPath);
-		iFireCarDao.save(fireCar);
-		return fireCar;
-	}
+//	@Override
+//	public FireCarDetailVo findFireCarById(String toke,String product,String appKey,Long truckId) {
+//		FireCarDetailVo carVo = fireCarMapper.getFireCarDetailById(truckId);
+//		DepartmentModel departmentModel= remoteSecurityService.getDepartmentByDeptId(toke, product, appKey, carVo.getDeptId());
+//		carVo.setDepartmentName(departmentModel != null ? departmentModel.getDepartmentName() : "");
+//		return carVo;
+//	}
+
+
+//	@Override
+//	@Transactional(rollbackFor = Exception.class)
+//	public FireCar saveFireCarAndPhoto(FireCar fireCar, MultipartFile[] files) {
+//		Long carId = fireCar.getId();
+//		fireCar.setCreateDate(new Date());
+//		fireCar = iFireCarDao.saveAndFlush(fireCar);
+//		String photoPath = "";
+//		for (int i = 0; i < files.length; i++) {
+//			MultipartFile file = files[i];
+//			if (file.isEmpty()) {
+//				continue;
+//			}
+//			String path = FasConstant.UPLOAD_ROOT_PATH + File.separator + FasConstant.UPLOAD_CAR_PATH + File.separator + fireCar.getId();
+//			String filePath = getRootPath() + path;
+//			String fileName = File.separator + file.getOriginalFilename();
+//			try {
+//				File dest = new File(filePath + File.separator + fileName);
+//				if (!dest.exists()) {
+//					if (dest.getParentFile() != null && !dest.getParentFile().exists()) {
+//						dest.getParentFile().mkdirs();
+//					}
+//					dest.createNewFile();
+//				}
+//				file.transferTo(dest);
+//			} catch (IOException e) {
+//				throw new YeeException("上传图片失败");
+//			}
+//			String photoFile = path + fileName;
+//			if (photoPath != null && photoPath != "") {
+//				photoPath += "," + photoFile;
+//			} else {
+//				photoPath = photoFile;
+//			}
+//
+//		}
+//		fireCar.setPhotoPath(photoPath);
+//		iFireCarDao.save(fireCar);
+//		return fireCar;
+//	}
 	
 	private String getRootPath() {
 		String localPath = "";

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

@@ -148,13 +148,15 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
             return CommonResponseUtil.failure(type + "字典类型不存在");
         }
         //2.返回存在的数据
-        return CommonResponseUtil.success(planVisual3dMapper.getResourceListByType(type));
+//        return CommonResponseUtil.success(planVisual3dMapper.getResourceListByType(type));
+        return CommonResponseUtil.success();
     }
 
     @Override
     public List<Map<String, Object>> getResourceById(String type, Long id) {
         //1.查询出要返回数据
-        Map<String, Object> map = planVisual3dMapper.queryOneByTypeAndId(type, id);
+//        Map<String, Object> map = planVisual3dMapper.queryOneByTypeAndId(type, id);
+        Map<String, Object> map = new HashMap<String, Object>();
         //1.1无数据则返回
         if (CollectionUtils.isEmpty(map)) {
             return new ArrayList<>();

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.IFireCarDao;
 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;
@@ -81,7 +80,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.FireCar;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireStation;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
@@ -105,8 +103,6 @@ public class View3dServiceImpl implements IView3dService {
     @Autowired
     private IRiskSourceDao iRiskSourceDao;
     @Autowired
-    private IFireCarDao iFireCarDao;
-    @Autowired
     private IFireEquipmentDao iFireEquipmentDao;
     @Autowired
     private IFireStationDao iFireStationDao;
@@ -179,17 +175,17 @@ public class View3dServiceImpl implements IView3dService {
     }
 
     public void updateFireCarPosition(BindPointBo pointBo) {
-       Optional<FireCar> data = iFireCarDao.findById(pointBo.getPointId());
-       if(data.isPresent()){
-           FireCar fireCar = data.get();
-           String ue4Location = pointBo.getUe4Location();
-           String ue4Rotation = pointBo.getUe4Rotation();
-           String position3d = pointBo.getPosition3d();
-           if(ue4Location != null) fireCar.setUe4Location(ue4Location);
-           if(ue4Rotation != null) fireCar.setUe4Rotation(ue4Rotation);
-           if(position3d != null) fireCar.setPosition3d(position3d);
-           iFireCarDao.save(fireCar);
-       }
+//       Optional<FireCar> data = iFireCarDao.findById(pointBo.getPointId());
+//       if(data.isPresent()){
+//           FireCar fireCar = data.get();
+//           String ue4Location = pointBo.getUe4Location();
+//           String ue4Rotation = pointBo.getUe4Rotation();
+//           String position3d = pointBo.getPosition3d();
+//           if(ue4Location != null) fireCar.setUe4Location(ue4Location);
+//           if(ue4Rotation != null) fireCar.setUe4Rotation(ue4Rotation);
+//           if(position3d != null) fireCar.setPosition3d(position3d);
+//           iFireCarDao.save(fireCar);
+//       }
     }
 
     public void updateWaterSourcePosition(BindPointBo pointBo) {

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

@@ -2,25 +2,22 @@ package com.yeejoin.amos.fas.business.service.intfc;
 
 import java.util.HashMap;
 
-import com.yeejoin.amos.fas.dao.entity.FireCar;
 import org.springframework.data.domain.Page;
-import org.springframework.web.multipart.MultipartFile;
 
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
-import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
 
 public interface IFireCarService {
 
 	Page<HashMap<String, Object>> queryFireCar(String toke,String product,String appKey,CommonPageInfoParam param);
 
-	FireCarDetailVo findFireCarById(String toke,String product,String appKey,Long id);
+//	FireCarDetailVo findFireCarById(String toke,String product,String appKey,Long id);
 
-	FireCar save(FireCar fireCar);
+//	FireCar save(FireCar fireCar);
 
-	FireCar queryOne(Long id);
+//	FireCar queryOne(Long id);
 
 	String [] delete(String []idArray) throws Exception;
 
-	FireCar saveFireCarAndPhoto(FireCar fireCar, MultipartFile[] file);
+//	FireCar saveFireCarAndPhoto(FireCar fireCar, MultipartFile[] file);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/FireCarDetailVo.java

-package com.yeejoin.amos.fas.business.vo;
-
-import com.yeejoin.amos.fas.dao.entity.FireCar;
-
-public class FireCarDetailVo extends FireCar {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	private String departmentName;
-
-	public String getDepartmentName() {
-		return departmentName;
-	}
-
-	public void setDepartmentName(String departmentName) {
-		this.departmentName = departmentName;
-	}
-}
+//package com.yeejoin.amos.fas.business.vo;
+//
+//import com.yeejoin.amos.fas.dao.entity.FireCar;
+//
+//public class FireCarDetailVo extends FireCar {
+//
+//	/**
+//	 * 
+//	 */
+//	private static final long serialVersionUID = 1L;
+//	
+//	private String departmentName;
+//
+//	public String getDepartmentName() {
+//		return departmentName;
+//	}
+//
+//	public void setDepartmentName(String departmentName) {
+//		this.departmentName = departmentName;
+//	}
+//}

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

@@ -5,7 +5,7 @@
 	<!--查询 0-设备类；1-耗材类;2-视频监控;3-灭火器材'-->
 	<select id="getResourceListByType" resultType="java.util.HashMap">
 	
-		SELECT
+		<!-- SELECT
 		 rs.id as `key` ,
 		 rs.id AS `value`,
 		 rs.name as label,
@@ -46,11 +46,11 @@
 			<when test="type=='pool'">
 				(SELECT a.id,a.`name`,a.code FROM `f_water_resource` a where a.type = '2') as rs
 			</when>
-		</choose>
+		</choose> -->
 	</select>
 
 	<select id="queryOneByTypeAndId" resultType="hashmap">
-		SELECT
+		<!-- SELECT
 			*
 		from
 		<choose>
@@ -88,6 +88,6 @@
 				(SELECT * FROM `f_water_resource` a where a.type = '2') as rs
 			</when>
 		</choose>
-		where rs.id = #{id}
-	</select>
+		where rs.id = #{id}-->
+	</select> 
 </mapper>
\ No newline at end of file

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

@@ -3,17 +3,18 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.FireCarMapper">
 	<!--统计-->
-	<select id="countPageData" resultType="long">
+	<!-- <select id="countPageData" resultType="long">
 		SELECT
 		count(1) AS total_num
 		FROM
 		f_fire_car a
 	<trim prefix="WHERE" prefixOverrides="AND ">
 		<if test="name!=null"> and a.name like concat(concat("%",#{name}),"%")</if>
-	</trim>
-	</select>
+	</trim> 
+	</select>-->
 	<!--分页查询 -->
-	<select id="getFireCarPage" resultType="java.util.HashMap">
+	<!-- <select id="getFireCarPage" resultType="java.util.HashMap">
+	
 		SELECT
 			a.id,
 			a.dept_id,
@@ -43,9 +44,9 @@
 		<choose>
 	     <when test="pageSize==-1"></when>
 	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>  
-	    </choose>
-	</select>
-	
+	    </choose> 
+	</select>-->
+	<!-- 
 	<select id="getFireCarDetailById" resultType="com.yeejoin.amos.fas.business.vo.FireCarDetailVo">
 	   SELECT
 		    a.id,
@@ -76,5 +77,5 @@
 		    f_fire_car a
 		WHERE 1=1
 		<if test="truckId!=null"> AND a.id = #{truckId}</if>
-	</select>
+	</select> -->
 </mapper>
\ No newline at end of file