feat: 公司历史搜索

guzijian
1 parent b2572cd4
Showing 8 changed files with 139 additions and 0 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarSearchHistoryMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarSearchHistory.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarSearchHistoryService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarSearchHistoryServiceImpl.java
trash-garbage/src/main/resources/mapper/GarSearchHistoryMapper.xml
@@ -149,6 +149,12 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryEnterpriseList(enterprise));
     }
+    @GetMapping("/search/history")
+    public Result<?> querySearchHistory(){
+        return Result.OK(garOrderService.querySearchHistory());
+    }
+
+
     protected void startPage() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
+package com.trash.garbage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.trash.garbage.pojo.domain.GarSearchHistory;
+import com.trash.garbage.pojo.domain.GarUser;
+
+public interface GarSearchHistoryMapper extends BaseMapper<GarSearchHistory> {
+}
+package com.trash.garbage.pojo.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
+/**
+ * 搜索历史
+ * @author 20412
+ */
+@TableName(value ="gar_search_history")
+public class GarSearchHistory {
+    private String garSearchId;
+    private String garSearchValue;
+    private Long garSearchTimestamp;
+    private String garCreateBy;
+
+    public String getGarSearchId() {
+        return garSearchId;
+    }
+
+    public void setGarSearchId(String garSearchId) {
+        this.garSearchId = garSearchId;
+    }
+
+    public String getGarSearchValue() {
+        return garSearchValue;
+    }
+
+    public void setGarSearchValue(String garSearchValue) {
+        this.garSearchValue = garSearchValue;
+    }
+
+    public Long getGarSearchTimestamp() {
+        return garSearchTimestamp;
+    }
+
+    public void setGarSearchTimestamp(Long garSearchTimestamp) {
+        this.garSearchTimestamp = garSearchTimestamp;
+    }
+
+    public String getGarCreateBy() {
+        return garCreateBy;
+    }
+
+    public void setGarCreateBy(String garCreateBy) {
+        this.garCreateBy = garCreateBy;
+    }
+
+    @Override
+    public String toString() {
+        return "GarSearchHistory{" +
+                "garSearchId='" + garSearchId + '\'' +
+                ", garSearchValue='" + garSearchValue + '\'' +
+                ", garSearchTimestamp=" + garSearchTimestamp +
+                ", createBy='" + garCreateBy + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+
+        if (o == null || getClass() != o.getClass()) return false;
+
+        GarSearchHistory that = (GarSearchHistory) o;
+
+        return new EqualsBuilder().append(garSearchId, that.garSearchId).append(garSearchValue, that.garSearchValue).append(garSearchTimestamp, that.garSearchTimestamp).append(garCreateBy, that.garCreateBy).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37).append(garSearchId).append(garSearchValue).append(garSearchTimestamp).append(garCreateBy).toHashCode();
+    }
+}
@@ -74,4 +74,6 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     List<DispatchDriverVo> queryDispatch(String orderId);
     List<GarOrderMatchHandler> queryOrderHandlerStatus(String orderId);
+
+    PageInfo querySearchHistory();
 }
+package com.trash.garbage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarSearchHistory;
+
+public interface GarSearchHistoryService  extends IService<GarSearchHistory> {
+}
@@ -51,6 +51,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private GarOrderEvaluateService garOrderEvaluateService;
     @Autowired
+    private GarSearchHistoryService garSearchHistoryService;
+
+    @Autowired
     private GarUserService garUserService;
     @Autowired
@@ -379,6 +382,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     public static void main(String[] args) {
         System.out.println(convert("PAYPALISHIRING", 3));
     }
+
     public static String convert(String s, int numRows) {
         if (numRows == 1) {
             return s;
@@ -578,6 +582,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return list;
     }
+    @Override
+    public PageInfo querySearchHistory() {
+        // 查询历史搜索记录 最多返回8个历史搜索
+        PageHelper.startPage(1, 8);
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        LambdaQueryWrapper<GarSearchHistory> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarSearchHistory::getGarCreateBy, userId);
+        List<GarSearchHistory> list = garSearchHistoryService.list(qw);
+        PageInfo<GarSearchHistory> page = new PageInfo<>(list);
+        return page;
+    }
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
         for (GarOrder order : orderList) {
+package com.trash.garbage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.mapper.GarSearchHistoryMapper;
+import com.trash.garbage.pojo.domain.GarSearchHistory;
+import com.trash.garbage.service.GarSearchHistoryService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GarSearchHistoryServiceImpl extends ServiceImpl<GarSearchHistoryMapper, GarSearchHistory>
+        implements GarSearchHistoryService {
+}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.garbage.mapper.GarSearchHistoryMapper">
+    <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarSearchHistory">
+        <id property="garSearchId" column="gar_search_id" jdbcType="VARCHAR"/>
+        <result property="garSearchTimestamp" column="gar_search_timestamp" jdbcType="VARCHAR"/>
+        <result property="garSearchValue" column="gar_search_value" jdbcType="VARCHAR"/>
+        <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+    </resultMap>
+
+</mapper>
 \ No newline at end of file