Merge branch 'master' of huangzhanpeng/esb_huangzhanpeng into master

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectLogDao.java

@@ -3,14 +3,18 @@ package com.yihu.ehr.datacollect.dao;
import com.yihu.ehr.datacollect.dao.intf.IDatacollectDao;
import com.yihu.ehr.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.ehr.datacollect.model.DtoJobDataset;
import com.yihu.ehr.datacollect.model.RsDatapushLog;
import com.yihu.ehr.datacollect.model.RsJobDataset;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.resource.model.RsDatasourceDataset;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Map;
@@ -38,11 +42,45 @@ public class DatacollectLogDao extends SQLGeneralDAO implements IDatacollectLogD
    /**
     * 推数据新增日志
     */
    public void addDataPushLog() throws Exception
    public void addDataPushLog(String type,String success,String content) throws Exception
    {
        String sql = "";
        //super.execute(sql);
        RsDatapushLog log = new RsDatapushLog();
        log.setType(type);
        log.setSuccess(success);
        log.setContent(content);
        log.setDatetime(new Date());
        this.saveEntity(log);
    }
    /**
     * 获取日志列表
     */
    public DataGridResult queryDataPushLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();
        sb.append("from RsDatapushLog where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("type"))) {
            sb.append(" and type ='"+conditionMap.get("type")+"'");
        }
        if (!StringUtils.isEmpty(conditionMap.get("datetimeFrom"))) {
            Date time = DateConvert.toDate(conditionMap.get("datetimeFrom").toString());
            time.setHours(0);
            time.setMinutes(0);
            time.setSeconds(0);
            sb.append(" and datetime >= '"+DateConvert.toString(time)+"'");
        }
        if (!StringUtils.isEmpty(conditionMap.get("datetimeTo"))) {
            Date time = DateConvert.toDate(conditionMap.get("datetimeTo").toString());
            time.setHours(0);
            time.setMinutes(0);
            time.setSeconds(0);
            GregorianCalendar gc=new GregorianCalendar();
            gc.setTime(time);
            gc.add(5, 1);
            sb.append(" and datetime < '"+DateConvert.toString(gc.getTime())+"'");
        }
        sb.append("order by datetime desc");
        return getDataGridResult(sb.toString(),page,pageSize);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/intf/IDatacollectLogDao.java

@@ -18,11 +18,16 @@ public interface IDatacollectLogDao extends XSQLGeneralDAO {
    /**
     * 修改
     */
    public void updateJobDatasetKeyvalue(String id, String jobDatasetKeyvalue) throws Exception;
    void updateJobDatasetKeyvalue(String id, String jobDatasetKeyvalue) throws Exception;
    /**
     * 推数据新增日志
     */
    public void addDataPushLog() throws Exception;
    void addDataPushLog(String type,String success,String content) throws Exception;
    /**
     * 获取日志列表
     */
    DataGridResult queryDataPushLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
}

Hos-resource/src/main/java/com/yihu/ehr/datacollect/model/RsDatapushLog.java

@@ -0,0 +1,58 @@
package com.yihu.ehr.datacollect.model;
import java.util.Date;
/**
 * RsJobLog entity. @author MyEclipse Persistence Tools
 */
public class RsDatapushLog implements java.io.Serializable {
	// Fields
	private String id;
	private String type;
	private String success;
	private String content;
	private Date datetime;
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
	public String getSuccess() {
		return success;
	}
	public void setSuccess(String success) {
		this.success = success;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public Date getDatetime() {
		return datetime;
	}
	public void setDatetime(Date datetime) {
		this.datetime = datetime;
	}
}

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

@@ -77,6 +77,7 @@ public class DatapushService implements IDatapushService {
        String version = datacollect.getVersion(orgCode);
        //通过标准数据集名称获取适配关系
        AdapterDatasetModel dataset = stdService.getDatasetByCode(version,datasetCode);
        String msg = "";
        if(dataset!=null)
        {
            String datasetId = dataset.getStdDatasetId().toString();
@@ -123,21 +124,34 @@ public class DatapushService implements IDatapushService {
                    if(mongo.errorMessage!=null && mongo.errorMessage.length()>0)
                    {
                        System.out.print(mongo.errorMessage);
                        return ActionResult.error("Mongodb保存失败！（表：\"+datasetCode+\"）"+mongo.errorMessage);
                        msg = "Mongodb保存失败！（表："+datasetCode+",数据："+dataString+"）"+mongo.errorMessage;
                    }
                    else {
                        return ActionResult.error("Mongodb保存失败！（表："+datasetCode+"）");
                        msg ="Mongodb保存失败！（表："+datasetCode+",数据："+dataString+"）";
                    }
                }
                //日志记录
                datacollectLog.addDataPushLog();
                return ActionResult.success("数据入库成功！");
            }
        }
        else{
            msg ="适配标准不完善！";
        }
        return ActionResult.error("适配标准不完善！");
        //是否成功
        if(msg.length()>0)
        {
            //日志记录
            datacollectLog.addDataPushLog("1","0",msg);
            return ActionResult.error(msg);
        }
        else{
            msg = "数据入库成功！（表："+datasetCode+"）";
            //日志记录
            datacollectLog.addDataPushLog("1","1",msg);
            return ActionResult.success(msg);
        }
    }

Hos-resource/src/main/resources/hbm/resource/RsDatapushLog.hbm.xml

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<!-- 
    Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
    <class name="com.yihu.ehr.datacollect.model.RsDatapushLog" table="rs_datapush_log">
        <id name="id" type="java.lang.String">
            <column name="id" length="50" />
            <generator class="uuid" />
        </id>
        <property name="type" type="java.lang.String">
            <column name="type" length="50" not-null="true">
                <comment>日志类型 1数据采集 2档案上传 3人口注册</comment>
            </column>
        </property>
        <property name="content" type="java.lang.String">
            <column name="content" length="2000" not-null="true">
                <comment>日志内容</comment>
            </column>
        </property>
        <property name="success" type="java.lang.String">
            <column name="success" length="50" not-null="true">
                <comment>是否成功</comment>
            </column>
        </property>
        <property name="datetime" type="java.sql.Timestamp">
            <column name="datetime" length="0">
                <comment>日志时间</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>