删除，推荐搜索

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SearchRecordsInfoController.java

@@ -1,7 +1,5 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
-
-
 import com.yh.saas.plugin.yiliangyiyun.entity.SearchRecordsInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ISearchRecordsInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +41,25 @@ public class SearchRecordsInfoController {
     @GetMapping("/selectSearchRecordsInfo")
     public Page<SearchRecordsInfo> selectSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
         return searchRecordsInfoService.selectSearchRecordsInfo(searchRecordsInfo);
+
+    }
+    /**
+     * 删除搜索记录
+     * @param searchRecordsInfo
+     */
+    @PostMapping("/api/deleteSearchRecordsInfo")
+    public void deleteSearchRecordsInfo (@RequestBody SearchRecordsInfo searchRecordsInfo){
+        searchRecordsInfoService.deleteSearchRecordsInfo(searchRecordsInfo.getId());
+    }
+
+    /**
+     * 推荐搜索记录列表
+     * @param searchRecordsInfo
+     * @return
+     */
+    @GetMapping("/selectRecommendedSearchRecordsInfo")
+    public Page<SearchRecordsInfo> selectRecommendedSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
+        return searchRecordsInfoService.selectRecommendedSearchRecordsInfo(searchRecordsInfo);
     }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISearchRecordsInfoService.java

@@ -1,6 +1,5 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.SearchRecordsInfo;
 import com.baomidou.mybatisplus.service.IService;
@@ -27,4 +26,17 @@ public interface ISearchRecordsInfoService extends IService<SearchRecordsInfo> {
      * @return
      */
     Page<SearchRecordsInfo> selectSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo);
+
+    /**
+     *删除搜索记录
+     * @param id
+     */
+    void deleteSearchRecordsInfo(String id);
+
+    /**
+     *
+     * 推荐搜索列表
+     * @param searchRecordsInfo
+     */
+    Page<SearchRecordsInfo> selectRecommendedSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SearchRecordsInfoServiceImpl.java

@@ -5,8 +5,8 @@ import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.SearchRecordsInfo;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.SearchRecordsInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.SearchRecordsInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ISearchRecordsInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -23,9 +23,24 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoMapper, SearchRecordsInfo> implements ISearchRecordsInfoService {
+    /**
+     * 删除搜索记录
+     *
+     * @param id
+     */
+    @Override
+    public void deleteSearchRecordsInfo(String id) {
+        //查询搜索记录
+        SearchRecordsInfo searchRecordsInfo = this.selectById(id);
+        if (searchRecordsInfo != null) {
+            //删除搜索记录
+            this.deleteById(searchRecordsInfo);
+        }
+    }
 
     /**
      * 新增搜索记录
+     *
      * @param searchRecordsInfo
      * @return
      */
@@ -38,13 +53,13 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
                         .eq("search_content", searchRecordsInfo.getSearchContent())
                         .eq(ContractManagementInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //已存在，次数加1
-        if (searchRecordsInfo1!=null) {
-            Long count=searchRecordsInfo1.getSearchCount()+1;
+        if (searchRecordsInfo1 != null) {
+            Long count = searchRecordsInfo1.getSearchCount() + 1;
             searchRecordsInfo1.setSearchCount(count);
             this.updateById(searchRecordsInfo1);
         }
         //新增
-        else{
+        else {
             //新增主键id
             searchRecordsInfo.setId(IdGenerator.generateUUID());
             // 操作主表数据
@@ -55,11 +70,12 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
 
     /**
      * 搜索记录列表
+     *
      * @param searchRecordsInfo
      * @return
      */
     @Override
-    public Page<SearchRecordsInfo> selectSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo){
+    public Page<SearchRecordsInfo> selectSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
         //查询搜索记录
         Page<SearchRecordsInfo> searchRecordsInfoPage = this.selectPage(searchRecordsInfo.getQueryPage(), new EntityWrapper<SearchRecordsInfo>()
                 .eq("id", searchRecordsInfo.getId())
@@ -67,4 +83,19 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
                 .orderBy("update_date", false));
         return searchRecordsInfoPage;
     }
-}
+
+    /**
+     * 推荐搜索列表
+     *
+     * @param searchRecordsInfo
+     * @return
+     */
+    public Page<SearchRecordsInfo> selectRecommendedSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
+        Page<SearchRecordsInfo> RecommendedSearchRecordsInfoPage = this.selectPage(searchRecordsInfo.getQueryPage(), new EntityWrapper<SearchRecordsInfo>()
+                .eq("id", searchRecordsInfo.getId())
+                .eq("compId", searchRecordsInfo.getCompId())
+                .gt("searchCount", "5")
+                .orderBy("update_date", false));
+        return RecommendedSearchRecordsInfoPage;
+    }
+}

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranProcessInfoMapper.xml

@@ -7,7 +7,8 @@
         SELECT
         COUNT(p.id)
         FROM tran_task_info t
-        left join tran_process_info p on t.id=p.info_id
+        LEFT JOIN tran_process_info p ON t.id=p.info_id
+        LEFT JOIN tran_car_info c ON t.id=c.info_id
         WHERE
         t.comp_id = #{compId}
         and p.delete_flag = '0'
@@ -72,11 +73,14 @@
         p.tran_type AS tranType,
         p.tran_type_key AS tranTypeKey,
         p.create_date as createDate,
+        c.load_pound_img as loadPoundImg,
+        c.unload_pound_img as unloadPoundImg,
         p.feedback_status AS feedbackStatus,
         p.feedback_status_flag AS feedbackStatusFlag,
         p.receiving_date AS receivingDate
         FROM tran_task_info t
         LEFT JOIN tran_process_info p ON t.id=p.info_id
+        LEFT JOIN tran_car_info c ON t.id=c.info_id
         WHERE
         t.comp_id = #{compId}
         and p.delete_flag = '0'