消防系统修改

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

@@ -449,17 +449,6 @@ public class FireFightingSystemController extends AbstractBaseController {
 
 
     /**
-     * 获取点位图，区域树数据
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "获取点位图，区域树数据", notes = "消防系统点位图使用")
-    @GetMapping(value = "/point/tree")
-    public List<PointTreeVo> getPointTree(@RequestParam(required = false) String systemId) {
-        return fireFightingSystemService.getPointTree(systemId, getOrgCode());
-    }
-
-
-    /**
      * 设备报警信息
      *
      * @param id
@@ -641,7 +630,30 @@ public class FireFightingSystemController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "获取系统分类树", notes = "获取系统分类树")
     @GetMapping(value = "/systemTypeTree")
-    public List<FireFightingSystemTypeTreeVo> systemTypeTree() {
-        return fireFightingSystemService.systemTypeTree();
+    public List<FireFightingSystemTypeTreeVo> systemTypeTree(@RequestParam(required = false) String bizOrgCode) {
+        return fireFightingSystemService.systemTypeTree(bizOrgCode);
+    }
+
+    /**
+     * 根据bizOrgCode获取系统列表不分页
+     *
+     * @return list
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取系统分类树", notes = "获取系统分类树")
+    @GetMapping(value = "/systemListByBziOrgCode")
+    public List<FireFightingSystemEntity> systemListByBziOrgCode(@RequestParam(required = false) String bizOrgCode) {
+        return fireFightingSystemService.systemListByBziOrgCode(bizOrgCode);
+    }
+
+
+    /**
+     * 获取点位图，区域树数据
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取点位图，区域树数据", notes = "消防系统点位图使用")
+    @GetMapping(value = "/point/tree")
+    public List<PointTreeVo> getPointTree(@RequestParam(required = false) String systemId, @RequestParam(required = false) String bizOrgCode) {
+        return fireFightingSystemService.getPointTree(systemId, bizOrgCode);
     }
 }

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

@@ -214,4 +214,11 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      */
     Map<String,Object> fireFoamSysEquipmentNumber();
 
+    /**
+     * 根据bizorgcode获取系统分类数量
+     * @param bizOrgCode
+     * @return
+     */
+    List<Map<String, Object>> listByBizOrgCode(@Param("bizOrgCode") String bizOrgCode);
+
 }

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

@@ -199,5 +199,12 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      *
      * @return
      */
-    List<FireFightingSystemTypeTreeVo> systemTypeTree();
+    List<FireFightingSystemTypeTreeVo> systemTypeTree(String bizOrgCode);
+
+    /**
+     * 获取列表不分页
+     * @param bizOrgCode orgCode
+     * @return
+     */
+    List<FireFightingSystemEntity> systemListByBziOrgCode(String bizOrgCode);
 }

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

@@ -374,7 +374,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 //            responses.add(p);
 //        });
 //        List<PointTreeVo> regionList = responses.stream().filter(r -> "TRUE".equals(r.getIsRegion())).collect(Collectors.toList());
-        List<PointTreeVo> buildList = buildingMapper.getBuildList(null);
+        List<PointTreeVo> buildList = buildingMapper.getBuildList(orgCode);
         return transferListToPointTree(buildList, id);
     }
 
@@ -907,16 +907,21 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<FireFightingSystemTypeTreeVo> systemTypeTree() {
-        // 获取所有系统list
+    public List<FireFightingSystemTypeTreeVo> systemTypeTree(String bizOrgCode) {
+        // 获取所有系统分类list
         LambdaQueryWrapper<DynamicFormGroup> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(DynamicFormGroup::getGroupType, "fireSystem");
         wrapper.eq(DynamicFormGroup::getParentId, 0);
         List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(wrapper);
+        List<Map<String, Object>> typeList = fireFightingSystemMapper.listByBizOrgCode(bizOrgCode);
         List<FireFightingSystemTypeTreeVo> childrenList = list.stream().map(item -> {
             FireFightingSystemTypeTreeVo vo = new FireFightingSystemTypeTreeVo();
             vo.setName(item.getGroupName());
-            vo.setTotal("0");
+            typeList.forEach(obj -> {
+                if (item.getId().equals(Long.valueOf(obj.get("typeId").toString()))) {
+                    vo.setTotal(obj.get("total").toString());
+                }
+            });
             vo.setType(item.getGroupType());
             vo.setId(String.valueOf(item.getId()));
             return vo;
@@ -932,4 +937,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         return Collections.singletonList(parentNode);
     }
 
+    @Override
+    public List<FireFightingSystemEntity> systemListByBziOrgCode(String bizOrgCode) {
+        LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
+        if (StringUtil.isNotEmpty(bizOrgCode)) {
+            wrapper.likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
+        }
+        return this.baseMapper.selectList(wrapper);
+    }
 }

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

@@ -233,16 +233,17 @@
                 AND cd.field_name = 'code'
                 LEFT JOIN wl_form_instance AS bzc ON bzc.instance_id = ins.instance_id
                 AND bzc.field_name = 'bizOrgCode'
+                <where>
+                    <if test="bizOrgCode != null and bizOrgCode != ''">
+                        bzc.field_value = #{bizOrgCode}
+                    </if>
+                </where>
             GROUP BY
                 ins.instance_id
             ORDER BY
                 parentId
             ) t
-        <where>
-            <if test="bizOrgCode != null and bizOrgCode != ''">
-                t.bizOrgCode = #{bizOrgCode}
-            </if>
-        </where>
+
     </select>
     <select id="get3dBuildList" resultType="com.yeejoin.equipmanage.common.entity.vo.PointTreeVo">
         select

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

@@ -1829,32 +1829,16 @@ FROM
         order by createDate DESC
     </select>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    <select id="listByBizOrgCode" resultType="java.util.Map">
+        SELECT
+            form_group_id typeId,
+            COUNT(form_group_id) total
+        FROM
+            f_fire_fighting_system
+        WHERE
+            biz_org_code LIKE CONCAT(#{bizOrgCode}, '%' )
+         GROUP BY 	form_group_id
+    </select>
 
 
 </mapper>