소스 검색

age 作品接口提供日期查询

wuweihao 2 년 전
부모
커밋
4f5a38d314

+ 6 - 1
720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/AgePageDto.java

@@ -8,11 +8,15 @@ import lombok.Data;
  * 四维看看后端使用
  */
 @Data
-public class AgePageDto extends PageDto {
+public class AgePageDto extends PageDateDto {
 
     @ApiModelProperty(value = "搜索条件-用户账号")
     private String userId;
 
+    @ApiModelProperty(value = "搜索条件-作品码")
+    private String workId;
+
+
     @ApiModelProperty(value = "排序, asc:正序 | desc:倒序(默认)")
     private String sort;
 
@@ -20,4 +24,5 @@ public class AgePageDto extends PageDto {
     private String orderBy;
 
 
+
 }

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

@@ -16,7 +16,6 @@ public class WorkProvider {
     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)){
         if(StrUtil.isNotBlank(userId)){
             sql.append(" and ( user_id = '").append(userId).append("' )");
         }
@@ -31,6 +30,19 @@ public class WorkProvider {
             sql.append(" and (  user_id like '%").append(phone).append("%' )");
         }
 
+        // 2023-01-30 作品码查询
+        String workId = param.getWorkId();
+        if (StrUtil.isNotBlank(workId)){
+            sql.append(" and (  id like '%").append(workId).append("%' )");
+        }
+
+        String startTime = param.getStartTime();
+        String endTime = param.getEndTime();
+        if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
+            sql.append(" and create_time between '").append(startTime).append("' and '").append(endTime).append("'");
+        }
+
+
         String orderBy = param.getOrderBy();
         orderBy = "visit".equals(orderBy) ? "visit" : "create_time";
 

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

@@ -106,6 +106,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         String key = baseKey +  "_" + userName;
         log.info("该用户:{} redis key:{}", userName, key);
         if (redisUtil.hasKey(key)){
+            log.info("该用户当天已登录,不需要统计");
             return;
         }
 

+ 2 - 2
720yun_fd_manage/remark-m.md

@@ -46,8 +46,8 @@
       admin
     admin123 
     
-    
-   doc: 8.135.106.227:8001/doc.html     
+  doc: http://127.0.0.1:8001/qjkankan/doc.html  
+  appId:BDA385EC848C1A425F746869011C8D23
    
    
 # sit 是用的四维看看测试服务器