对四维看看提供接口

720yun_fd_consumer/pom.xml

@@ -47,8 +47,6 @@
 
         <dependencies>
 
-
-
             <!-- springboot -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/provider/WorkProvider.java

@@ -1,19 +1,22 @@
 package com.gis.mapper.provider;
 
+import cn.hutool.core.util.StrUtil;
 import com.gis.domain.dto.PageDto;
 import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 /**
  * Created by owen on 2021/1/8 0008 16:50
  */
-@Log4j2
+@Slf4j
 public class WorkProvider {
 
     public String search(PageDto param, String userId){
         StringBuffer sql = new StringBuffer("select * from tb_work where is_delete = 0 and status > 0");
 
-        if(!StringUtils.isAllBlank(userId)){
+//        if(!StringUtils.isAllBlank(userId)){
+        if(StrUtil.isNotBlank(userId)){
             sql.append(" and ( user_id = '").append(userId).append("' )");
         }
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkService.java

@@ -5,9 +5,7 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.SomeDataDto;
 import com.gis.domain.dto.WorkDto;
-import com.gis.domain.entity.SceneEntity;
 import com.gis.domain.entity.WorkEntity;
-import com.gis.domain.vo.WorkInfoVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -19,7 +17,7 @@ import java.util.List;
 public interface WorkService extends IBaseService<WorkEntity, String> {
 
 
-    Result search(PageDto param);
+    Result search(PageDto param, Boolean isAdmin);
 
     Result<WorkEntity> entitySave(WorkDto param);
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -54,9 +54,6 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
 
     @Autowired
-    private CatalogMapper catalogMapper;
-
-    @Autowired
     SceneMapper sceneMapper;
 
     @Autowired
@@ -81,9 +78,13 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
 
     @Override
-    public Result search(PageDto param) {
+    public Result search(PageDto param, Boolean isAdmin) {
         startPage(param);
-        List<WorkEntity> search = entityMapper.search(param, getUserNameForToken());
+        String userNameForToken = getUserNameForToken();
+        if (isAdmin){
+            userNameForToken = null;
+        }
+        List<WorkEntity> search = entityMapper.search(param, userNameForToken);
         return Result.success(new PageInfo<>(search));
     }
 
@@ -205,10 +206,6 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         entity.setIsDelete(1);
         entity.setUpdateTime(new Date());
 
-        // 分组、场景设置为删除
-//        catalogMapper.setDeleteByWorkId(id);
-//        sceneMapper.setDeleteByWorkId(id);
-
         // 删除服务器器文件
         fileUtils.del(entity.getId());
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/AgeController.java

@@ -0,0 +1,42 @@
+package com.gis.web.controller;
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.PageDto;
+import com.gis.domain.entity.WorkEntity;
+import com.gis.service.WorkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Created by owen on 2022/6/28 0028 16:56
+ *
+ */
+@Api(tags = "提供四维看看接口")
+@RestController
+@RequestMapping("/manage/age")
+public class AgeController {
+
+    @Autowired
+    WorkService workService;
+
+    /**
+     * 获取所有场景
+     * 使用超级管理员权限
+     * @param param
+     * @return
+     */
+    @ApiOperation(value = "场景-列表")
+    @PostMapping("/list")
+    public Result<WorkEntity> list(@RequestBody PageDto param) {
+        return workService.search(param, true);
+    }
+
+    @ApiOperation(value = "场景-删除")
+    @PostMapping("/remove/{id}")
+    public Result remove( @PathVariable String id) {
+        return workService.remove(id);
+    }
+
+}

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkController.java

@@ -6,17 +6,13 @@ import com.gis.common.constant.RedisConstant;
 import com.gis.common.util.RedisUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
-import com.gis.domain.entity.FodderEntity;
 import com.gis.domain.entity.WorkEntity;
-import com.gis.domain.vo.WorkInfoVo;
 import com.gis.service.FodderService;
-import com.gis.service.SceneService;
 import com.gis.service.WorkService;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,7 +20,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 
@@ -33,7 +28,7 @@ import java.util.concurrent.TimeUnit;
  *
  * 先创建一个默认的作品
  */
-@Log4j2
+@Slf4j
 @Api(tags = "我的作品")
 @RestController
 @RequestMapping("/manage/work")
@@ -56,7 +51,7 @@ public class WorkController extends BaseController {
     @ApiOperation(value = "列表", position = 1)
     @PostMapping("list")
     public Result<WorkEntity> list(@RequestBody PageDto param) {
-        return workService.search(param);
+        return workService.search(param, false);
     }