新增 删除图片接口

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/controller/IotCbdimgController.java

@@ -1,11 +1,13 @@
 package com.yunfeiyun.agmp.iotm.device.pest.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.PageDomain;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.core.page.TableSupport;
+import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
@@ -18,9 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -75,8 +75,7 @@ public class IotCbdimgController extends BaseController {
 
         return AjaxResult.success(iotCbdimgSumInfoResVo);
     }
-
-
+    
     /**
      * 识别数据列表
      */
@@ -100,6 +99,16 @@ public class IotCbdimgController extends BaseController {
         listPage.setRecords(cbdimgListResVoList);
         return getDataTable(listPage);
     }
+
+    /**
+     * 删除图片
+     */
+    @PreAuthorize("@ss.hasPermi('iot:device:remove')")
+    @Log(title = "删除图片", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delete")
+    public AjaxResult remove(@RequestParam("ids") String[] ids) {
+        return toAjax(iotCbdimgService.remove(ids));
+    }
 //
 //
 //
@@ -114,16 +123,7 @@ public class IotCbdimgController extends BaseController {
 //        return AjaxResult.success(iotCbdimgGroupDateListResVoList);
 //    }
 //
-//
-//    /**
-//     * 删除图片
-//     */
-//    @PreAuthorize("@ss.hasPermi('iot:device:remove')")
-//    @Log(title = "删除图片", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/delete")
-//    public AjaxResult remove(@RequestParam("ids") String[] ids) {
-//        return toAjax(iotCbdimgService.remove(ids));
-//    }
+
 //
 //    protected TableDataInfo getDataTable(IPage page) {
 //        TableDataInfo rspData = new TableDataInfo();

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotCbdimgServiceImpl.java

@@ -3,9 +3,6 @@ package com.yunfeiyun.agmp.iotm.device.pest.service.impl;
 import com.mongodb.client.result.UpdateResult;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
-import com.yunfeiyun.agmp.iot.common.domain.IotCbdpest;
-import com.yunfeiyun.agmp.iot.common.domain.IotCbdrecog;
-import com.yunfeiyun.agmp.iot.common.domain.IotPestrecog;
 import com.yunfeiyun.agmp.iot.common.domain.resvo.IotScreenCbdStatResVo;
 import com.yunfeiyun.agmp.iot.common.enums.EnumCbdMarkType;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
@@ -309,7 +306,7 @@ public class IotCbdimgServiceImpl implements IIotCbdimgService {
         return iotCbdimgGroupDateListResVoList;
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int remove(String[] ids) {
         List<String> list = Arrays.asList(ids);
@@ -317,26 +314,8 @@ public class IotCbdimgServiceImpl implements IIotCbdimgService {
         criteria.and("cbdimgBid").in(list);
         Query query = new Query(criteria);
         Update update = new Update().set("cbdimgDelstatus", "1");
-        Update update2 = new Update().set("cbdrecogDelstatus", "1");
-
-        List<IotCbdrecog> iotCbdrecogs = mongoTemplate.find(query, IotCbdrecog.class, "IotCbdrecog");
-        List<String> cbdrecogBids = new ArrayList<>();
-        for (IotCbdrecog iotCbdrecog : iotCbdrecogs) {
-            cbdrecogBids.add(iotCbdrecog.getCbdrecogBid());
-        }
-        Query query2 = new Query(Criteria.where("cbdrecogBid").in(cbdrecogBids));
-        List<IotCbdpest> iotCbdpests = mongoTemplate.find(query2, IotCbdpest.class, "IotCbdpest");
-        List<String> pestrecogBids = new ArrayList<>();
-        for (IotCbdpest iotCbdpest : iotCbdpests) {
-            pestrecogBids.add(iotCbdpest.getPestrecogBid());
-        }
-        Query query3 = new Query(Criteria.where("pestrecogBid").in(pestrecogBids));
 
         UpdateResult updateResult = mongoTemplate.updateMulti(query, update, IotCbdimg.class, "IotCbdimg");
-        mongoTemplate.updateMulti(query, update2, IotCbdrecog.class, "IotCbdrecog");
-        mongoTemplate.remove(query2, IotCbdpest.class, "IotCbdpest");
-        mongoTemplate.remove(query3, IotPestrecog.class, "IotPestrecog");
-
         return (int) updateResult.getModifiedCount();
     }