Bläddra i källkod

fix checkwork

xiewj 1 år sedan
förälder
incheckning
a7d768832d

+ 21 - 0
720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/WorkIdDto.java

@@ -0,0 +1,21 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by Xiewj on  2024年4月18日14:09:13
+ */
+@Data
+public class WorkIdDto {
+
+    @NotBlank(message = "id不能为空")
+    @ApiModelProperty(value = "id" ,required = true)
+    private String id;
+
+
+
+
+}

+ 20 - 0
720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/WorkIdVO.java

@@ -0,0 +1,20 @@
+package com.gis.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by Xiewj on  2024年4月18日14:09:13
+ */
+@Data
+public class WorkIdVO {
+
+    @ApiModelProperty(value = "id" ,required = true)
+    private String id;
+
+    @ApiModelProperty(value = "四维看看场景码")
+    private String num;
+
+}

+ 3 - 0
720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/WorkMapper.java

@@ -53,4 +53,7 @@ public interface WorkMapper extends IBaseStrMapper<WorkEntity, String> {
 
     @SelectProvider(type = BaseProvider.class, method = "selectSql")
     List<ReportWorkVo> groupByTypeSql(String format);
+
+    @Select("select id from tb_work where is_delete=0 and (id =#{id} or num =#{id})")
+    WorkEntity findByIdOrNum(String id);
 }

+ 2 - 0
720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkService.java

@@ -58,4 +58,6 @@ public interface WorkService extends IBaseService<WorkEntity, String> {
     Result getServiceUpTip();
 
     Result<WorkEntity> searchSceneWorkList(AgePageDto param);
+
+    WorkEntity findByIdOrNum(String id);
 }

+ 5 - 0
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -1232,4 +1232,9 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
         return Result.success(new PageInfo<>(search));
     }
+
+    @Override
+    public WorkEntity findByIdOrNum(String id) {
+        return entityMapper.findByIdOrNum(id);
+    }
 }

+ 11 - 1
720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -1,6 +1,7 @@
 package com.gis.web.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -11,8 +12,10 @@ import com.gis.common.constant.RedisConstant;
 import com.gis.common.httpclient.FdkkClient;
 import com.gis.common.util.RedisUtil;
 import com.gis.common.util.Result;
+import com.gis.domain.dto.WorkIdDto;
 import com.gis.domain.dto.WorkPwdDto;
 import com.gis.domain.entity.WorkEntity;
+import com.gis.domain.vo.WorkIdVO;
 import com.gis.service.FodderService;
 import com.gis.service.WorkService;
 import com.github.pagehelper.PageHelper;
@@ -161,5 +164,12 @@ public class WebController extends BaseController {
     }
 
 
-
+    @ApiOperation(value = "混合查下场景码或者作品id" , position = 4)
+    @PostMapping("getIdInfo")
+    public Result getIdInfo(@RequestBody WorkIdDto workIdDto) {
+        WorkEntity workEntity=workService.findByIdOrNum(workIdDto.getId());
+        WorkIdVO workIdVO=new WorkIdVO();
+        BeanUtil.copyProperties(workEntity,workIdVO);
+        return Result.success(workIdVO);
+    }
 }