提交数据刷新的修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -237,9 +237,9 @@ public class CarController extends AbstractBaseController {
 				}
 			});
 		}
-		
+		Car  car2=	iCarService.saveOne(car);
 		refreshCount(car.getBizOrgCode());
-		return iCarService.saveOne(car);
+		return car2;
 	}
 
 	@Async
@@ -310,8 +310,9 @@ public class CarController extends AbstractBaseController {
 //		carInstance = iCarService.saveCar(getUserInfo(), carInstance, carInfo, carpList);
 		// saveFile(carInstance);视频图片文件后期统一处理
 		EquipmentSpecificSerivceImpl.registerMqttTopic(car.getIotCode(), equipmentIotMqttReceiveConfig);
+	Car car1=	iCarService.updateOneById(car);
 		refreshCount(car.getBizOrgCode());
-		return iCarService.updateOneById(car);
+		return car1;
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -96,8 +96,9 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDetail saveEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDetail equipmentDetail) {
-      	equipmentSpecificSerivce.refreshStaData();
-        return iEquipmentDetailService.saveOne(equipmentDetail);
+    	EquipmentDetail detail=	iEquipmentDetailService.saveOne(equipmentDetail);
+    	equipmentSpecificSerivce.refreshStaData();
+        return detail;
     }
     @Async
    	public void refreshCount(String bizOrgCode) {
@@ -115,7 +116,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
-    	equipmentSpecificSerivce.refreshStaData();
+    	
         if (equipmentDate.getEquipmentSpecific().getSingle() == null) {
             throw new BadRequest("管理方式未输入");
         }
@@ -151,6 +152,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         if (syncSwitch) {
             equipmentSpecificSerivce.equipSpecificDataSync(equipmentId);
         }
+        equipmentSpecificSerivce.refreshStaData();
         return date;
     }
 
@@ -216,7 +218,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public EquipmentDate updateByIdEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDate equipmentDate) {
-    	equipmentSpecificSerivce.refreshStaData();
+    	
         EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
         String sysCode = vo.getCode();
         if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())) {
@@ -259,6 +261,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         if (syncSwitch) {
             equipmentSpecificSerivce.equipSpecificDataSync(bean.getEquipmentId());
         }
+        equipmentSpecificSerivce.refreshStaData();
         return equipmentDate;
     }
 
@@ -273,16 +276,22 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
+    boolean falg=	iEquipmentDetailService.removeOneById(id);
+    if(falg) {
     	equipmentSpecificSerivce.refreshStaData();
-        return iEquipmentDetailService.removeOneById(id);
+    }
+        return falg ;
     }
 
     @RequestMapping(value = "/updatequota", method = RequestMethod.PUT)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public boolean quotaUpdate(HttpServletRequest request, @RequestBody List<EquProperty> e) {
-    	equipmentSpecificSerivce.refreshStaData();
-        return iEquipmentDetailService.quotaUpdate(e);
+    	 boolean falg=		iEquipmentDetailService.quotaUpdate(e);
+    	if(falg) {
+        	equipmentSpecificSerivce.refreshStaData();
+        }
+        return falg;
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockServiceImpl.java

@@ -287,7 +287,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<EquipmentSpecific> uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel) {
-    	equipmentSpecificSerivce.refreshStaData();//添加对于装备类型统计数据的刷新
+    	
     	StringBuffer fireFightSysIdsBuffer = new StringBuffer();
         SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
         List<EquipmentSpecific> list = new ArrayList<>();
@@ -467,6 +467,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             this.equipmentSpecificIndexSave(equipmentDetail, equipmentSpecific);
         }
         relationRedisUtil.delSysRedisKey(fireFightSysIdsBuffer.toString());
+        equipmentSpecificSerivce.refreshStaData();//添加对于装备类型统计数据的刷新
         return list;
     }