--no commit message

app/live/src/main/java/com/zrqx/live/bg/controller/LiveController.java

 package com.zrqx.live.bg.controller;
 
+import java.io.IOException;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -8,6 +9,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,7 +66,7 @@ public class LiveController {
 	
 	@ApiOperation(value="创建直播")
 	@PostMapping(value="/save")
-	public CallBack<String> save(@RequestBody SaveOrUpdateLiveForm entity,@RequestParam("file") MultipartFile file,@RequestParam("img") MultipartFile image){
+	public CallBack<String> save(SaveOrUpdateLiveForm entity,@RequestParam("file") MultipartFile file,@RequestParam("img") MultipartFile image,HttpServletRequest request)throws IOException, ParseException{
 		Live live = new Live();
 		BeanUtils.copyProperties(entity, live);
 		live.setLiveTime(Timestamp.valueOf(entity.getLiveTime()).getTime()/1000);

app/live/src/main/java/com/zrqx/live/bg/service/LiveServiceImpl.java

@@ -18,6 +18,7 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.live.bg.mapper.LiveMapper;
 import com.zrqx.live.commons.config.MicroRoarConfig;
 import com.zrqx.live.commons.enums.LiveStatusEnum;
+import com.zrqx.live.commons.enums.StatusEnum;
 import com.zrqx.live.commons.form.LiveForm;
 import com.zrqx.live.commons.form.MicroRoarForm;
 import com.zrqx.live.commons.model.Live;
@@ -40,7 +41,7 @@ public class LiveServiceImpl extends BaseServiceImpl<Live,Integer> implements Li
 		startPage(pageParam);
 		List<LiveVo> list = mapper.page(form);
 		list.forEach(vo ->{
-			vo.setLiveStatusZh(LiveStatusEnum.getName(vo.getLiveStatus()));
+			vo.setStatusZh(StatusEnum.getName(vo.getStatus()));
 			MicroRoarForm mf = new MicroRoarForm();
 			mf.setWebinar_id(vo.getWhId());
 			MicroRoarReturn roarReturn = create(mf);
@@ -51,9 +52,9 @@ public class LiveServiceImpl extends BaseServiceImpl<Live,Integer> implements Li
 				}else if ("5".equals(data)) {
 					data = "2";
 				}
-				vo.setStatusZh(LiveStatusEnum.getName(data));
+				vo.setLiveStatusZh(LiveStatusEnum.getName(data));
 			}else {
-				vo.setStatusZh(LiveStatusEnum.getName(vo.getStatus()));
+				vo.setLiveStatusZh(LiveStatusEnum.getName(vo.getStatus()));
 			}
 		});
 		return new PageInfo<LiveVo>(list);

app/live/src/main/java/com/zrqx/live/commons/form/LiveStatisticalForm.java

@@ -12,4 +12,6 @@ public class LiveStatisticalForm {
 
 	@ApiModelProperty("直播ID 9位数字")
 	private Integer webinar_id;
+	@ApiModelProperty("1 1周 2 近一月 3近三月 4 近半年 5 近一年 （默认一周）")
+	private Integer time_span;
 }