修改bug

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

@@ -3,6 +3,7 @@ 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;
@@ -69,8 +70,9 @@ public class FireCarController extends BaseController {
 	//@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) {
-		
+	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);
@@ -78,5 +80,4 @@ public class FireCarController extends BaseController {
 		fireCarService.saveFireCarAndPhoto(fireCar,file);
 		return CommonResponseUtil.success();
 	}
-
 }

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

@@ -55,7 +55,12 @@ public class FireStationController extends BaseController {
 			fireStationFireEquipment.setCreateBy("0");
 			fireStationFireEquipment.setCreateDate(new Date());
 		}
-		return CommonResponseUtil.success(iFireStationService.saveStationFireEquipment(fireStationFireEquipments));
+		try {
+			List<FireStationFireEquipment> fireStationFireEquipments1 = iFireStationService.saveStationFireEquipment(fireStationFireEquipments);
+			return CommonResponseUtil.success(fireStationFireEquipments1);
+		} catch (Exception e){
+			return CommonResponseUtil.failure(e.getMessage());
+		}
 	}
 
 	@ApiOperation(httpMethod = "DELETE", value = "解除绑定消防设备", notes = "解除绑定消防设备")

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

@@ -105,7 +105,7 @@ public class FireCarServiceImpl implements IFireCarService {
 				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));
 				content.forEach(e -> {
-					e.put("departmentName",deptMap.get(e.get("dept_id")));
+					e.put("departmentName",deptMap.get(Long.valueOf(e.get("dept_id").toString())));
 				});
             }
         }

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

@@ -588,9 +588,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     public Page<Map<String, Object>> listFmeaPointInputitem(String toke,String product,String appKey,Long fmeaId, Integer pageNumber, Integer pageSize) {
         List<Map<String, Object>> content = Lists.newArrayList();
+        CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         long total = fmeaPointInputitemMapper.countByFmeaId(fmeaId);
         if (total == 0L) {
-            return new PageImpl<>(content, null, total);
+            return new PageImpl<>(content, pageable, total);
         }
         content = fmeaPointInputitemMapper.listByFmeaId(fmeaId, pageNumber, pageSize);
         if(!CollectionUtils.isEmpty(content)){
@@ -621,14 +622,14 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 e.put("tel",userMap.get(String.valueOf(e.get("deptId")+"tel")));
             });
         }
-        return new PageImpl<>(content, null, total);
+        return new PageImpl<>(content, pageable, total);
     }
 
     @Override
     public Page<Map<String, Object>> listFeamEquipmentPoint(Long fmeaId, Integer pageNumber, Integer pageSize) {
         long total = fmeaEquipmentPointMapper.countByFmeaId(fmeaId);
         List<Map<String, Object>> content = fmeaEquipmentPointMapper.listByFmeaId(fmeaId, pageNumber, pageSize);
-        return new PageImpl<>(content, null, total);
+        return new PageImpl<>(content, new CommonPageable(pageNumber, pageSize), total);
     }
 
 

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

@@ -98,7 +98,7 @@ public class WaterResourceServiceImpl implements IWaterResourceService {
 			for(WaterResourceEquipment waterResourceEquipment:waterResourceEquipments){
 				WaterResourceEquipment saveWaterResourceEquipment = iWaterResourceEquipmentDao.findByWaterResourceIdAndFireEquipmentId(waterResourceEquipment.getWaterResourceId(),waterResourceEquipment.getFireEquipmentId());
 				if(StringUtil.isNotEmpty(saveWaterResourceEquipment)){
-					deleteList.add(waterResourceEquipment);
+					deleteList.add(saveWaterResourceEquipment);
 				}
 			}
 			iWaterResourceEquipmentDao.deleteAll(deleteList);

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

@@ -45,6 +45,7 @@
 			left join f_risk_source frs on frs.id = f.risk_source_id
 			WHERE
 				fs.fire_station_id = ${fireStationId}
+				and f.id is not null
 			LIMIT ${start}, ${length};
 	</select>
 

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

@@ -100,6 +100,7 @@
 			left join f_risk_source frs on frs.id = f.risk_source_id
 			WHERE
 				fs.water_resource_id = ${waterResourceId}
+				and f.id is not null
 			LIMIT ${start}, ${length};
 	</select>