Merge branch 'develop_dl_3.7.0.9_huaian' into develop_dl

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

@@ -179,7 +179,24 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
      * 根据specificId删除装备相关数据
      * @param specificId specificId
      */
-    void deleteEquipDataBySpecificId(@Param("specificId") Long specificId);
+//    void deleteEquipDataBySpecificId(@Param("specificId") Long specificId, @Param("equipDetailId") Long equipDetailId);
+
+
+    void deleteEquipDetail(@Param("equipDetailId") Long equipDetailId);
+
+    void deleteEquipAlarmLog(@Param("speId") Long speId);
+
+    void deleteEquipAlarm(@Param("speId") Long speId);
+
+    void deleteEquipReportDay(@Param("speId") Long speId);
+
+    void deleteEquipSpecIndex(@Param("speId") Long speId);
+
+    void deleteEquipSpecVideo(@Param("speId") Long speId);
+
+    void deleteEquipSpecRelation(@Param("speId") Long speId);
+
+    void deleteEquipSpec(@Param("speId") Long speId);
 
     /**
      * 根据库存id删除装备相关库存数据

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

@@ -1665,8 +1665,22 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delEquipmentBySpecificId(Long specificId) {
-        // 1.删除相关主表数据
-        this.baseMapper.deleteEquipDataBySpecificId(specificId);
+        EquipmentSpecific specific = equipmentSpecificMapper.selectById(specificId);
+        Long equipDetailId = specific.getEquipmentDetailId();
+//        // 1.删除相关主表数据
+//        this.baseMapper.deleteEquipDataBySpecificId(specificId, equipDetailId);
+        try{
+            this.baseMapper.deleteEquipDetail(equipDetailId);
+            this.baseMapper.deleteEquipAlarmLog(specificId);
+            this.baseMapper.deleteEquipAlarm(specificId);
+            this.baseMapper.deleteEquipReportDay(specificId);
+            this.baseMapper.deleteEquipSpecIndex(specificId);
+            this.baseMapper.deleteEquipSpecVideo(specificId);
+            this.baseMapper.deleteEquipSpecRelation(specificId);
+            this.baseMapper.deleteEquipSpec(specificId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
         // 2.删除已入库相关数据
         QueryWrapper<StockDetail> stockDetailQueryWrapper = new QueryWrapper<>();

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

@@ -1438,16 +1438,49 @@
 		WHERE es.id = #{equipmentSpecificId}
     </select>
 
-    <delete id="deleteEquipDataBySpecificId">
-        DELETE FROM wl_equipment_specific WHERE id = #{specificId};
-        DELETE FROM wl_equipment_detail WHERE id = (SELECT equipment_detail_id FROM wl_equipment_specific WHERE id = #{specificId});
-        DELETE FROM wl_equipment_specific_alarm WHERE equipment_specific_id = #{specificId};
-        DELETE FROM wl_equipment_specific_alarm_log WHERE equipment_specific_id = #{specificId};
-        DELETE FROM wl_equipment_alarm_report_day WHERE equipment_specific_id = #{specificId};
-        DELETE FROM wl_equipment_specific_index WHERE equipment_specific_id = #{specificId};
-        DELETE FROM wl_video_equipment_specific WHERE equipment_specific_id = #{specificId};
-        DELETE FROM wl_equipment_specific_relation WHERE equipment_specific_id = #{specificId};
+<!--    <delete id="deleteEquipDataBySpecificId">-->
+<!--        DELETE FROM wl_equipment_detail WHERE id = #{equipDetailId};-->
+<!--        DELETE FROM wl_equipment_specific_alarm WHERE equipment_specific_id = #{specificId};-->
+<!--        DELETE FROM wl_equipment_specific_alarm_log WHERE equipment_specific_id = #{specificId};-->
+<!--        DELETE FROM wl_equipment_alarm_report_day WHERE equipment_specific_id = #{specificId};-->
+<!--        DELETE FROM wl_equipment_specific_index WHERE equipment_specific_id = #{specificId};-->
+<!--        DELETE FROM wl_video_equipment_specific WHERE equipment_specific_id = #{specificId};-->
+<!--        DELETE FROM wl_equipment_specific_relation WHERE equipment_specific_id = #{specificId};-->
+<!--        DELETE FROM wl_equipment_specific WHERE id = #{specificId};-->
+<!--    </delete>-->
+
+    <delete id="deleteEquipDetail">
+        DELETE FROM wl_equipment_detail WHERE id = #{equipDetailId}
     </delete>
+
+    <delete id="deleteEquipAlarmLog">
+        DELETE FROM wl_equipment_specific_alarm_log WHERE equipment_specific_id = #{speId}
+    </delete>
+
+    <delete id="deleteEquipAlarm">
+        DELETE FROM wl_equipment_specific_alarm WHERE equipment_specific_id = #{speId}
+    </delete>
+
+    <delete id="deleteEquipReportDay">
+        DELETE FROM wl_equipment_alarm_report_day WHERE equipment_specific_id = #{speId}
+    </delete>
+
+    <delete id="deleteEquipSpecIndex">
+        DELETE FROM wl_equipment_specific_index WHERE equipment_specific_id = #{speId}
+    </delete>
+
+    <delete id="deleteEquipSpecVideo">
+        DELETE FROM wl_video_equipment_specific WHERE equipment_specific_id = #{speId}
+    </delete>
+
+    <delete id="deleteEquipSpecRelation">
+        DELETE FROM wl_equipment_specific_relation WHERE equipment_specific_id = #{speId}
+    </delete>
+
+    <delete id="deleteEquipSpec">
+        DELETE FROM wl_equipment_specific WHERE id = #{speId}
+    </delete>
+
     <delete id="deleteEquipDataByStockDetailId">
         DELETE
             sd, ws, swr, sbd, sb, wln, wb, md, wm, wlrd, wlr, weoc, eoc, wj