修改事件删除逻辑

zc-business/src/main/java/com/zc/business/controller/DcEventConstructionController.java

@@ -35,7 +35,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @Api(tags = "施工建设事件")
 @RestController
-@RequestMapping("/system/construction")
+@RequestMapping("/dc/system/construction")
 public class DcEventConstructionController extends BaseController
 {
     @Autowired

zc-business/src/main/java/com/zc/business/domain/DcEvent.java

@@ -126,9 +126,11 @@ public class DcEvent extends BaseEntity {
     /**
      * 事件状态：
      事件状态：
-     0-未解决
-     1-已解决
-     2-已关闭
+     0-待确认
+     1-已确认
+     2-处理中
+     3-已完成
+     4-已撤销
      */
     @ApiModelProperty("事件状态 事件状态：*      0-未解决1-已解决2-已关闭")
 

zc-business/src/main/java/com/zc/business/service/impl/DcEventAbnormalWeatherServiceImpl.java

@@ -150,7 +150,16 @@ public class DcEventAbnormalWeatherServiceImpl implements IDcEventAbnormalWeathe
     @Override
     public int deleteDcEventAbnormalWeatherByIds(String[] ids)
     {
-        return dcEventAbnormalWeatherMapper.deleteDcEventAbnormalWeatherByIds(ids);
+
+        int i1 =  dcEventAbnormalWeatherMapper.deleteDcEventAbnormalWeatherByIds(ids);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventByIds(ids);
+            return i;
+        }else {
+            return -1;
+        }
+
     }
 
     /**

zc-business/src/main/java/com/zc/business/service/impl/DcEventAccidentServiceImpl.java

@@ -117,7 +117,16 @@ public class DcEventAccidentServiceImpl implements IDcEventAccidentService {
      */
     @Override
     public int deleteDcEventAccidentByIds(String[] ids) {
-        return dcEventAccidentMapper.deleteDcEventAccidentByIds(ids);
+
+        int i1 =  dcEventAccidentMapper.deleteDcEventAccidentByIds(ids);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventByIds(ids);
+            return i;
+        }else {
+            return -1;
+        }
+
     }
 
     /**

zc-business/src/main/java/com/zc/business/service/impl/DcEventConstructionServiceImpl.java

@@ -149,7 +149,14 @@ public class DcEventConstructionServiceImpl implements IDcEventConstructionServi
     @Override
     public int deleteDcEventConstructionByIds(String[] ids)
     {
-        return dcEventConstructionMapper.deleteDcEventConstructionByIds(ids);
+        int i1 = dcEventConstructionMapper.deleteDcEventConstructionByIds(ids);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventByIds(ids);
+            return i;
+        }else {
+            return -1;
+        }
     }
 
     /**
@@ -165,6 +172,13 @@ public class DcEventConstructionServiceImpl implements IDcEventConstructionServi
     @Override
     public int deleteDcEventConstructionById(String id)
     {
-        return dcEventConstructionMapper.deleteDcEventConstructionById(id);
+        int i1 = dcEventConstructionMapper.deleteDcEventConstructionById(id);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventById(id);
+            return i;
+        }else {
+            return -1;
+        }
     }
 }

zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceAreaServiceImpl.java

@@ -148,7 +148,16 @@ public class DcEventServiceAreaServiceImpl implements IDcEventServiceAreaService
     @Override
     public int deleteDcEventServiceAreaByIds(String[] ids)
     {
-        return dcEventServiceAreaMapper.deleteDcEventServiceAreaByIds(ids);
+
+        int i1 = dcEventServiceAreaMapper.deleteDcEventServiceAreaByIds(ids);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventByIds(ids);
+            return i;
+        }else {
+            return -1;
+        }
+
     }
 
     /**

zc-business/src/main/java/com/zc/business/service/impl/DcEventTrafficCongestionServiceImpl.java

@@ -146,7 +146,15 @@ public class DcEventTrafficCongestionServiceImpl implements IDcEventTrafficConge
     @Override
     public int deleteDcEventTrafficCongestionByIds(String[] ids)
     {
-        return dcEventTrafficCongestionMapper.deleteDcEventTrafficCongestionByIds(ids);
+        int i1 =  dcEventTrafficCongestionMapper.deleteDcEventTrafficCongestionByIds(ids);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventByIds(ids);
+            return i;
+        }else {
+            return -1;
+        }
+
     }
 
     /**

zc-business/src/main/java/com/zc/business/service/impl/DcEventTrafficControlServiceImpl.java

@@ -149,7 +149,17 @@ public class DcEventTrafficControlServiceImpl implements IDcEventTrafficControlS
     @Override
     public int deleteDcEventTrafficControlByIds(String[] ids)
     {
-        return dcEventTrafficControlMapper.deleteDcEventTrafficControlByIds(ids);
+
+        int i1 =  dcEventTrafficControlMapper.deleteDcEventTrafficControlByIds(ids);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventByIds(ids);
+            return i;
+        }else {
+            return -1;
+        }
+
+
     }
 
     /**

zc-business/src/main/java/com/zc/business/service/impl/DcEventVehicleAccidentServiceImpl.java

@@ -11,6 +11,7 @@ import com.zc.business.mapper.DcEventVehicleAccidentMapper;
 import com.zc.business.service.IDcEventVehicleAccidentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
 
@@ -23,6 +24,7 @@ Service业务层处理
  * @date 2024-01-12
  */
 @Service
+@Transactional
 public class DcEventVehicleAccidentServiceImpl implements IDcEventVehicleAccidentService
 {
     @Autowired
@@ -134,7 +136,14 @@ public class DcEventVehicleAccidentServiceImpl implements IDcEventVehicleAcciden
     @Override
     public int deleteDcEventVehicleAccidentByIds(String[] ids)
     {
-        return dcEventVehicleAccidentMapper.deleteDcEventVehicleAccidentByIds(ids);
+        int i1 = dcEventVehicleAccidentMapper.deleteDcEventVehicleAccidentByIds(ids);
+        if (i1>0){
+            //删除事件表
+            int i = dcEventMapper.deleteDcEventByIds(ids);
+            return i;
+        }else {
+            return -1;
+        }
     }
 
     /**