From 5bba7f35b9da35c01a593284e85b875c090c449d Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Tue, 14 Aug 2018 22:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=9A=84=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 32 +++++++++++++------ .../simple/domain/po/WxCUserBasicInfo.java | 22 +++++++++++++ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 055a32c6b..2bc9b6d12 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -1,5 +1,6 @@ package com.simple.controller; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -9,11 +10,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.alibaba.fastjson.JSON; 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.service.WxCUserBasicInfoService; +import com.simple.service.WxCUserTagsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -27,6 +31,9 @@ public class WxCUserBasicInfoController extends BaseController { @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; + + @Autowired + private WxCUserTagsService wxCUserTagsService; private Logger logger = Logger.getLogger(WxCUserBasicInfoController.class); @@ -42,20 +49,27 @@ public class WxCUserBasicInfoController extends BaseController return new ResultData(page); } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { - //Assert.notNull(wxCUserBasicInfo.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCUserBasicInfo.setTenantId(getTenantId()); - wxCUserBasicInfoService.saveOrUpdate(wxCUserBasicInfo); - return new ResultData(); - } +// @ApiOperation("新增接口") +// @PostMapping("add") +// public ResultData add(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { +// //Assert.notNull(wxCUserBasicInfo.getName(), "角色名不能为空"); +// //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); +// wxCUserBasicInfoService.saveOrUpdate(wxCUserBasicInfo); +// return new ResultData(); +// } @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { wxCUserBasicInfo.setTenantId(getTenantId()); + if(StringUtils.isNotBlank(wxCUserBasicInfo.getTags())) { + WxCUserTags record =new WxCUserTags(); + record.setUserId(wxCUserBasicInfo.getcUserId()); + record.setTenantId(getTenantId()); + record.setTags(JSON.toJSONString(wxCUserBasicInfo.getTags())); + wxCUserTagsService.saveOrUpdate(record); + wxCUserBasicInfo.setTagId(record.getId()); + } wxCUserBasicInfoService.saveOrUpdate(wxCUserBasicInfo); return new ResultData(); } 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 1a41bb7d1..01e58f500 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java @@ -81,6 +81,28 @@ public class WxCUserBasicInfo implements Serializable { /*商户id**/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") private Long merchantId; + + @io.swagger.annotations.ApiModelProperty(value="标签-传json",name="tags") + @Transient + private String tags ; + + + public Long getcUserId() { + return cUserId; + } + + public void setcUserId(Long cUserId) { + this.cUserId = cUserId; + } + + public String getTags() { + return tags; + } + + public void setTags(String tags) { + this.tags = tags; + } + public String getPhone() { return phone; }