Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-resource/src/main/java/com/yihu/ehr/datacollect/controller/DataCollectController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.util.*;
/**
@@ -294,7 +295,13 @@ public class DataCollectController extends BaseController {
    @ResponseBody
    public Result executeJob(String jobId) {
        try {
            datacollectService.executeJob(jobId);
            //获取任务详细信息
            RsJobConfig job = datacollect.getJobById(jobId);
            String content = job.getJobContent();
            Class<?> classType = Class.forName(content);
            Method method = classType.getMethod("execute", new Class[]{String.class});
            method.invoke(classType.newInstance(), jobId);
            return Result.success("处理完成！");
        } catch (Exception ex) {
            return Result.error(ex.getMessage());

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectService.java

@@ -368,7 +368,7 @@ public class DatacollectService implements IDatacollectService {
                    }
                }
                else{
                    int count = obj.getInt("count");
                    int count = obj.getInt("COUNT");
                    if(count==0) //0条记录，无需采集
                    {
@@ -377,7 +377,7 @@ public class DatacollectService implements IDatacollectService {
                    else
                    {
                        int successCount = 0;
                        String maxKeyvalue = obj.optString("maxKeyvalue");
                        String maxKeyvalue = obj.optString("MAX_KEYVALUE");
                        int countPage = 1;
                        if(count > maxNum) //分页采集
                        {