增加删除标准数据代码

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.AssertUtils;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.UserAgentUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -27,6 +28,7 @@ import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import com.upyuns.platform.rs.datacenter.pojo.ImagePageFeginDTO;
 import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
 import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
+import com.upyuns.platform.rs.gtdata.GtDataRestClient;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -55,6 +57,9 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
     @Autowired
     RscpImagePriceBiz rscpImagePriceBiz;
 
+    @Autowired
+    GtDataRestClient gtDataRestClient;
+
     @RequestMapping(value = "/app/unauth/query", method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse unauthQuery(PageParam pageParam) {
@@ -112,12 +117,6 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
     @RequestMapping(value = "/app/unauth/detailById", method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse<List<RscpImageDataTotal>> detailById(Long id){
-//        List<RscpImageDataTotal> list2 = baseBiz.selectByAttrs(RscpImageDataTotal::getId, CollUtil.newArrayList(id));
-//        if(list2.size() > 0) {
-//            RscpImageDataTotal rscpImageDataTotal = list2.get(0);
-//            rscpImageDataTotal.setRange(baseBiz.geoJsonByRange(rscpImageDataTotal.getRange()));
-//            return ObjectRestResponse.succ(list2.get(0));
-//        }
         return ObjectRestResponse.succ(baseBiz.queryDataList(id));
     }
 
@@ -159,7 +158,6 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
         );
     }
 
-
     @Data
     static public class QueryDTO {
         public static final int TYPE_AREA = 1;

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgRscpImageDataTotalController.java

@@ -7,16 +7,19 @@ import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.AssertUtils;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.upyuns.platform.rs.datacenter.biz.RscpAreaImageTotalBiz;
 import com.upyuns.platform.rs.datacenter.biz.RscpImageDataTotalBiz;
 import com.upyuns.platform.rs.datacenter.biz.RscpImagePriceBiz;
+import com.upyuns.platform.rs.datacenter.entity.RscpAreaImageTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
 import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import com.upyuns.platform.rs.datacenter.pojo.imagedata.BgImageQueryDTO;
+import com.upyuns.platform.rs.gtdata.GtDataRestClient;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,10 +35,39 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 @RequestMapping("/bg/imageData")
 public class BgRscpImageDataTotalController extends BaseController<RscpImageDataTotalBiz, RscpImageDataTotal> {
 
+    @Autowired
+    GtDataRestClient gtDataRestClient;
+
+    @Autowired
+    RscpAreaImageTotalBiz rscpAreaImageTotalBiz;
+
     @ApiOperation("查询分页")
     @RequestMapping(value = "/bgPages",method = RequestMethod.GET)
     @ResponseBody
     public ObjectRestResponse<PageDataVO<RscpImageDataTotal>> bgPages(BgImageQueryDTO dto) {
         return ObjectRestResponse.succ(PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.bgQueryDataList(dto)));
     }
+
+    @RequestMapping(value = "/completeDelete", method = RequestMethod.DELETE)
+    public ObjectRestResponse completeDelete(Long id){
+        AssertUtils.isBlank(id);
+        //查询db
+        RscpImageDataTotal dbImage = baseBiz.selectById(id);
+        AssertUtils.isBlank(dbImage);
+
+        if("/rscloudmart/bg/upload/2021-01-05/1609838996306.png".equals(dbImage.getImageFilePath())) {
+            //假数据不删data
+        }else {
+            gtDataRestClient.delete(dbImage.getImageFilePath());
+        }
+
+        //删除业务数据
+        baseBiz.deleteById(dbImage.getId());
+
+        rscpAreaImageTotalBiz.delete(new RscpAreaImageTotal(){{
+            setDataId(dbImage.getId());
+        }});
+
+        return ObjectRestResponse.succ(id);
+    }
 }
\ No newline at end of file