Просмотр исходного кода

四维看看接口添加用户名模块搜索

wuweihao 2 лет назад
Родитель
Сommit
1d0fca4e18

+ 15 - 0
720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/AgePageDto.java

@@ -0,0 +1,15 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2022/10/31 0031 18:31
+ * 四维看看后端使用
+ */
+@Data
+public class AgePageDto extends PageDto {
+
+    @ApiModelProperty(value = "用户账号")
+    private String userId;
+}

+ 2 - 1
720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/WorkMapper.java

@@ -1,6 +1,7 @@
 package com.gis.mapper;
 
 
+import com.gis.domain.dto.AgePageDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.entity.WorkEntity;
 import com.gis.mapper.provider.WorkProvider;
@@ -17,7 +18,7 @@ public interface WorkMapper extends IBaseStrMapper<WorkEntity, String> {
 
 
     @SelectProvider(type = WorkProvider.class, method = "search")
-    List<WorkEntity> search(PageDto param, String userId);
+    List<WorkEntity> search(AgePageDto param, String userId);
 
     @Update("UPDATE tb_work SET visit= visit + 1 where id = #{id}")
     void addVisit(String id);

+ 8 - 1
720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/provider/WorkProvider.java

@@ -1,6 +1,7 @@
 package com.gis.mapper.provider;
 
 import cn.hutool.core.util.StrUtil;
+import com.gis.domain.dto.AgePageDto;
 import com.gis.domain.dto.PageDto;
 import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 @Slf4j
 public class WorkProvider {
 
-    public String search(PageDto param, String userId){
+    public String search(AgePageDto param, String userId){
         StringBuffer sql = new StringBuffer("select * from tb_work where is_delete = 0 and status > 0");
 
 //        if(!StringUtils.isAllBlank(userId)){
@@ -25,6 +26,12 @@ public class WorkProvider {
             sql.append(" and ( name like '%").append(searchKey).append("%' )");
         }
 
+        String phone = param.getUserId();
+        if (StrUtil.isNotBlank(phone)){
+            sql.append(" and (  user_id like '%").append(phone).append("%' )");
+        }
+
+
         sql.append(" order by create_time desc");
 
         log.info("sql: {}", sql.toString());

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

@@ -2,6 +2,7 @@ package com.gis.service;
 
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.AgePageDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.SomeDataDto;
 import com.gis.domain.dto.WorkDto;
@@ -17,7 +18,7 @@ import java.util.List;
 public interface WorkService extends IBaseService<WorkEntity, String> {
 
 
-    Result search(PageDto param, boolean isAdmin);
+    Result search(AgePageDto param, boolean isAdmin);
 
     Result<WorkEntity> entitySave(WorkDto param);
 

+ 2 - 1
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -9,6 +9,7 @@ import com.gis.common.constant.ErrorEnum;
 import com.gis.common.constant.RedisConstant;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.util.*;
+import com.gis.domain.dto.AgePageDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.SomeDataDto;
 import com.gis.domain.dto.WorkDto;
@@ -85,7 +86,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
 
     @Override
-    public Result search(PageDto param, boolean isAdmin) {
+    public Result search(AgePageDto param, boolean isAdmin) {
         startPage(param);
         String userNameForToken = getUserNameForToken();
         if (isAdmin){

+ 2 - 1
720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/AgeController.java

@@ -2,6 +2,7 @@ package com.gis.web.controller;
 
 import com.gis.common.service.IBaseService;
 import com.gis.common.util.Result;
+import com.gis.domain.dto.AgePageDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.entity.WorkEntity;
 import com.gis.service.WorkService;
@@ -33,7 +34,7 @@ public class AgeController {
      */
     @ApiOperation(value = "场景-列表")
     @PostMapping("/list")
-    public Result<WorkEntity> list(@RequestBody PageDto param) {
+    public Result<WorkEntity> list(@RequestBody AgePageDto param) {
 //        Integer isAdmin = iBaseService.getIsAdmin();
 //        BaseRuntimeException.isTrue(isAdmin != 1, 3100, "非法用户");
         return workService.search(param, true);

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

@@ -51,7 +51,7 @@ public class WorkController extends BaseController {
 
     @ApiOperation(value = "列表", position = 1)
     @PostMapping("list")
-    public Result<WorkEntity> list(@RequestBody PageDto param) {
+    public Result<WorkEntity> list(@RequestBody AgePageDto param) {
         return workService.search(param, false);
     }
 

+ 4 - 0
720yun_fd_manage/remark-m.md

@@ -100,4 +100,8 @@
  5001: token为空
  5004: 密码有误
  
+ 
+ # appId: 
+    appId :BDA385EC848C1A425F746869011C8D23, 四维看看
+