详情返回素材

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatController.java

 package com.gic.haoban.manage.web.controller.chat;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 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.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.manage.api.dto.MaterialDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
@@ -20,6 +26,7 @@ import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
+import com.gic.haoban.manage.api.service.MaterialApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 
 /**
@@ -36,6 +43,8 @@ public class GroupChatController {
 
     @Autowired
     private GroupChatApiService groupChatApiService;
+    @Autowired
+    private MaterialApiService materialApiService ;
 
     @RequestMapping("get-set-gic-flag")
     public RestResponse<Object> getFlag() {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatPlanController.java

 package com.gic.haoban.manage.web.controller.chat;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,17 +12,23 @@ 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.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.manage.api.dto.MaterialDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
+import com.gic.haoban.manage.api.service.MaterialApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
+import com.gic.haoban.manage.web.vo.chat.GroupChatPlanVO;
 
 /**
  * 
@@ -36,6 +46,8 @@ public class GroupChatPlanController {
     
     @Autowired
     private GroupChatPlanApiService groupChatPlanApiService;
+    @Autowired
+    private MaterialApiService materialApiService ;
 
     @RequestMapping("add")
     public RestResponse<Object> save(@RequestBody GroupChatPlanDTO dto) {
@@ -95,8 +107,19 @@ public class GroupChatPlanController {
         if (!linkResp.isSuccess()) {
             return RestResponse.failure("1", "计划不存在");
         }
-        GroupChatPlanDTO hm = linkResp.getResult();
-        return RestResponse.successResult(hm);
+        GroupChatPlanDTO plan = linkResp.getResult();
+        String content = plan.getChatContent();
+        JSONArray array = JSONArray.parseArray(content);
+        List<String> materialIdList = new ArrayList<>();
+        for (int i = 0; i < array.size(); i++) {
+            JSONObject json = array.getJSONObject(i);
+            materialIdList.add(json.getString("relation_id"));
+        }
+        // 查询素材列表
+        List<MaterialDTO> materials = materialApiService.listMaterialByIds(materialIdList);
+        GroupChatPlanVO vo = EntityUtil.changeEntityByJSON(GroupChatPlanVO.class,plan) ;
+        vo.setMaterialIdList(materials);
+        return RestResponse.successResult(vo);
     }
 
     @RequestMapping("owner-log")

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatPlanVO.java

 package com.gic.haoban.manage.web.vo.chat;
 
 import java.io.Serializable ;
+import java.util.List;
+
+import com.gic.haoban.manage.api.dto.MaterialDTO;
 
 /**
  * 
@@ -15,6 +18,8 @@ public class GroupChatPlanVO implements Serializable{
 
 	private static final long serialVersionUID = 21576537277600L;
 	
+	private String wxEnterpriseId;
+	private String enterpriseId;
 	private Long planId;
 	private String name;
 	private String remark;
@@ -22,8 +27,8 @@ public class GroupChatPlanVO implements Serializable{
 	private String chatContent;
 	private String creatorId;
 	private String creatorName;
-	private String modifyId;
-	private String modifyName;
+	private String modifierId;
+	private String modifierName;
 	private java.util.Date createTime;
 	private java.util.Date updateTime;
 	/**0已删除 1有效*/
@@ -44,8 +49,43 @@ public class GroupChatPlanVO implements Serializable{
 	private Integer successChatCount;
 	/**总群数*/
 	private Integer totalChatCount;
-	
-	public void setPlanId(Long planId){
+    // 1代发送 2已发送
+    private Integer sendFlag;
+    private List<MaterialDTO> MaterialIdList ;
+
+	public List<MaterialDTO> getMaterialIdList() {
+        return MaterialIdList;
+    }
+
+    public void setMaterialIdList(List<MaterialDTO> materialIdList) {
+        MaterialIdList = materialIdList;
+    }
+
+    public Integer getSendFlag() {
+        return sendFlag;
+    }
+
+    public void setSendFlag(Integer sendFlag) {
+        this.sendFlag = sendFlag;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public void setPlanId(Long planId){
 		this.planId = planId;
 	}
 	
@@ -87,21 +127,23 @@ public class GroupChatPlanVO implements Serializable{
 	public String getCreatorName(){
 		return creatorName;
 	}
-	public void setModifyId(String modifyId){
-		this.modifyId = modifyId;
-	}
-	
-	public String getModifyId(){
-		return modifyId;
-	}
-	public void setModifyName(String modifyName){
-		this.modifyName = modifyName;
-	}
-	
-	public String getModifyName(){
-		return modifyName;
-	}
-	public void setCreateTime(java.util.Date createTime){
+	public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}