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

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

@@ -20,7 +20,7 @@ import java.util.Date;
 @HttpOpenApi(group = "admin.unimall.cardNewsInfo", description = "记录消息信息")
 public interface ICardNewsInfoService{
 	@HttpMethod(description = "新增", permissionName = "记录消息信息管理")
-	public Boolean add(@NotNull @HttpParam(name = "cardNewsInfo", type = HttpParamType.COMMON, description = "记录消息信息") CardNewsInfo cardNewsInfo)throws ServiceException;
+	public String add(@NotNull @HttpParam(name = "cardNewsInfo", type = HttpParamType.COMMON, description = "记录消息信息") CardNewsInfo cardNewsInfo)throws ServiceException;
 
 	@HttpMethod(description = "列表", permissionName = "记录消息信息管理")
 	public Page<CardNewsInfo> list(

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

@@ -4,7 +4,10 @@ import java.util.List;
 
 import com.iotechn.unimall.admin.api.card.ICardNewsInfoService;
 import com.iotechn.unimall.data.domain.CardNewsInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.iotechn.unimall.data.mapper.CardNewsInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,13 +31,47 @@ import org.springframework.transaction.annotation.Transactional;
 public class CardNewsInfoServiceImpl implements ICardNewsInfoService {
 	@Autowired
 	private CardNewsInfoMapper cardNewsInfoMapper;
+	@Autowired
+	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
-	public Boolean add(CardNewsInfo cardNewsInfo) throws ServiceException {
+	public String add(CardNewsInfo cardNewsInfo) throws ServiceException {
 		Date now = new Date();
-		cardNewsInfo.setGmtCreate(now);
-		cardNewsInfo.setGmtUpdate(now);
-		return cardNewsInfoMapper.insert(cardNewsInfo)>0;
+		//全部发送
+		if (cardNewsInfo.getAllFlag()!=null){
+			List<CommonUserInfo> commonUserInfoList=commonUserInfoMapper.selectList(new EntityWrapper<CommonUserInfo>()
+			.eq("delete_flag","0"));
+			if (CollectionUtils.isNotEmpty(commonUserInfoList)) {
+				for (CommonUserInfo commonUserInfo : commonUserInfoList) {
+					cardNewsInfo.setNewsTitle(cardNewsInfo.getNewsTitle());
+					cardNewsInfo.setNewsContent(cardNewsInfo.getNewsContent());
+					cardNewsInfo.setReceiveId(commonUserInfo.getId());
+					cardNewsInfo.setGmtCreate(now);
+					cardNewsInfo.setGmtUpdate(now);
+					cardNewsInfoMapper.insert(cardNewsInfo);
+//				//个推
+//				geTuiUtils.initGeTui(cardNewsInfo1.getReceiveId());
+//				geTuiUtils.pushByCid(cardNewsInfo1.getNewsTitle(),cardNewsInfo1.getNewsContent(),cardNewsInfo1.getReceiveId());
+				}
+			}
+		}
+		//选择发送
+		else {
+			List<CardNewsInfo> cardNewsInfoList = cardNewsInfo.getCardNewsInfoList();
+			if (CollectionUtils.isNotEmpty(cardNewsInfoList)) {
+				for (CardNewsInfo cardNewsInfo1 : cardNewsInfoList) {
+					cardNewsInfo1.setNewsTitle(cardNewsInfo.getNewsTitle());
+					cardNewsInfo1.setNewsContent(cardNewsInfo.getNewsContent());
+					cardNewsInfo1.setGmtCreate(now);
+					cardNewsInfo1.setGmtUpdate(now);
+					cardNewsInfoMapper.insert(cardNewsInfo1);
+//				//个推
+//				geTuiUtils.initGeTui(cardNewsInfo1.getReceiveId());
+//				geTuiUtils.pushByCid(cardNewsInfo1.getNewsTitle(),cardNewsInfo1.getNewsContent(),cardNewsInfo1.getReceiveId());
+				}
+			}
+		}
+		return "ok";
 	}
 
 	@Override
@@ -69,6 +106,14 @@ public class CardNewsInfoServiceImpl implements ICardNewsInfoService {
 				}
 							wrapper.eq("delete_flag", 0);
 		List<CardNewsInfo> list = cardNewsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		if (CollectionUtils.isNotEmpty(list)){
+			for (CardNewsInfo cardNewsInfo:list){
+				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardNewsInfo.getReceiveId());
+				if (commonUserInfo!=null){
+					cardNewsInfo.setReceiveName(commonUserInfo.getNickname());
+				}
+			}
+		}
 		Integer count = cardNewsInfoMapper.selectCount(wrapper);
 		return new Page<CardNewsInfo>(list, page, limit, count);
 	}

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

@@ -136,14 +136,16 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
     @Override
     public CircleManagementInfo get(Long id, Long commonId) throws ServiceException {
         CircleManagementInfo circleManagementInfo = circleManagementInfoMapper.selectById(id);
-        CircleCardInfo circleCardInfo = new CircleCardInfo();
-        circleCardInfo.setCommonId(commonId);
-        circleCardInfo.setCircleId(circleManagementInfo.getId());
-        circleCardInfo.setDeleteFlag(0l);
-        CircleCardInfo circleCardInfo1 = circleCardInfoMapper.selectOne(circleCardInfo);
-        //我加入该圈子的名片
-        if (circleCardInfo1 != null) {
-            circleManagementInfo.setCircleCardInfo(circleCardInfo1);
+        if (commonId!=null) {
+            CircleCardInfo circleCardInfo = new CircleCardInfo();
+            circleCardInfo.setCommonId(commonId);
+            circleCardInfo.setCircleId(circleManagementInfo.getId());
+            circleCardInfo.setDeleteFlag(0l);
+            CircleCardInfo circleCardInfo1 = circleCardInfoMapper.selectOne(circleCardInfo);
+            //我加入该圈子的名片
+            if (circleCardInfo1 != null) {
+                circleManagementInfo.setCircleCardInfo(circleCardInfo1);
+            }
         }
         List<CircleCardInfo> circleCardInfoList = circleCardInfoMapper.selectList(new EntityWrapper<CircleCardInfo>()
                 .eq("circle_id", circleManagementInfo.getId())

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotations.TableField;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 记录消息信息对象 card_news_info
@@ -69,6 +70,13 @@ public class CardNewsInfo extends SuperDO {
     @TableField("delete_flag")
     private Long deleteFlag;
 
+    @TableField(exist = false)
+    private List<CardNewsInfo> cardNewsInfoList;
+    /** 全部发送标识 */
+    @TableField(exist = false)
+    private String allFlag;
+    @TableField(exist = false)
+    private String receiveName;
 
     @Override
     public String toString() {