提交类型树的添加缓存操作

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

@@ -18,6 +18,7 @@ import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
 import com.yeejoin.equipmanage.mapper.ManufacturerInfoMapper;
 import com.yeejoin.equipmanage.mapper.StockDetailMapper;
 import com.yeejoin.equipmanage.service.*;
+import com.yeejoin.equipmanage.service.impl.FireFightingSystemServiceImpl;
 import com.yeejoin.equipmanage.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -82,7 +84,9 @@ public class EquipmentDetailController extends AbstractBaseController {
 
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
-
+    
+    @Autowired
+    FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
     /**
      * 新增
      *
@@ -92,9 +96,18 @@ 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);
     }
-
+    @Async
+   	public void refreshCount(String bizOrgCode) {
+       	equipmentSpecificSerivce.refreshStaData();
+   		try {
+   			fireFightingSystemServiceImpl.refreshCarTypeAndCount(bizOrgCode);
+   		} catch (Exception e) {
+   		}
+
+   	}
     /**
      * 设备新增带打码入库
      ***/
@@ -102,6 +115,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("管理方式未输入");
         }
@@ -202,6 +216,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())) {
@@ -258,6 +273,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
+    	equipmentSpecificSerivce.refreshStaData();
         return iEquipmentDetailService.removeOneById(id);
     }
 
@@ -265,6 +281,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public boolean quotaUpdate(HttpServletRequest request, @RequestBody List<EquProperty> e) {
+    	equipmentSpecificSerivce.refreshStaData();
         return iEquipmentDetailService.quotaUpdate(e);
     }
 

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

@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,13 +30,13 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.dto.SourceNameListDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.DetailPaneVO;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
+import com.yeejoin.equipmanage.service.impl.FireFightingSystemServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -71,11 +72,9 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表分页查询", notes = "补码列表接口,废弃未用到")
     public IPage<ComplementCodeVO> saveEquipmentPoint(@RequestBody EquipmentSpecificDTO equipmentSpecific) {
-    	equipmentSpecificSerivce.refreshStaData();
         return equipmentSpecificSerivce.selectEquipmentSpecific(equipmentSpecific);
     }
 
-
     /**
      * 通过id获取设备区域建筑等信息
      *
@@ -107,9 +106,8 @@ public class EquipmentSpecificController extends AbstractBaseController {
      */
     @RequestMapping(value = "/exit", method = RequestMethod.POST)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "POST", value = "修改", notes = "修改")
+    @ApiOperation(httpMethod = "POST", value = "修改"	, notes = "修改")
     public EquipmentSpecific updateEquipmentSpecific(@RequestBody EquipmentSpecific equipmentSpecific) {
-    	equipmentSpecificSerivce.refreshStaData();
         EquipmentSpecific updateEquipmentSpecific = equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
         if (syncSwitch) {
             // TODO 后续判断成功，执行同步
@@ -249,7 +247,6 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation( value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
-    	equipmentSpecificSerivce.refreshStaData();
         return CommonResponseUtil.success(equipmentSpecificSerivce.delEquipmentBySpecificId(specificId));
     }
     
@@ -262,7 +259,6 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation( value = "批量删除装备相关所有数据", notes = "批量删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestBody List<Long> specificIds) {
-    	equipmentSpecificSerivce.refreshStaData();
     	if(ObjectUtils.isEmpty(specificIds)){
     		 return CommonResponseUtil.failure("参数为空");
     	}

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

@@ -59,6 +59,7 @@ import com.yeejoin.equipmanage.mapper.StockMapper;
 import com.yeejoin.equipmanage.service.EquipmentManageService;
 import com.yeejoin.equipmanage.service.IEquipmentIndexService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import com.yeejoin.equipmanage.service.IEquipmentSystemSourceStatisticsService;
 import com.yeejoin.equipmanage.service.IFireFightingSystemService;
 import com.yeejoin.equipmanage.service.IJournalService;
@@ -122,6 +123,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Autowired
     private RelationRedisUtil relationRedisUtil;
 
+    @Autowired
+    IEquipmentSpecificSerivce equipmentSpecificSerivce;
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public StockBill in(List<StockDetail> list, String type, AgencyUserModel agencyUserModel) {
@@ -284,7 +287,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<EquipmentSpecific> uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel) {
-        StringBuffer fireFightSysIdsBuffer = new StringBuffer();
+    	equipmentSpecificSerivce.refreshStaData();//添加对于装备类型统计数据的刷新
+    	StringBuffer fireFightSysIdsBuffer = new StringBuffer();
         SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
         List<EquipmentSpecific> list = new ArrayList<>();
         if (equipmentDetailDownloadVOS.size() == 0) {