Sfoglia il codice sorgente

[短信][修改]:短信发送标签回显

release_toaliyun_real
hupeng 7 anni fa
parent
commit
6ff380de26
2 ha cambiato i file con 29 aggiunte e 1 eliminazioni
  1. +17
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMsg.java

+ 17
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java Vedi File

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMsg; import com.iformall.domain.po.WxMsg;
import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxMsgService; import com.iformall.service.WxMsgService;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@@ -18,6 +19,8 @@ import org.springframework.web.multipart.MultipartFile;


import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID; import java.util.UUID;


@RestController @RestController
@@ -28,6 +31,9 @@ public class WxMsgController extends BaseController {
@Autowired @Autowired
private WxMsgService wxMsgService; private WxMsgService wxMsgService;


@Autowired
private WxCUserTagsService wxCUserTagsService;

@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@ApiImplicitParams({ @ApiImplicitParams({
@@ -70,7 +76,17 @@ public class WxMsgController extends BaseController {
@GetMapping("/findById") @GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData findById(Long id) { public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS, "查询成功", wxMsgService.getById(id));
WxMsg wxMsg = wxMsgService.getById(id);
String label = wxMsg.getLabel();
if (label != null && !label.isEmpty()) {
String[] arys = label.split(",");
List<Long> tagids = new ArrayList<>();
for (int i = 0; i < arys.length; i++) {
tagids.add(Long.parseLong(arys[i]));
}
wxMsg.setTagsList(wxCUserTagsService.findTagList(getTenantId(), tagids));
}
return new ResultData(wxMsg);
} }






+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMsg.java Vedi File

@@ -212,6 +212,18 @@ public class WxMsg implements Serializable {
this.way = way; this.way = way;
} }


List<WxTags> tagsList;

public List<WxTags> getTagsList() {
return tagsList;
}

public void setTagsList(List<WxTags> tagsList) {
this.tagsList = tagsList;
}



public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


Caricamento…
Annulla
Salva