修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrganizationMapper.java

@@ -15,7 +15,9 @@ import java.util.Map;
 public interface OrganizationMapper extends BaseMapper<Organization> {
 
 
-    Page<Map<String, Object>> getOrganizationInfo(Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode);
+    List<Map<String, Object>> getOrganizationInfo(@Param("bizOrgCode") String bizOrgCode);
+
+    Map<String, Object> getTeamLeader();
 
     Page<Map<String, Object>> getOrganizationList(Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode);
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrganizationMapper.xml

@@ -5,12 +5,23 @@
 
 
     <select id="getOrganizationInfo" resultType="java.util.Map">
-
+        SELECT
+            ( SELECT COUNT( 1 ) FROM cb_organization_user cou WHERE cou.emergency_team_id = co.sequence_nbr ) AS
+            value,
+            co.emergency_team_name AS name
+        FROM
+            cb_organization co
+        WHERE co.is_delete = 0
+        ORDER BY
+            co.sort desc
+            LIMIT 5
+    </select>
+    <select id="getTeamLeader" resultType="Map">
         SELECT
             (
                 SELECT
-                  Ifnull  (GROUP_CONCAT( cou.biz_org_name ),'') AS
-            value
+                    Ifnull  (GROUP_CONCAT( cou.biz_org_name ),'') AS
+                value
 
         FROM
             (
@@ -33,24 +44,11 @@
             AND cdfi.field_code = 'userId'
             ) temp
             LEFT JOIN cb_org_usr cou ON cou.sequence_nbr = temp.userId
-            WHERE cou.is_delete = 0
+        WHERE cou.is_delete = 0
             ) AS
             value
             ,
-            '当值值长' AS name UNION
-        (
-        SELECT
-            ( SELECT COUNT( 1 ) FROM cb_organization_user cou WHERE cou.emergency_team_id = co.sequence_nbr ) AS
-            value
-                ,
-            co.emergency_team_name AS name
-        FROM
-            cb_organization co
-        WHERE co.is_delete = 0
-        ORDER BY
-            co.sort desc
-            LIMIT 5
-            )
+            '当值值长' AS name
     </select>
     <select id="getOrganizationList" resultType="java.util.Map">
         SELECT

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

@@ -232,4 +232,6 @@ public interface EquipmentSpecificAlarmMapper extends BaseMapper<EquipmentSpecif
     List<Map<String, Object>> stationInfo();
 
     void updateStatusByAlarm();
+
+    void clearAlarmData(@Param("equipmentSpecificId") Long equipmentSpecificId);
 }

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

@@ -2,6 +2,9 @@ package com.yeejoin.equipmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.equipmanage.common.entity.ManufacturerInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  *  Mapper 接口
@@ -14,7 +17,6 @@ public interface ManufacturerInfoMapper extends BaseMapper<ManufacturerInfo> {
 
     int checkName(String name, Long id);
 
-    String checkDelete(Long id);
-
+    List<String> checkDelete(@Param("ids") List<Long> ids);
 
 }

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

@@ -383,14 +383,8 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 
     @Override
     public String checkDelete(List<Long> ids) {
-        String res = "";
-        for (Long id : ids) {
-            String s = manufacturerInfoMapper.checkDelete(id);
-            if (s != null && !("").equals(s)) {
-                res = res + s + " , ";
-            }
-        }
-        return res;
+        List<String> s = manufacturerInfoMapper.checkDelete(ids);
+        return String.join(",", s);
     }
 
     @Override

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

@@ -1004,6 +1004,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentDetailService.removeById(equipmentSpecific.getEquipmentDetailId());
         }
         if (res > 0) {
+            equipmentSpecificAlarmMapper.clearAlarmData(id);
             // 删除设备动态表单扩展属性
             return formInstanceEquipService.deleteInstanceById(id);
         } else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationImpl.java

@@ -38,32 +38,64 @@ public class OrganizationImpl extends BaseService<Organization, Organization, Or
     @Override
     public Page<Map<String, Object>> getOrganizationInfo(Page<Map<String, Object>> page, String bizOrgCode) {
         Page<Map<String, Object>> page1 = new Page<>();
-        List<Map<String, Object>> list = organizationMapper.getOrganizationInfo(page, bizOrgCode).getRecords();
+        List<Map<String, Object>> list = organizationMapper.getOrganizationInfo(bizOrgCode);
         LambdaQueryWrapper<Organization> wrapper = new LambdaQueryWrapper<>();
         wrapper.orderByDesc(Organization::getSort);
         List<Organization> organizations = this.baseMapper.selectList(wrapper);
         List<Map<String, Object>> res = new ArrayList<>();
         if (0 < list.size()) {
-            for (Map<String, Object> map : list) {
-                Map<String, Object> tempMap = new HashMap<>();
-                if (ObjectUtils.isEmpty(map.get("value"))) {
-                    tempMap.put("name", map.get("name") + "");
-                    tempMap.put("value", "");
-                } else {
-                    tempMap.put("name", map.get("name") + " " + map.get("value") + "人");
-                    Organization organization = organizations.stream().filter(x -> x.getEmergencyTeamName().equals(map.get("name"))).collect(Collectors.toList()).get(0);
-                    String[] nameArr = organization.getGroupLeader().split(",");
+            // 获取值长
+            Map<String, Object> resMap = this.baseMapper.getTeamLeader();
+            Map<String, Object> leaderMap = new HashMap<>();
+            resMap.put("name", "当值值长");
+            resMap.put("value", "aaa");
+            if (ObjectUtils.isEmpty(resMap.get("value"))) {
+                leaderMap.put("name", resMap.get("name") + "");
+                leaderMap.put("value", "");
+            } else {
+                List<Organization> collect = organizations.stream().filter(x -> x.getEmergencyTeamName().equals(resMap.get("name"))).collect(Collectors.toList());
+                if (0 < collect.size()) {
+                    Organization organizationEntity = collect.get(0);
+                    String[] nameArr = organizationEntity.getGroupLeader().split(",");
                     List<String> nameList = Arrays.asList(nameArr);
                     String[] telArr = new String[nameList.size()];
-                    if (ObjectUtils.isNotEmpty(organization.getGroupLeaderTel())) {
-                        telArr = organization.getGroupLeaderTel().split("\n");
+                    if (ObjectUtils.isNotEmpty(organizationEntity.getGroupLeaderTel())) {
+                        telArr = organizationEntity.getGroupLeaderTel().split("\n");
                     }
                     List<String> telList = Arrays.asList(telArr);
                     List<String> valueList = new ArrayList<>();
                     for (int i = 0; i < nameList.size(); i++) {
                         valueList.add(nameList.get(i) + "-" + telList.get(i));
                     }
-                    tempMap.put("value", String.join(",", valueList));
+                    leaderMap.put("name", resMap.get("name") + "");
+                    leaderMap.put("value", String.join(",", valueList));
+                }
+            }
+            res.add(leaderMap);
+
+            for (Map<String, Object> map : list) {
+                Map<String, Object> tempMap = new HashMap<>();
+                if (ObjectUtils.isEmpty(map.get("value"))) {
+                    tempMap.put("name", map.get("name") + "");
+                    tempMap.put("value", "");
+                } else {
+                    tempMap.put("name", map.get("name") + " " + map.get("value") + "人");
+                    List<Organization> organizationList = organizations.stream().filter(x -> x.getEmergencyTeamName().equals(map.get("name"))).collect(Collectors.toList());
+                    if (0 < organizationList.size()) {
+                        Organization organization = organizationList.get(0);
+                        String[] nameArr = organization.getGroupLeader().split(",");
+                        List<String> nameList = Arrays.asList(nameArr);
+                        String[] telArr = new String[nameList.size()];
+                        if (ObjectUtils.isNotEmpty(organization.getGroupLeaderTel())) {
+                            telArr = organization.getGroupLeaderTel().split("\n");
+                        }
+                        List<String> telList = Arrays.asList(telArr);
+                        List<String> valueList = new ArrayList<>();
+                        for (int i = 0; i < nameList.size(); i++) {
+                            valueList.add(nameList.get(i) + "-" + telList.get(i));
+                        }
+                        tempMap.put("value", String.join(",", valueList));
+                    }
                 }
                 res.add(tempMap);
             }

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

@@ -155,10 +155,10 @@
 
 	<select id="checkDelete" resultType="String">
 		select
-		(select name from wl_equipment_detail eq where eq.id = sto.equipment_detail_id) as  name
+					 (select name from wl_equipment_detail eq where eq.id = sto.equipment_detail_id) as  name
 		from wl_stock_detail as sto
 		where
-		equipment_detail_id = #{id}
+			equipment_detail_id = #{id}
 		group by equipment_detail_id
 	</select>
 	<select id="getWareId" resultType="Long">

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

@@ -1589,4 +1589,10 @@
         GROUP BY
             a.`name`
     </select>
+
+    <delete id="clearAlarmData">
+        DELETE FROM wl_equipment_specific_alarm WHERE equipment_specific_id = #{equipmentSpecificId};
+        DELETE FROM wl_equipment_specific_alarm_log WHERE equipment_specific_id = #{equipmentSpecificId};
+        DELETE FROM wl_equipment_alarm_report_day WHERE equipment_specific_id = #{equipmentSpecificId};
+    </delete>
 </mapper>
\ No newline at end of file

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

@@ -26,8 +26,26 @@
      </select>
 
     <select id="checkDelete" resultType="string">
-        select name from wl_equipment_detail where equipment_id  = #{id}
+        select
+            name
+        from
+             wl_equipment_detail
+        <where>
+            equipment_id IN
+            <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </where>
         union
-        select name from wl_car where equipment_id = #{id}
+        select
+               name
+        from
+             wl_car
+        <where>
+            equipment_id IN
+            <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </where>
     </select>
 </mapper>