fix

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

@@ -129,6 +129,16 @@ public class MaterialController extends WebBaseController{
     }
     
     /**
+     * 素材详情
+     * @return
+     */
+    @RequestMapping("/material-detail")
+    public HaobanResponse materialDetail(String materialId) {
+		MaterialDTO dto = materialApiService.selectMaterialById(materialId);
+    	return resultResponse(HaoBanErrCode.ERR_1,dto);
+    }
+    
+    /**
      * 素材修改
      * @return
      */

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/MaterialController.java

+package com.gic.haoban.manage.web.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.MaterialCategoryDTO;
+import com.gic.haoban.manage.api.dto.MaterialDTO;
+import com.gic.haoban.manage.api.service.MaterialApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.MaterialVO;
+
+@RestController
+public class MaterialController extends WebBaseController{
+	
+	@Autowired
+	private MaterialApiService materialApiService;
+	/**
+     * 素材查询
+     * @return
+     */
+    @RequestMapping("/material-list")
+    public HaobanResponse materialList(String wxEnterpriseId,String keyword,String categoryId,Integer materialType,BasePageInfo pageInfo) {
+    	Page<MaterialDTO> page = materialApiService.listMaterial(wxEnterpriseId,keyword,categoryId,materialType,pageInfo);
+    	return resultResponse(HaoBanErrCode.ERR_1,page);
+    }
+    
+    /**
+     * 素材查询
+     * @return
+     */
+    @RequestMapping("/material-type")
+    public HaobanResponse materialType(String wxEnterpriseId) {
+    	List<MaterialCategoryDTO> list = materialApiService.listCategory(wxEnterpriseId);
+    	List<MaterialVO> handerList = new ArrayList<MaterialVO>();
+    	for (MaterialCategoryDTO materialCategoryDTO : list) {
+			if("0".equals(materialCategoryDTO.getCategoryParentId())){
+				handerList.add(EntityUtil.changeEntityByJSON(MaterialVO.class, materialCategoryDTO));
+			}
+		}
+    	Map<String,List<MaterialCategoryDTO>> map = list.stream().collect(Collectors.groupingBy(MaterialCategoryDTO::getCategoryParentId));
+    	handerSonMaterial(handerList, map);
+    	return resultResponse(HaoBanErrCode.ERR_1,handerList);
+    }
+    
+    private void handerSonMaterial(List<MaterialVO> handerList,Map<String,List<MaterialCategoryDTO>> map){
+    	for (MaterialVO materialVO : handerList) {
+			List<MaterialCategoryDTO> sonList = map.get(materialVO.getCategoryParentId());
+			List<MaterialVO> sonVoList = EntityUtil.changeEntityListByJSON(MaterialVO.class, sonList);
+			materialVO.setList(sonVoList);
+			while(sonList != null){
+				handerSonMaterial(sonVoList, map);
+			}
+    	}
+    }
+
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/MaterialVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class MaterialVO implements Serializable{
+	
+	private String categoryId;
+
+    private String categoryName;
+
+    private String categoryParentId;
+
+    private String wxEnterpriseId;
+
+    private Integer statusFlag;
+    
+    private List<MaterialVO> list;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(String categoryId) {
+        this.categoryId = categoryId == null ? null : categoryId.trim();
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName == null ? null : categoryName.trim();
+    }
+
+    public String getCategoryParentId() {
+        return categoryParentId;
+    }
+
+    public void setCategoryParentId(String categoryParentId) {
+        this.categoryParentId = categoryParentId == null ? null : categoryParentId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public List<MaterialVO> getList() {
+		return list;
+	}
+
+	public void setList(List<MaterialVO> list) {
+		this.list = list;
+	}
+    
+    
+
+}