Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

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/ICircleManagementInfoService.java

@@ -50,7 +50,7 @@ public interface ICircleManagementInfoService{
 	public Page<CardManagementInfo> circleCardlist(
 			@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId,
 			@HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id,
-			@HttpParam(name = "status", type = HttpParamType.COMMON, description = " 1已交换 2未交换") Long status,
+			@HttpParam(name = "status", type = HttpParamType.COMMON, description = " 1已交换 2未交换") String status,
 			@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
 			@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
 			throws ServiceException;

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

@@ -34,8 +34,8 @@ public interface ISearchRecordsInfoService{
 		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
 		throws ServiceException;
 
-	@HttpMethod(description = "删除",  permissionName = "搜索记录管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+	@HttpMethod(description = "清空搜索记录",  permissionName = "搜索记录管理")
+	public Boolean delete(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "搜索记录管理")
 	public Boolean update(@NotNull @HttpParam(name = "searchRecordsInfo", type = HttpParamType.COMMON, description = "搜索记录") SearchRecordsInfo searchRecordsInfo)throws ServiceException;

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

@@ -78,12 +78,11 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
                         .eq("circle_id", circleManagementInfo.getId())
                         .eq("delete_flag", 0));
                 circleManagementInfo.setCardNum(circleCardInfoList.size());
-                CircleCardInfo circleCardInfo = new CircleCardInfo();
-                circleCardInfo.setCommonId(commonId);
-                circleCardInfo.setCircleId(circleManagementInfo.getId());
-                circleCardInfo.setDeleteFlag(0l);
-                CircleCardInfo circleCardInfo1 = circleCardInfoMapper.selectOne(circleCardInfo);
-                if (circleCardInfo1 != null) {
+                List<CircleCardInfo> circleCardInfoList1 = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
+                        .eq("circle_id", circleManagementInfo.getId())
+                        .eq("common_id",commonId)
+                        .eq("delete_flag", 0));
+                if (circleCardInfoList1.size()>0){
                     circleManagementInfo.setAddedFlag(1l);
                 } else {
                     circleManagementInfo.setAddedFlag(0l);
@@ -134,11 +133,15 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
         if (circleCardInfo1 != null) {
             circleManagementInfo.setCircleCardInfo(circleCardInfo1);
         }
+        List<CircleCardInfo> circleCardInfoList = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
+                .eq("circle_id", circleManagementInfo.getId())
+                .eq("delete_flag", 0));
+        circleManagementInfo.setCardNum(circleCardInfoList.size());
         return circleManagementInfo;
     }
 
     @Override
-    public Page<CardManagementInfo> circleCardlist(Long commonId, Long id, Long status, Integer page, Integer limit) throws ServiceException {
+    public Page<CardManagementInfo> circleCardlist(Long commonId, Long id, String status, Integer page, Integer limit) throws ServiceException {
         Wrapper<CardManagementInfo> wrapper = new EntityWrapper<CardManagementInfo>();
         wrapper.eq("delete_flag", 0);
         Integer count = cardManagementInfoMapper.getCardManagementCount(status,(page - 1) * limit, limit, commonId,id);

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/CardManagementInfo.java

@@ -133,6 +133,12 @@ public class CardManagementInfo extends SuperDO {
     /** 业务范围 */
     @TableField(exist = false)
     private String scopeOfBusiness;
+    /** 状态 */
+    @TableField(exist = false)
+    private String status;
+    /** 接收人id */
+    @TableField(exist = false)
+    private Long receiveId;
 
     @Override
     public String toString() {

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;

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CardManagementInfoMapper.java

@@ -2,6 +2,7 @@ package com.iotechn.unimall.data.mapper;
 
 import com.iotechn.unimall.data.domain.CardManagementInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,7 +14,6 @@ import java.util.List;
  */
 public interface CardManagementInfoMapper extends BaseMapper<CardManagementInfo>{
 
-    Integer getCardManagementCount(Long status, int i, Integer limit, Long commonId,Long id);
+    Integer getCardManagementCount(@Param("status") String status, @Param("offset") Integer offset, @Param("limit") Integer limit, @Param("commonId") Long commonId, @Param("id") Long id);
 
-    List<CardManagementInfo> getCardManagementPage(Long status, int i, Integer limit, Long commonId,Long id);
-}
+    List<CardManagementInfo> getCardManagementPage(@Param("status") String status, @Param("offset") Integer offset, @Param("limit") Integer limit, @Param("commonId") Long commonId, @Param("id") Long id);}

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardManagementInfoMapper.xml

@@ -8,21 +8,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getCardManagementPage" resultType="com.iotechn.unimall.data.domain.CardManagementInfo">
         SELECT
         cmi.id as id,
+        cmi.common_id as receiveId,
         cmi.name AS name,
         cmi.post AS post,
         cmi.company_name as companyName,
         phi.scope_of_business AS scopeOfBusiness,
         cui.look_page AS lookPage,
-        case when (cmi.common_id={commonId})  then 1
+        case when (cmi.common_id=#{commonId})  then 1
         when IFNULL((SELECT count(chi.id)
         FROM card_holder_info chi
         WHERE chi.delete_flag = '0'
-        AND chi.common_id ={commonId}
+        AND chi.common_id =#{commonId}
         AND chi.card_id =cmi.id ),0) >0 then 1
         when IFNULL((SELECT count(cei.id)
         FROM card_exchange_info cei
         WHERE cei.delete_flag = '0'
-        AND cei.send_id ={commonId}
+        AND cei.send_id =#{commonId}
         AND (cei.status=1 or cei.status=0 or cei.status=7)
         AND cei.receive_card_id =cmi.id ),0) >0 then 1  else 0 end as notDisplay,
         cci.gmt_update AS gmtUpdate,
@@ -32,9 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN card_management_info cmi on cmi.id=cci.card_id and cmi.delete_flag=0
         LEFT JOIN personal_homepage_info phi on phi.common_id=cmi.common_id and phi.delete_flag=0
         LEFT JOIN common_user_info cui on cui.id=cmi.common_id and cui.delete_flag=0
-        LEFT JOIN card_holder_info ch on ch.common_id={commonId} and ch.card_id=cmi.id and ch.delete_flag=0
+        LEFT JOIN card_holder_info ch on ch.common_id=#{commonId} and ch.card_id=cmi.id and ch.delete_flag=0
         WHERE
-        cci.circle_id = {id}
+        cci.circle_id = #{id}
         and cci.delete_flag=0
         <if test="status != null">
             <if test="status == 1">
@@ -58,9 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN card_management_info cmi on cmi.id=cci.card_id and cmi.delete_flag=0
         LEFT JOIN personal_homepage_info phi on phi.common_id=cmi.common_id and phi.delete_flag=0
         LEFT JOIN common_user_info cui on cui.id=cmi.common_id and cui.delete_flag=0
-        LEFT JOIN card_holder_info ch on ch.common_id={commonId} and ch.card_id=cmi.id and ch.delete_flag=0
+        LEFT JOIN card_holder_info ch on ch.common_id=#{commonId} and ch.card_id=cmi.id and ch.delete_flag=0
         WHERE
-        cci.circle_id = {id}
+        cci.circle_id = #{id}
         and cci.delete_flag=0
         <if test="status != null">
             <if test="status == 1">