1

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

@@ -25,8 +25,8 @@ public interface ICircleCardInfoService{
 
 	@HttpMethod(description = "列表", permissionName = "圈子个人关系管理")
 	public Page<CircleCardInfo> list(
-					@HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id") String comId,
-							@HttpParam(name = "identityId", type = HttpParamType.COMMON, description = "名片id") String identityId,
+					@HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id") String circleId,
+							@HttpParam(name = "cardId", type = HttpParamType.COMMON, description = "名片id") String cardId,
 							@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") String commonId,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
@@ -36,19 +36,19 @@ public interface ICircleCardInfoService{
 		throws ServiceException;
 
 	@HttpMethod(description = "删除", permissionName = "圈子个人关系管理")
-	public Boolean delete(@NotNull @HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id")String comId)throws ServiceException;
+	public Boolean delete(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;
 
 	@HttpMethod(description = "修改",  permissionName = "圈子个人关系管理")
 	public Boolean update(@NotNull @HttpParam(name = "circleCardInfo", type = HttpParamType.COMMON, description = "圈子个人关系") CircleCardInfo circleCardInfo,
 						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
 
 	@HttpMethod(description = "查询",  permissionName = "圈子个人关系管理")
-	public CircleCardInfo get(@NotNull @HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id")String comId)throws ServiceException;
+	public CircleCardInfo get(@NotNull @HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id")String circleId)throws ServiceException;
 	
 	@HttpMethod(description = "导出excl表", permissionName = "圈子个人关系管理")
 	public String export(
-					@HttpParam(name = "comId", type = HttpParamType.COMMON, description = "圈子id") String comId,
-							@HttpParam(name = "identityId", type = HttpParamType.COMMON, description = "名片id") String identityId,
+					@HttpParam(name = "circleId", type = HttpParamType.COMMON, description = "圈子id") String circleId,
+							@HttpParam(name = "cardId", type = HttpParamType.COMMON, description = "名片id") String cardId,
 							@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") String commonId,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,

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

@@ -39,13 +39,13 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	}
 
 	@Override
-	public Page<CircleCardInfo> list(String comId,String identityId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<CircleCardInfo> list(String circleId,String cardId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
-									if (!StringUtils.isEmpty(comId)) {
-					wrapper.eq("com_id", comId);
+									if (!StringUtils.isEmpty(circleId)) {
+					wrapper.eq("circle_id", circleId);
 				}
-												if (!StringUtils.isEmpty(identityId)) {
-					wrapper.eq("identity_id", identityId);
+												if (!StringUtils.isEmpty(cardId)) {
+					wrapper.eq("card_id", cardId);
 				}
 												if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
@@ -67,8 +67,8 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String comId) {
-		String[] ids = String.valueOf(comId).split(",");
+	public Boolean delete(String circleId) {
+		String[] ids = String.valueOf(circleId).split(",");
 		for (String tt:ids) {
 			CircleCardInfo tmp =  circleCardInfoMapper.selectById(Long.parseLong(tt));
 			if(tmp != null){
@@ -88,18 +88,18 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService{
 	}
 
 	@Override
-	public CircleCardInfo get(String comId) throws ServiceException {
-		return circleCardInfoMapper.selectById(comId);
+	public CircleCardInfo get(String circleId) throws ServiceException {
+		return circleCardInfoMapper.selectById(circleId);
 	}
 	
 	@Override
-	public String export(String comId,String identityId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public String export(String circleId,String cardId,String commonId,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<CircleCardInfo> wrapper = new EntityWrapper<CircleCardInfo>();
-									if (!StringUtils.isEmpty(comId)) {
-					wrapper.eq("com_id", comId);
+									if (!StringUtils.isEmpty(circleId)) {
+					wrapper.eq("circle_id", circleId);
 				}
-												if (!StringUtils.isEmpty(identityId)) {
-					wrapper.eq("identity_id", identityId);
+												if (!StringUtils.isEmpty(cardId)) {
+					wrapper.eq("card_id", cardId);
 				}
 												if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);

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

@@ -26,13 +26,13 @@ public class CircleCardInfo extends SuperDO {
 
     /** 圈子id */
     @Excel(name = "圈子id")
-    @TableField("com_id")
-    private String comId;
+    @TableField("circle_id")
+    private String circleId;
 
     /** 名片id */
     @Excel(name = "名片id")
-    @TableField("identity_id")
-    private String identityId;
+    @TableField("card_id")
+    private String cardId;
 
     /** 个人id */
     @Excel(name = "个人id")
@@ -58,8 +58,8 @@ public class CircleCardInfo extends SuperDO {
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("comId", getComId())
-            .append("identityId", getIdentityId())
+            .append("circleId", getCircleId())
+            .append("cardId", getCardId())
             .append("commonId", getCommonId())
             .append("gmtCreate", getGmtCreate())
             .append("gmtUpdate", getGmtUpdate())