From be52e2e6a3e3ea5602bc0f43527aefaa9cb3cab1 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 19 Aug 2018 16:24:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E8=AF=A6=E6=83=85=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 37 +++++++++++++++++-- .../simple/domain/po/WxCUserBasicInfo.java | 10 +++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 634d3ba15..a4f4381e2 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -1,5 +1,8 @@ package com.simple.controller; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -11,13 +14,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxCUserBasicInfo; import com.simple.domain.po.WxCUserTags; +import com.simple.domain.po.WxTags; import com.simple.service.WxCUserBasicInfoService; import com.simple.service.WxCUserTagsService; +import com.simple.service.WxTagsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -34,6 +40,9 @@ public class WxCUserBasicInfoController extends BaseController @Autowired private WxCUserTagsService wxCUserTagsService; + + @Autowired + private WxTagsService wxTagsService; private Logger logger = Logger.getLogger(WxCUserBasicInfoController.class); @@ -66,7 +75,17 @@ public class WxCUserBasicInfoController extends BaseController WxCUserTags record =new WxCUserTags(); record.setUserId(wxCUserBasicInfo.getcUserId()); record.setTenantId(getTenantId()); - record.setTags(JSON.toJSONString(wxCUserBasicInfo.getTags())); + PageInfo page = wxCUserTagsService.listAsPage(record, 1, 1); + if(page.getSize()>0) { + WxCUserTags t = page.getList().get(0); + record.setId(t.getId()); + } + String tags = wxCUserBasicInfo.getTags(); + List tagIdList = new ArrayList<>(); + for(String t:tags.split(",")) { + tagIdList.add(Long.valueOf(t)); + } + record.setTags(JSON.toJSONString(tagIdList)); wxCUserTagsService.saveOrUpdate(record); wxCUserBasicInfo.setTagId(record.getId()); } @@ -87,10 +106,20 @@ public class WxCUserBasicInfoController extends BaseController @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id); - info.getTagId(); - return new ResultData(Result.SUCCESS,"查询成功",wxCUserBasicInfoService.getById(id)); + if(info.getTagId()!=null) { + WxCUserTags uTag = wxCUserTagsService.getById(id); + if(StringUtils.isNotBlank(uTag.getTags())) { + List ids = JSONObject.parseArray(uTag.getTags(),Long.class); + WxTags wxTags =new WxTags(); + wxTags.setIds(ids); + PageInfo page = wxTagsService.listAsPage(wxTags, 1, 5000); + if(page.getSize()>0) { + info.setTagList(page.getList()); + } + } + } + return new ResultData(Result.SUCCESS,"查询成功",info); } - } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java index 01e58f500..febd9ba01 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java @@ -86,7 +86,17 @@ public class WxCUserBasicInfo implements Serializable { @Transient private String tags ; + @Transient + private List tagList; + public List getTagList() { + return tagList; + } + + public void setTagList(List tagList) { + this.tagList = tagList; + } + public Long getcUserId() { return cUserId; }