修改装备统计数

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

@@ -53,6 +53,8 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 	int checkUsed( String id );
 
 	List<EquipmentCategory> getEquipmentCategoryList(Integer head);
+	List<EquipmentCategory>  getEquipmentCategoryListNew( @Param("head") Integer code, @Param("type") String type);
+	List<Map<String,Object>> getequipmentListEQNew();
 	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

@@ -9,6 +9,7 @@ import com.yeejoin.equipmanage.common.entity.vo.EquipmentCategoryTypeTreeVO;
 import com.yeejoin.equipmanage.common.vo.IndustryVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 装备分类 服务类
@@ -46,7 +47,8 @@ public interface IEquipmentCategoryService extends IService<EquipmentCategory> {
 	int checkUsed( List<String> ids);
 
 	List<EquipmentCategory> getEquipmentCategoryList(Integer head);
-
+	List<EquipmentCategory> getEquipmentCategoryListNew(Integer head,String type);
+	List<Map<String,Object>> getequipmentListEQNew();
 	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/impl/EquipmentCategoryServiceImpl.java

@@ -390,6 +390,15 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
     public List<EquipmentCategory> getEquipmentCategoryList(Integer head) {
         return this.baseMapper.getEquipmentCategoryList(head);
     }
+    @Override
+    public List<EquipmentCategory> getEquipmentCategoryListNew(Integer head,String type) {
+        return this.baseMapper.getEquipmentCategoryListNew(head,type);
+    }
+
+    @Override
+    public List<Map<String, Object>> getequipmentListEQNew() {
+        return this.baseMapper.getequipmentListEQNew();
+    }
 
     public List<EquipmentCategory> getEquipmentCategoryListNotFacilities(Integer head) {
         return this.baseMapper.getEquipmentCategoryListNotFacilities(head);

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

@@ -1151,10 +1151,60 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 //            return JSONArray.parseArray(
 //                    JSONArray.toJSONString(redisUtils.get(equipTypeAndCount + bizOrgCode)), EquipmentCategory.class);
 //        } else {
-        return refreshEquipmentTypeAndCount(bizOrgCode);
+        return refreshEquipmentTypeAndCountNew(bizOrgCode);
         // }
     }
 
+
+
+
+    public Object refreshEquipmentTypeAndCountNew(String bizOrgCode) {
+
+        List<EquipmentCategory> responseList= this.iEquipmentCategoryService
+                .getEquipmentCategoryListNew(Integer.valueOf(equipmentCategoryLeftTypeCode),"eq");
+        if (responseList == null || responseList.size() < 1) {
+            return null;
+        }
+        List<EquipmentCategory> list = typeListTreeNew(responseList, bizOrgCode);
+        return list;
+    }
+
+    public List<EquipmentCategory> typeListTreeNew(List<EquipmentCategory> equipmentCategorys, String bizOrgCode) {
+        List<EquipmentCategory> list = new ArrayList<>();
+        Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
+        // 查询所有装备
+        List<Map<String,Object>> listMP = this.iEquipmentCategoryService.getequipmentListEQNew();
+        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());
+            int num=listM!=null?listM.size():0;
+
+
+            action.setCount(Double.parseDouble(num + ""));
+            if (action.getParentId() == null) {
+                list.add(action);
+            } else {
+                if (tmpMap.get(action.getParentId().toString()) == null) {
+                    ArrayList<EquipmentCategory> tmplist = new ArrayList<EquipmentCategory>();
+                    tmplist.add(action);
+                    tmpMap.put(action.getParentId().toString(), tmplist);
+                } else {
+                    if (!tmpMap.get(action.getParentId().toString()).contains(action)) {
+                        tmpMap.get(action.getParentId().toString()).add(action);
+                    }
+                }
+            }
+        });
+        getChildren(list, tmpMap);
+        return list;
+    }
+
+
+
+
+
+
+
     @Override
     public Object refreshEquipmentTypeAndCount(String bizOrgCode) {
         List<EquipmentCategory> responseList = this.typeList();

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

@@ -304,6 +304,57 @@
                  left join wl_industry i on ec.industry_code = i.code
     </select>
 
+
+
+    <select id="getEquipmentCategoryListNew" resultMap="Category">
+        SELECT ec.id,
+               ec.parent_id,
+               ec.CODE,
+               ec.NAME,
+               ec.is_consumptive,
+               ec.description,
+               ec.industry_code,
+               ec.remark,
+               ec.create_date,
+               i.`name` as industryName,
+               -- industry_code = 2代表消防设备
+               IF(LEFT(ec.CODE, 1) = #{head} and ec.industry_code = 2, 'car', 'equipment')
+                        AS type
+        FROM wl_equipment_category ec
+        left join wl_industry i on ec.industry_code = i.code
+        WHERE 1=1
+        <if test="type != null">
+            and left(ec.code,1) != '2'
+            and left(ec.code,4) !='9306'
+            and ec.industry_code = 2
+        </if>
+
+
+    </select>
+
+
+
+
+    <select id="getequipmentListEQNew" resultType="Map">
+        SELECT
+        `s`.`biz_org_code` AS `bizOrgCode`,
+        `c`.`code` AS `categoryCode`,
+        `getParentListEQ` ( `c`.`id` ) AS `code`
+        FROM
+        ( ( `wl_equipment_specific` `s` JOIN `wl_equipment` `e` ) JOIN `wl_equipment_category` `c` )
+        WHERE
+        (
+        ( `s`.`equipment_code` = `e`.`code` )
+        AND ( `e`.`category_id` = `c`.`id` )
+        AND ( `s`.`biz_org_code` != '' )
+        )
+
+    </select>
+
+
+
+
+
     <select id="getEquipmentCategoryListNotFacilities" resultMap="Category">
         SELECT ec.id,
                ec.parent_id,