Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
@@ -169,17 +170,39 @@ public class FireFightingSystemController extends AbstractBaseController {
     @RequestMapping(value = "/alarmSystem/info", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("通过systemCode查询消防系统信息")
-    public List<Map<String,Object>> getEquip(@RequestParam(required = false) String systemCode) {
-        return fireFightingSystemService.getEquip(systemCode);
+    public List<Map<String,Object>> getEquip(@RequestParam(required = false) String bizOrgCode,
+                                             @RequestParam(required = false) String systemCode) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (StringUtils.isEmpty(bizOrgCode)) {
+                    return Lists.newArrayList();
+                }
+            }
+        }
+        return fireFightingSystemService.getEquip(bizOrgCode, systemCode);
     }
 
     //查询系统下设备状态
     @RequestMapping(value = "/getFireSystemEquipStatusList", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("通过systemCode、设备分类编码字符串查询消防系统信息")
-    public List<Map<String,Object>> getFireSystemEquipStatusList(@RequestParam(required = false) String systemCode,
+    public List<Map<String,Object>> getFireSystemEquipStatusList(@RequestParam(required = false) String bizOrgCode,
+                                                                 @RequestParam(required = false) String systemCode,
                                                                  @RequestParam(required = false) String categoryCodes) {
-        return fireFightingSystemService.getFireSystemEquipStatusList(systemCode, categoryCodes);
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (StringUtils.isEmpty(bizOrgCode)) {
+                    return Lists.newArrayList();
+                }
+            }
+        }
+        return fireFightingSystemService.getFireSystemEquipStatusList(bizOrgCode, systemCode, categoryCodes);
     }
 
 

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

@@ -642,9 +642,9 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> selectAllDays();
 
-    List<Map<String, Object>> getEquip(String systemCode);
+    List<Map<String, Object>> getEquip(String bizOrgCode, String systemCode);
 
-    List<Map<String, Object>> getFireSystemEquipStatusList(String systemCode, String categoryCodes);
+    List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, String systemCode, String categoryCodes);
 
     List<Map<String, Object>> selectPressureDetails(@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

@@ -171,9 +171,9 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      */
     FireFightingSystemEntity getDetailByCode(String systemCode);
 
-    List<Map<String,Object>> getEquip(String systemCode);
+    List<Map<String,Object>> getEquip(String bizOrgCode, String systemCode);
 
-    List<Map<String, Object>> getFireSystemEquipStatusList(String systemCode, String categoryCodes);
+    List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, String systemCode, String categoryCodes);
 
     /**
      * 集成页面系统数据

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

@@ -977,8 +977,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<Map<String, Object>> getEquip(String systemCode) {
-        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip(systemCode);
+    public List<Map<String, Object>> getEquip(String bizOrgCode, String systemCode) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getEquip(bizOrgCode, systemCode);
         List<Map<String, Object>> resList = new ArrayList<>();
         int i = 1;
         if (0 < list.size()) {
@@ -987,8 +987,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 Map<String, Object> map = new HashMap<>();
                 Map<String, Object> statusMap = new HashMap<>();
                 map.put("key", i);
-                map.put("name", m.get("equipmentName"));
-                map.put("code", m.get("equipmentCode"));
+                map.put("name", m.get("name"));
+                map.put("code", m.get("code"));
                 map.put("systemTypeCode", systemCode);
                 map.put("img", m.get("shbzImg"));
                 statusMap.put("name", m.get("status"));
@@ -1007,8 +1007,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public List<Map<String, Object>> getFireSystemEquipStatusList(String systemCode, String categoryCodes) {
-        List<Map<String, Object>> list = fireFightingSystemMapper.getFireSystemEquipStatusList(systemCode, categoryCodes);
+    public List<Map<String, Object>> getFireSystemEquipStatusList(String bizOrgCode, String systemCode, String categoryCodes) {
+        List<Map<String, Object>> list = fireFightingSystemMapper.getFireSystemEquipStatusList(bizOrgCode, systemCode, categoryCodes);
         List<Map<String, Object>> resList = new ArrayList<>();
         int i = 1;
         if (0 < list.size()) {

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

@@ -5605,9 +5605,8 @@
     <select id="getEquip" resultType="java.util.Map">
         SELECT
             spe.id,
-            det.`name` equipmentName,
-            spe.`code`,
-            det.`code` equipmentCode,
+            wle.`name`,
+            wle.`code`,
             (
                 CASE
                     ( SELECT count(*) FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = spe.id AND STATUS = 1 )
@@ -5623,6 +5622,9 @@
                 LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
         WHERE
             fs.system_type_code IS NOT NULL
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND spe.biz_org_code like concat(#{bizOrgCode}, '%')
+            </if>
             <if test="systemCode != null and systemCode != ''">
                 AND fs.system_type_code = #{systemCode}
             </if>
@@ -5649,6 +5651,9 @@
                 LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
         WHERE
             fs.system_type_code IS NOT NULL
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND spe.biz_org_code like concat(#{bizOrgCode}, '%')
+            </if>
             <if test="systemCode != null and systemCode != ''">
                 AND fs.system_type_code = #{systemCode}
             </if>