1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardExchangeInfoService.java

@@ -19,10 +19,10 @@ import java.util.Date;
  */
 @HttpOpenApi(group = "admin.unimall.cardExchangeInfo", description = "名片交换")
 public interface ICardExchangeInfoService{
-	@HttpMethod(description = "新增", permission = "admin:unimall:cardExchangeInfo:add", permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	@HttpMethod(description = "新增", permissionName = "名片交换管理")
 	public Boolean add(@NotNull @HttpParam(name = "cardExchangeInfo", type = HttpParamType.COMMON, description = "名片交换") CardExchangeInfo cardExchangeInfo)throws ServiceException;
 
-	@HttpMethod(description = "列表", permission = "admin:unimall:cardExchangeInfo:list",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	@HttpMethod(description = "列表", permissionName = "名片交换管理")
 	public Page<CardExchangeInfo> list(
 								@HttpParam(name = "sendId", type = HttpParamType.COMMON, description = "发起人id") Long sendId,
 							@HttpParam(name = "receiveId", type = HttpParamType.COMMON, description = "接收人id") Long receiveId,
@@ -37,17 +37,17 @@ public interface ICardExchangeInfoService{
 		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
 		throws ServiceException;
 
-	@HttpMethod(description = "删除", permission = "admin:unimall:cardExchangeInfo:delete",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	@HttpMethod(description = "删除", permissionName = "名片交换管理")
 	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
 
-	@HttpMethod(description = "修改", permission = "admin:unimall:cardExchangeInfo:update",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	@HttpMethod(description = "修改", permissionName = "名片交换管理")
 	public Boolean update(@NotNull @HttpParam(name = "cardExchangeInfo", type = HttpParamType.COMMON, description = "名片交换") CardExchangeInfo cardExchangeInfo,
 						  @HttpParam(name = "updateFlag", type = HttpParamType.COMMON, description = "updateFlag") String updateFlag)throws ServiceException;
 
-	@HttpMethod(description = "查询", permission = "admin:unimall:cardExchangeInfo:get",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	@HttpMethod(description = "查询", permissionName = "名片交换管理")
 	public CardExchangeInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
 	
-	@HttpMethod(description = "导出excl表", permission = "admin:unimall:cardExchangeInfo:export",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	@HttpMethod(description = "导出excl表", permissionName = "名片交换管理")
 	public String export(
 								@HttpParam(name = "sendId", type = HttpParamType.COMMON, description = "发起人id") Long sendId,
 							@HttpParam(name = "receiveId", type = HttpParamType.COMMON, description = "接收人id") Long receiveId,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/SearchRecordsInfoServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -36,7 +37,19 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService {
         Date now = new Date();
         searchRecordsInfo.setGmtCreate(now);
         searchRecordsInfo.setGmtUpdate(now);
-        return searchRecordsInfoMapper.insert(searchRecordsInfo) > 0;
+        List<SearchRecordsInfo> searchRecordsInfos=searchRecordsInfoMapper.selectList(new EntityWrapper<SearchRecordsInfo>()
+                .eq("common_id",searchRecordsInfo.getCommonId())
+                .eq("function_type",searchRecordsInfo.getFunctionType())
+                .eq("search_content",searchRecordsInfo.getSearchContent())
+                .eq("delete_flag",0));
+        //已有搜索记录不新增
+        if (searchRecordsInfos.size()>0){
+            searchRecordsInfos.get(0).setGmtUpdate(now);
+            return searchRecordsInfoMapper.updateById(searchRecordsInfo) > 0;
+        }
+        else {
+            return searchRecordsInfoMapper.insert(searchRecordsInfo) > 0;
+        }
     }
 
     @Override
@@ -61,6 +74,7 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService {
             wrapper.eq("delete_flag", deleteFlag);
         }
         wrapper.eq("delete_flag", 0);
+        wrapper.orderBy("gmt_update", false);
         List<SearchRecordsInfo> list = searchRecordsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
         Integer count = searchRecordsInfoMapper.selectCount(wrapper);
         return new Page<SearchRecordsInfo>(list, page, limit, count);
@@ -68,14 +82,17 @@ public class SearchRecordsInfoServiceImpl implements ISearchRecordsInfoService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            SearchRecordsInfo tmp = searchRecordsInfoMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1l);
-                tmp.setGmtUpdate(new Date());
-                searchRecordsInfoMapper.updateById(tmp);
+    public Boolean delete(SearchRecordsInfo searchRecordsInfo) {
+        List<SearchRecordsInfo> searchRecordsInfos=searchRecordsInfoMapper.selectList(new EntityWrapper<SearchRecordsInfo>()
+                .eq("common_id",searchRecordsInfo.getCommonId())
+                .eq("function_type",searchRecordsInfo.getFunctionType())
+                .eq("delete_flag",0));
+        //清空搜索记录
+        if (!CollectionUtils.isEmpty(searchRecordsInfos)){
+            for (SearchRecordsInfo searchRecordsInfo1:searchRecordsInfos){
+                searchRecordsInfo1.setDeleteFlag(1l);
+                searchRecordsInfo1.setGmtUpdate(new Date());
+                searchRecordsInfoMapper.updateById(searchRecordsInfo1);
             }
         }
         return true;

unimall-data/src/main/java/com/iotechn/unimall/data/domain/SearchRecordsInfo.java

@@ -38,7 +38,7 @@ public class SearchRecordsInfo extends SuperDO {
     @TableField("search_content")
     private String searchContent;
 
-    /** 功能类型 */
+    /** 功能类型 1圈子2名片 */
     @Excel(name = "功能类型")
     @TableField("function_type")
     private String functionType;