返回格式错误修改

src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java

@@ -9,6 +9,7 @@ import com.yihu.hos.web.framework.constant.DateConvert;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -23,8 +24,8 @@ import java.util.List;
 * 数据采集配置页面
 * Created by hzp on 2015/8/12.
 */
//@RequestMapping("/datacollect")
//@Controller("dataCollectController")
@RequestMapping("/datacollect")
@Controller("dataCollectController")
public class DataCollectController extends BaseController {
    @Autowired

src/main/java/com/yihu/hos/datacollect/service/DataCollectClient.java

@@ -2,6 +2,8 @@ package com.yihu.hos.datacollect.service;
import com.yihu.hos.core.constants.MicroServices;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.ui.Model;
@@ -40,9 +42,9 @@ public interface DataCollectClient {
    */
    @RequestMapping("getJob")
    @ResponseBody
    public Result getJob(@RequestParam("name") final String name,
                         @RequestParam("page") final int page,
                         @RequestParam("rows") final int rows);
    public DataGridResult getJob(@RequestParam("name") final String name,
                                 @RequestParam("page") final int page,
                                 @RequestParam("rows") final int rows);
    @RequestMapping("compareServeTime")
    @ResponseBody
@@ -53,7 +55,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("getSchemeDataset")
    @ResponseBody
    public Result getSchemeDataset(@RequestParam("schemeId") final String schemeId,
    public DataGridResult getSchemeDataset(@RequestParam("schemeId") final String schemeId,
                                   @RequestParam("schemeVersion") final String schemeVersion,
                                   @RequestParam("jobId") final String jobId);
@@ -62,7 +64,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("getSchemeDatasetCol")
    @ResponseBody
    public Result getSchemeDatasetCol
    public DataGridResult getSchemeDatasetCol
    (@RequestParam("schemeId") final String schemeId,
     @RequestParam("schemeVersion") final String schemeVersion,
     @RequestParam("datasetId") final String datasetId);
@@ -72,21 +74,21 @@ public interface DataCollectClient {
    */
    @RequestMapping("addJob")
    @ResponseBody
    public Result addJob(HttpServletRequest request);
    public ActionResult addJob(HttpServletRequest request);
    /*
       修改任务
    */
    @RequestMapping("updateJob")
    @ResponseBody
    public Result updateJob(HttpServletRequest request);
    public ActionResult updateJob(HttpServletRequest request);
    /*
      修改任务状态
   */
    @RequestMapping("validJob")
    @ResponseBody
    public Result validJob(@RequestParam("jobId") final String jobId,
    public ActionResult validJob(@RequestParam("jobId") final String jobId,
                           @RequestParam("valid") final String valid);
    /*
@@ -103,7 +105,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("getJobInfo")
    @ResponseBody
    public Result getJobInfo(@RequestParam("jobId") final String jobId);
    public ActionResult getJobInfo(@RequestParam("jobId") final String jobId);
    /**
     * 根据任务Id获取相关数据集下拉数据
@@ -112,7 +114,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("getJobDatasetByJobId")
    @ResponseBody
    public Result getJobDatasetByJobId(@RequestParam("jobId") final String jobId);
    public DataGridResult getJobDatasetByJobId(@RequestParam("jobId") final String jobId);
    /*************************
     * 数据集--数据源管理
@@ -128,7 +130,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("getDatasetSource")
    @ResponseBody
    public Result getDatasetSource(@RequestParam("stdVersion") final String stdVersion);
    public DataGridResult getDatasetSource(@RequestParam("stdVersion") final String stdVersion);
    /**
@@ -138,7 +140,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("saveDatasetSource")
    @ResponseBody
    public Result saveDatasetSource(@RequestParam("stdVersion") final String stdVersion,
    public ActionResult saveDatasetSource(@RequestParam("stdVersion") final String stdVersion,
                                    @RequestParam("json") final String json);
@@ -171,7 +173,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("getJobLogDetail")
    @ResponseBody
    public Result getJobLogDetail(@RequestParam("jobId") String jobId,
    public DataGridResult getJobLogDetail(@RequestParam("jobId") String jobId,
                                  @RequestParam("jobDatasetId") String jobDatasetId,
                                  @RequestParam("jobStatus") String jobStatus,
                                  @RequestParam("jobTimeFrom") String jobTimeFrom,
@@ -190,7 +192,7 @@ public interface DataCollectClient {
     */
    @RequestMapping("getJobLog")
    @ResponseBody
    public Result getJobLog(@RequestParam("jobId") String jobId,
    public DataGridResult getJobLog(@RequestParam("jobId") String jobId,
                            @RequestParam("rows") int page, int rows)
    ;
@@ -201,5 +203,5 @@ public interface DataCollectClient {
     */
    @RequestMapping("getJobLogDataset")
    @ResponseBody
    public Result getJobLogDataset(@RequestParam("logId") String logId);
    public DataGridResult getJobLogDataset(@RequestParam("logId") String logId);
}