修改 tzs救援站根据id删除接口

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueStationController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RescueStationDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
@@ -19,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -76,18 +78,28 @@ public class RescueStationController extends BaseController {
     /**
      * 根据id删除
      *
-     * @param id id
+     * @param ids id,id,id,...
      * @return 返回结果
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/{ids}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel<Boolean> deleteById(@PathVariable Long id) {
-        RescueStation rescueStation = iRescueStationService.getById(id);
+    @Transactional
+    public ResponseModel<Boolean> deleteById(@PathVariable String ids) {
+        String[] id = ids.split(",");
+        boolean remove = true;
+        for(int i = 0 ; i < id.length ; i++) {
+            if(remove) {
+                RescueStation rescueStation = iRescueStationService.getById(id[i]);
                 rescueStation.setIsDelete(true);
                 rescueStation.setRecUserId(RequestContext.getExeUserId());
                 rescueStation.setRecDate(new Date());
-        boolean remove = iRescueStationService.updateById(rescueStation);
+                remove = iRescueStationService.updateById(rescueStation);
+                if (!remove) {
+                    return CommonResponseUtil.failure("应急救援机构名称："+rescueStation.getName()+"删除失败！");
+                }
+            }
+        }
         return ResponseHelper.buildResponse(remove);
     }
 
@@ -193,6 +205,7 @@ public class RescueStationController extends BaseController {
         RescueStation rescueStation = BeanDtoVoUtils.convert(rescueStationDto, RescueStation.class);
         Page<RescueStation> pageBean;
         QueryWrapper<RescueStation> rescueStationQueryWrapper = new QueryWrapper<>();
+        rescueStationQueryWrapper.eq("is_delete",false);
         Class<? extends RescueStation> aClass = rescueStation.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
             try {