修改装备统计

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

@@ -842,10 +842,12 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取装备类型和统计值", notes = "获取装备类型和统计值")
     @GetMapping(value = "/getEquipmentTypeAndCount/tree")
-    public Object getEquipmentTypeAndCount( @RequestParam(required = false) String bizOrgCode) throws Exception {
-        return fireFightingSystemService.getEquipmentTypeAndCount(bizOrgCode);
+    public Object getEquipmentTypeAndCount( @RequestParam(required = false) String bizOrgCode,@RequestParam(required = false) String isiot) throws Exception {
+        return fireFightingSystemService.getEquipmentTypeAndCount(bizOrgCode,isiot);
     }
- 
+
+
+
     /**
      * 获取车辆类型和统计值
      * @throws Exception 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentCategoryMapper.java

@@ -54,7 +54,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
 	List<EquipmentCategory> getEquipmentCategoryList(Integer head);
 	List<EquipmentCategory>  getEquipmentCategoryListNew( @Param("head") Integer code,  @Param("carCode") String carCode,  @Param("waterCode") String waterCode);
-	List<Map<String,Object>> getequipmentListEQNew();
+	List<Map<String,Object>> getequipmentListEQNew(@Param("isiot") String isiot);
 	List<EquipmentCategory> getEquipmentCategoryListNotFacilities(Integer head);
 
 	List<EquipmentCategory> getEquipmentCategoryListByFacilities(Integer head);

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

@@ -48,7 +48,7 @@ public interface IEquipmentCategoryService extends IService<EquipmentCategory> {
 
 	List<EquipmentCategory> getEquipmentCategoryList(Integer head);
 	List<EquipmentCategory> getEquipmentCategoryListNew(Integer head,String carCode,String waterCode);
-	List<Map<String,Object>> getequipmentListEQNew();
+	List<Map<String,Object>> getequipmentListEQNew(String isiot);
 	List<EquipmentCategory> getEquipmentCategoryListNotFacilities(Integer head) ;
 
 	List<EquipmentCategory> getEquipmentCategoryListByFacilities(Integer head) ;

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

@@ -221,7 +221,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      * @return
      * @throws Exception
      */
-    Object getEquipmentTypeAndCount(String bizOrgCode) throws Exception;
+    Object getEquipmentTypeAndCount(String bizOrgCode,String isiot) throws Exception;
 
     /***
      * 车辆类型和统计值

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

@@ -399,8 +399,8 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
     }
 
     @Override
-    public List<Map<String, Object>> getequipmentListEQNew() {
-        return this.baseMapper.getequipmentListEQNew();
+    public List<Map<String, Object>> getequipmentListEQNew(String isiot) {
+        return this.baseMapper.getequipmentListEQNew(isiot);
     }
 
     public List<EquipmentCategory> getEquipmentCategoryListNotFacilities(Integer head) {

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

@@ -1151,19 +1151,19 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public Object getEquipmentTypeAndCount(String bizOrgCode) {
+    public Object getEquipmentTypeAndCount(String bizOrgCode,String isiot) {
 //        if (redisUtils.hasKey(equipTypeAndCount + bizOrgCode)) {
 //            return JSONArray.parseArray(
 //                    JSONArray.toJSONString(redisUtils.get(equipTypeAndCount + bizOrgCode)), EquipmentCategory.class);
 //        } else {
-        return refreshEquipmentTypeAndCountNew(bizOrgCode);
+        return refreshEquipmentTypeAndCountNew(bizOrgCode,isiot);
         // }
     }
 
 
 
 
-    public Object refreshEquipmentTypeAndCountNew(String bizOrgCode) {
+    public Object refreshEquipmentTypeAndCountNew(String bizOrgCode,String isiot) {
         //获取装备分类
         List<EquipmentCategory> responseList= this.iEquipmentCategoryService
                 .getEquipmentCategoryListNew(Integer.valueOf(equipmentCategoryLeftTypeCode),carCode,waterCode);
@@ -1171,15 +1171,15 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             return null;
         }
         //分类数据处理
-        List<EquipmentCategory> list = typeListTreeNew(responseList, bizOrgCode);
+        List<EquipmentCategory> list = typeListTreeNew(responseList, bizOrgCode, isiot);
         return list;
     }
 
-    public List<EquipmentCategory> typeListTreeNew(List<EquipmentCategory> equipmentCategorys, String bizOrgCode) {
+    public List<EquipmentCategory> typeListTreeNew(List<EquipmentCategory> equipmentCategorys, String bizOrgCode,String isiot) {
         List<EquipmentCategory> list = new ArrayList<>();
         Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
         // 查询所有装备
-        List<Map<String,Object>> listMP = this.iEquipmentCategoryService.getequipmentListEQNew();
+        List<Map<String,Object>> listMP = this.iEquipmentCategoryService.getequipmentListEQNew(isiot);
         equipmentCategorys.forEach(action -> {
            //根据条件获取装备数量
             List<Map<String,Object>> listM=  listMP.stream().filter(x->x.get("code").toString().contains(action.getCode())&&x.get("bizOrgCode").toString().contains(bizOrgCode)).collect(Collectors.toList());

amos-boot-system-equip/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -348,6 +348,11 @@
         ( `s`.`equipment_code` = `e`.`code` )
         AND ( `e`.`category_id` = `c`.`id` )
         AND ( `s`.`biz_org_code` != '' )
+        <if test="isiot != null and isiot!='' ">
+        AND ( `e`.`is_iot` =#{isiot} )
+        </if>
+
+
         )
     </select>