Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

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

@@ -320,16 +320,16 @@ public class DatacollectService implements IDatacollectService {
                }
                strSql += strWhere;
                //总条数和最大值查询
                String sqlCount = "select count(1) as COUNT,max(" + maxKey + ") as MAX_NUM from " + adapterTableName + strWhere;
                String sqlCount = "select count(1) as COUNT,max(" + maxKey + ") as MAX_KEYVALUE from " + adapterTableName + strWhere;
                JSONObject obj = db.load(sqlCount);
                if(obj==null)
                {
                    if(db.errorMessage.length()>0)
                    {
                        message = db.errorMessage;
                        throw new Exception(db.errorMessage);
                    }
                    else{
                        message = "查询异常："+sqlCount;
                        throw new Exception("查询异常："+sqlCount);
                    }
                }
                else{
@@ -341,7 +341,8 @@ public class DatacollectService implements IDatacollectService {
                    }
                    else
                    {
                        String maxKeyvalue = obj.optString("maxNum");
                        int successCount = 0;
                        String maxKeyvalue = obj.optString("maxKeyvalue");
                        int countPage = 1;
                        if(count > maxNum) //分页采集
                        {
@@ -395,6 +396,7 @@ public class DatacollectService implements IDatacollectService {
                            else{
                                detail.setJobStatus("1");
                                detail.setJobContent("采集成功!");
                                successCount += rows;
                            }
                            detail.setEndTime(new Date());
                            datacollectLogDao.saveEntity(detail);
@@ -407,17 +409,17 @@ public class DatacollectService implements IDatacollectService {
                            LogService.getLogger().info("修改任务数据集最大值为"+maxKeyvalue+"。"); //文本日志
                        }
                        message = jobDatasetName + "采集成功，"+count+"条数据。";
                        message = jobDatasetName + "采集成功"+successCount+"条数据，总条数"+count+"条。";
                    }
                }
            }
            else
            {
                message = jobDatasetName + "数据集字段映射为空！";
                throw new Exception(jobDatasetName + "数据集字段映射为空！");
            }
        }
        else{
            message = jobDatasetName + "数据集映射为空！";
            throw new Exception(jobDatasetName + "数据集映射为空！");
        }
@@ -492,30 +494,34 @@ public class DatacollectService implements IDatacollectService {
                logStr.append("/*********** 开始采集 *******************/\n");
                //遍历数据集
                for (DtoJobDataset ds : list) {
                    String type = ds.getType();
                    String message = "";
                    logStr.append(DateConvert.toString(new Date(), dateFormat) + " " + ds.getJobDatasetName());
                    if(type!=null) {
                        if (type.equals("1")) //Web Service
                        {
                            message = "Web Service采集。\n";
                        } else if (type.equals("2"))//文件系统
                        {
                            message = "文件系统采集。\n";
                        } else { //数据库
                            message = collectTable(ds, schemeVersion, logId) + "\n";
                    try {
                        String type = ds.getType();
                        String message = "";
                        logStr.append(DateConvert.toString(new Date(), dateFormat) + " " + ds.getJobDatasetName());
                        if (type != null) {
                            if (type.equals("1")) //Web Service
                            {
                                message = "Web Service采集。\n";
                            } else if (type.equals("2"))//文件系统
                            {
                                message = "文件系统采集。\n";
                            } else { //数据库
                                message = collectTable(ds, schemeVersion, logId) + "\n";
                            }
                        } else {
                            message = ds.getJobDatasetName() + "未关联数据源！\n";
                        }
                    }
                    else{
                        message = ds.getJobDatasetName() + "未关联数据源！\n";
                    }
                    if (message.length() > 0) {
                        LogService.getLogger().info(message); //文本日志
                        logStr.append(message);
                    } else {
                        success++;
                    }
                    catch (Exception ex)
                    {
                        LogService.getLogger().info("异常：" + ex.getMessage());
                        logStr.append(ex.getMessage() + "\n");
                    }
                }
                logStr.append("/*********** 结束采集 *******************/\n");
            }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/repeatDatacollect.jsp

@@ -20,11 +20,11 @@
            <div class="m-form-control">
                <input type="text" id="selJobDataset" name="jobDatasetId">
            </div>
            <label>采集状态：</label>
            <label>任务状态：</label>
            <div class="m-form-control">
                <input type="text" id="selJobStatus" name="jobStatus">
            </div>
            <label>采集时间：</label>
            <label>执行时间：</label>
            <div class="m-form-control">
               <input id="txtJobTimeFrom" type="text" name="jobTimeFrom"/>
            </div>