Merge branch 'master' of chenweida/esb into master

Hos-Resource-Mini-Update/target/classes/config/threadConfig.properties

@@ -1,6 +1,6 @@
soft.versionCode=1
## service address
service.url=https://ehr.yihu.com/api/v1.0/
service.url=https://172.19.103.73:443/api/v1.0/
service.clientId = kHAbVppx44
service.clientKey = Bd2h8rdYhep6NKOO
service.username=user
@@ -15,7 +15,7 @@ updateThread.downUpdateWar=simplified-esb/downUpdateWar
updateThread.uploadResult=simplified-esb/uploadResult
##service name
tomcat.servicename=tomcat8-esb-service
tomcat.servicename=tomcat8-esb-ds
##token
token.info={"fingerprint": "abc"}
@@ -24,4 +24,6 @@ token.getToken=authorizations/clients/
token.user_name=kHAbVppx44
system.code=MINIESB
system.code=MINIESB
system.downloadPath=http://172.19.103.54/

Hos-Resource-Mini-helper/src/main/java/com.yihu.ehr/thread/SQLThread.java

@@ -222,7 +222,19 @@ public class SQLThread implements Runnable {
                    JSONObject jo = JSONObject.fromObject(fillMiningResponString);
                    String id = (String) jo.get("id");
                    String startTime = (String) jo.get("startTime");
                    if (StringUtils.isEmpty(startTime) || startTime.equals("null")) {
                        LogUtil.info("-----------开始时间格式有错");
                        return;
                    }
                    String endtime = (String) jo.get("endTime");
                    if (StringUtils.isEmpty(endtime) || endtime.equals("null")) {
                        LogUtil.info("-----------结束时间格式有错");
                        return;
                    }
                    if (StringUtils.isEmpty(id) || id.equals("null")) {
                        LogUtil.info("-----------id格式有错");
                        return;
                    }
                    String sql = "insert into crawler_supply (id,start_time,end_time,status,remote_id) values " +
                            "('" + UUID.randomUUID() + "'," +
                            "'" + startTime + "' ," +

Hos-Resource-Mini-helper/src/main/resources/config/threadConfig.properties

@@ -1,6 +1,6 @@
soft.versionCode=1
## service address
service.url=https://172.19.103.73:443/api/v1.0/
service.url=https://192.168.131.15:443/api/v1.0/
service.clientId = kHAbVppx44
service.clientKey = Bd2h8rdYhep6NKOO
logThread.sleepTime=1
@@ -9,7 +9,7 @@ sqlThread.sleepTime=30
## logThread sleep time  min
logThread.uploadLog=simplified-esb/uploadLog
logThread.uploadLog=esb/uploadLog
logThread.getUploadFlag=simplified-esb/getUploadFlag

Hos-Resource-Mini/src/main/java/com.yihu.ehr/controller/DataAcquisitionController.java

@@ -1,15 +1,23 @@
package com.yihu.ehr.controller;
import com.yihu.ehr.common.constants.Constants;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.model.DataAcquistion;
import com.yihu.ehr.model.RespResult;
import com.yihu.ehr.service.intf.IDataAcquisitionManager;
import com.yihu.ehr.util.operator.StringUtil;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/3/18.
@@ -20,21 +28,35 @@ public class DataAcquisitionController {
    @Autowired
    private IDataAcquisitionManager dataAcquisitionManager;
    private DBHelper db = new DBHelper();
    @RequestMapping(value = "/getData")
    @ResponseBody
    public RespResult getData(HttpServletRequest request) throws Exception {
        RespResult r = new RespResult();
        //得到参数
        try {
            String transactionCode = request.getParameter("transactionCode");
            String page = request.getParameter("page");
            String filter = request.getParameter("filter");
            if (!StringUtils.isEmpty(transactionCode)) {
                r.setData(gate(request, transactionCode, page, filter));
            } else {
                r.setRespCode(Constants.SYSTEM_PARAMS);
                r.setRespMessage(Constants.SYSTEM_PARAMS_MESSAGE);
            //判断transactionCode是否错误
            if (StringUtil.isEmpty(transactionCode)) {
                r.setRespCode(Constants.SYSTEM_ERROR);
                r.setRespMessage("transactionCode为空");
                return r;
            }
            //根据transactionCode查找数据库
            List<JSONObject> list = db.query("select * from data_acquisition where transactioncode='" + transactionCode + "'");
            if (list == null && list.size() == 0) {
                r.setRespCode(Constants.SYSTEM_ERROR);
                r.setRespMessage("transactionCode不存在");
                return r;
            }
            //得到参数
            Map<String, String[]> paramsMap = request.getParameterMap();
            Map<String, Object> params = new HashMap<String, Object>();
            for (Map.Entry<String, String[]> a : paramsMap.entrySet()) {
                params.put(a.getKey(), a.getValue()[0]);
            }
            JSONObject jo = list.get(0);
            r.setData(dataAcquisitionManager.gate(jo, params));
            //根据参数选择业务函数
            r.setTransactionCode(transactionCode);
        } catch (Exception e) {
@@ -44,36 +66,104 @@ public class DataAcquisitionController {
        return r;
    }
    /**
     * 根据参数选择业务函数
     *
     * @param request
     * @param transactionCode
     * @param page
     * @param filter
     * @return
     */
    private String gate(HttpServletRequest request, String transactionCode, String page, String filter) {
        if (Constants.GETPATIENTQUEUE.equals(transactionCode)) {
            //获取就诊病人列表（GetPatientQueue）]
            String beginDate = request.getParameter("beginDate");
            String endDate = request.getParameter("endDate");
            return dataAcquisitionManager.getPatientQueue(beginDate, endDate, page, filter);
    /*
   系统参数页面
    */
    @RequestMapping("/dataAcquisitionManager")
    public String paramManager(Model model) {
        try {
            model.addAttribute("contentPage", "/datacquisition/dataAcquistion");
            return "partView";
        } catch (Exception ex) {
            model.addAttribute("errorMessage", ex.getMessage());
            return "error";
        }
    }
    @RequestMapping("getDataAcquisition")
    @ResponseBody
    public Result getDataAcquisition(int page, int rows) {
        try {
            return dataAcquisitionManager.getDataAcquisition(page, rows);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    @RequestMapping("editorDataAcq")
    public String editorDataAcq(Model model, String dataId) {
        try {
            //是否编辑
            if (dataId != null && dataId.length() > 0) {
                //获取菜单信息
                DataAcquistion jsonS = dataAcquisitionManager.getDataAcquisitionById(dataId);
                model.addAttribute("model", jsonS);
            }
            model.addAttribute("contentPage", "datacquisition/editorDataAcq");
            return "pageView";
        } catch (Exception ex) {
            model.addAttribute("contentPage", "datacquisition/editorDataAcq");
            return "pageView";
        }
    }
    @RequestMapping("addDataAcquisition")
    @ResponseBody
    public Result addDataAcquisition(HttpServletRequest request) {
        try {
            String url = request.getParameter("url");
            String request_type = request.getParameter("request_type");
            String transactioncode = request.getParameter("transactioncode");
            String url_type = request.getParameter("url_type");
            String name = request.getParameter("name");
        } else if (Constants.GETPATIENTDATASET.equals(transactionCode)) {
            //获取就诊病人档案数据集（GetPatientDataset）
            String patientId = request.getParameter("patientId");
            String eventNo = request.getParameter("eventNo");
            String datasetCode = request.getParameter("datasetCode");
            return dataAcquisitionManager.getPatientDataset(patientId, eventNo, datasetCode);
            if (dataAcquisitionManager.getDataAcquisitionByCode(transactioncode) != null) {
                return Result.error("接口代码已经存在");
            }
            if (dataAcquisitionManager.getDataAcquisitionByName(name) != null) {
                return Result.error("接口名称已经存在");
            }
            return dataAcquisitionManager.addDataAcquisition(url, request_type, transactioncode, url_type, name);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Result.error(ex.getMessage());
        }
    }
    @RequestMapping("updateDataAcquisition")
    @ResponseBody
    public Result updateDataAcquisition(HttpServletRequest request) {
        try {
            String url = request.getParameter("url");
            String id = request.getParameter("id");
            String request_type = request.getParameter("request_type");
            String transactioncode = request.getParameter("transactioncode");
            String url_type = request.getParameter("url_type");
            String name = request.getParameter("name");
            if (dataAcquisitionManager.getDataAcquisitionByCode(transactioncode, id) != null) {
                return Result.error("接口代码已经存在");
            }
            if (dataAcquisitionManager.getDataAcquisitionByName(name, id) != null) {
                return Result.error("接口名称已经存在");
            }
            return dataAcquisitionManager.updateDataAcquisition(url, request_type, transactioncode, url_type, name, id);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Result.error(ex.getMessage());
        }
    }
    @RequestMapping("deleteDataAcquisition")
    @ResponseBody
    public Result deleteDataAcquisition(HttpServletRequest request) {
        try {
        } else if (Constants.POSTPATIENTDATASET.equals(transactionCode)) {
            //上传就诊病人档案数据集（PostPatientDataset）
            String patientId = request.getParameter("patientId");
            String eventNo = request.getParameter("eventNo");
            String dataset = request.getParameter("dataset");
            return dataAcquisitionManager.postPatientDataset(patientId, eventNo, dataset);
            String id = request.getParameter("id");
            return dataAcquisitionManager.deleteAataAcquisition(id);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Result.error(ex.getMessage());
        }
        return "";
    }
}

Hos-Resource-Mini/src/main/java/com.yihu.ehr/model/DataAcquistion.java

@@ -0,0 +1,61 @@
package com.yihu.ehr.model;
/**
 * Created by chenweida on 2016/3/28.
 */
public class DataAcquistion {
    private String id;
    private String url;
    private String name;
    private String transactioncode;
    private String request_type;
    private String url_type;
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getTransactioncode() {
        return transactioncode;
    }
    public void setTransactioncode(String transactioncode) {
        this.transactioncode = transactioncode;
    }
    public String getRequest_type() {
        return request_type;
    }
    public void setRequest_type(String request_type) {
        this.request_type = request_type;
    }
    public String getUrl_type() {
        return url_type;
    }
    public void setUrl_type(String url_type) {
        this.url_type = url_type;
    }
}

Hos-Resource-Mini/src/main/java/com.yihu.ehr/service/DataAcquisitionManager.java

@@ -1,10 +1,20 @@
package com.yihu.ehr.service;
import com.yihu.ehr.dbhelper.common.DBList;
import com.yihu.ehr.dbhelper.common.DBQuery;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.model.DataAcquistion;
import com.yihu.ehr.service.intf.IDataAcquisitionManager;
import com.yihu.ehr.util.httpclient.HttpHelper;
import com.yihu.ehr.util.json.JSON;
import org.json.JSONObject;
import org.springframework.stereotype.Service;
import java.io.File;
import java.util.Map;
import java.util.UUID;
/**
 * Created by chenweida on 2016/3/18.
@@ -12,29 +22,159 @@ import java.io.File;
@Service("dataAcquisitionManager")
public class DataAcquisitionManager implements IDataAcquisitionManager {
    DBQuery query = new DBQuery();
    DBHelper db = new DBHelper();
    @Override
    public String gate(JSONObject jo, Map<String, Object> params) {
        String responMsg = "";
        String path = (String) jo.get("url");
        String requestType = (String) jo.get("request_type");//1是查询 2是文件上传
        String urlType = (String) jo.get("url_type");//1是post 2是 get
        //判断是http请求还是https
        responMsg = getResponMsg(path, requestType, urlType, params);
        return responMsg;
    }
    @Override
    public Result getDataAcquisition(int page, int size) throws Exception {
        String sql = "select * from data_acquisition where 1=1";
        DBList list = query.queryBySql(sql, page, size);
        return DataGridResult.fromDBList(list);
    }
    @Override
    /**
     * 格式YYYY-MM-DD HH:mm:ss
     */
    public String getPatientQueue(String beginDate, String endDate, String page, String filter) {
    public DataAcquistion getDataAcquisitionById(String dataId) throws Exception {
        return null;
        String sql = "select * from data_acquisition where id='" + dataId + "'";
        DBList list = query.queryBySql(sql);
        if (list != null && list.getList().size() > 0) {
            DataAcquistion d = new DataAcquistion();
            d.setId((String) list.getList().get(0).get("id"));
            d.setName((String) list.getList().get(0).get("name"));
            d.setRequest_type((String) list.getList().get(0).get("request_type"));
            d.setTransactioncode((String) list.getList().get(0).get("transactioncode"));
            d.setUrl((String) list.getList().get(0).get("url"));
            d.setUrl_type((String) list.getList().get(0).get("url_type"));
            return d;
        } else {
            return null;
        }
    }
    @Override
    public String getPatientDataset(String patientId, String eventNo, String datasetCode) {
        return null;
    public Result addDataAcquisition(String url, String request_type, String transactioncode, String url_type, String name) throws Exception {
        String sql = "insert into data_acquisition (id,url,request_type,transactioncode,url_type,name) values " +
                "('" + UUID.randomUUID() + "'," +
                " '" + url + "' ," +
                " '" + request_type + "' ," +
                " '" + transactioncode + "' ," +
                " '" + url_type + "' ," +
                " '" + name + "' " +
                ")";
        db.execute(sql);
        return Result.success("保存成功");
    }
    @Override
    public String postPatientDataset(String patientId, String eventNo, String dataset) {
        //转文件
        File f = JSON.json2File(patientId, eventNo, dataset);
        //文件上传
    public Result getDataAcquisitionByCode(String transactioncode) throws Exception {
        String sql = "select * from data_acquisition where transactioncode='" + transactioncode + "'";
        DBList list = query.queryBySql(sql);
        if (list.getList() != null && list.getList().size() > 0) {
            return DataGridResult.fromDBList(list);
        } else {
            return null;
        }
    }
    @Override
    public Object getDataAcquisitionByName(String name) throws Exception {
        String sql = "select * from data_acquisition where name='" + name + "'";
        DBList list = query.queryBySql(sql);
        if (list.getList() != null && list.getList().size() > 0) {
            return DataGridResult.fromDBList(list);
        } else {
            return null;
        }
    }
    @Override
    public Object getDataAcquisitionByCode(String transactioncode, String id) throws Exception {
        String sql = "select * from data_acquisition where transactioncode='" + transactioncode + "' and id !='" + id + "'";
        DBList list = query.queryBySql(sql);
        if (list.getList() != null && list.getList().size() > 0) {
            return DataGridResult.fromDBList(list);
        } else {
            return null;
        }
    }
    @Override
    public Object getDataAcquisitionByName(String name, String id) throws Exception {
        String sql = "select * from data_acquisition where name='" + name + "' and id !='" + id + "'";
        DBList list = query.queryBySql(sql);
        if (list.getList() != null && list.getList().size() > 0) {
            return DataGridResult.fromDBList(list);
        } else {
            return null;
        }
    }
    @Override
    public Result updateDataAcquisition(String url, String request_type, String transactioncode, String url_type, String name, String id) throws Exception {
        String sql = "update data_acquisition set " +
                " url= '" + url + "' ," +
                " request_type='" + request_type + "' ," +
                " transactioncode='" + transactioncode + "' ," +
                " url_type='" + url_type + "' ," +
                " name='" + name + "' where id='" + id + "'";
        db.execute(sql);
        return Result.success("更新成功");
    }
    @Override
    public Result deleteAataAcquisition(String id) throws Exception {
        String sql = "delete from data_acquisition  where id='" + id + "'";
        db.execute(sql);
        return Result.success("删除成功");
    }
        //删除文件
        f.delete();
        return null;
    private String getResponMsg(String path, String requestType, String urlType, Map<String, Object> params) {
        //1是拉推数据
        String responseMsg = "";
        if ("1".equals(requestType)) {
            if ("1".equals(urlType)) {
                //post
                responseMsg = HttpHelper.post(path, params).getBody();
            } else if ("2".equals(urlType)) {
                //get
                responseMsg = HttpHelper.get(path, params).getBody();
            }
            //2文件上传
        } else if ("2".equals(requestType)) {
            /*
            if ("1".equals(urlType)) {
                //post
                responseMsg = HttpHelper.post(path, params).getBody();
            } else if ("2".equals(urlType)) {
                //get
                responseMsg = HttpHelper.get(path, params).getBody();
            }
            */
            File f = JSON.json2File(params);
            //文件上传
            if ("1".equals(urlType)) {
                //post
                responseMsg = HttpHelper.postFile(path, null, f).getBody();
            }
            //删除文件
            f.delete();
        }
        return responseMsg;
    }

Hos-Resource-Mini/src/main/java/com.yihu.ehr/service/intf/IDataAcquisitionManager.java

@@ -1,12 +1,34 @@
package com.yihu.ehr.service.intf;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.model.DataAcquistion;
import org.json.JSONObject;
import java.util.Map;
/**
 * Created by chenweida on 2016/3/18.
 */
public interface IDataAcquisitionManager {
    String getPatientQueue(String beginDate, String endDate,String page,String filter);
    String getPatientDataset(String patientId, String eventNo, String datasetCode);
    String gate(JSONObject jo, Map<String,Object> params);
    Result getDataAcquisition(int page, int rows) throws  Exception;
    DataAcquistion getDataAcquisitionById(String dataId)throws  Exception;
    Result addDataAcquisition(String url, String request_type, String transactioncode, String url_type, String name)throws  Exception;
    Result getDataAcquisitionByCode(String transactioncode)throws  Exception;
    Object getDataAcquisitionByName(String name)throws  Exception;
    Object getDataAcquisitionByCode(String transactioncode, String id)throws  Exception;
    Object getDataAcquisitionByName(String name, String id)throws  Exception;
    Result updateDataAcquisition(String url, String request_type, String transactioncode, String url_type, String name, String id)throws  Exception;
    Result deleteAataAcquisition(String id)throws  Exception;
    String postPatientDataset(String patientId, String eventNo, String dataset);
}

Hos-Resource-Mini/src/main/java/com.yihu.ehr/util/httpclient/HttpClientUtil.java

@@ -142,17 +142,16 @@ public class HttpClientUtil {
     * 发送文件
     *
     * @param url        路径
     * @param filePath   文件路径
     * @param formParams 参数
     * @return
     */
    public static Response postFile(String url, String filePath, List<NameValuePair> formParams,SSLConnectionSocketFactory ssl, String username, String password) {
    public static Response postFile(String url,
                                    File file, List<NameValuePair> formParams,SSLConnectionSocketFactory ssl, String username, String password) {
        Response re = new Response();
        CloseableHttpResponse response = null;
        CloseableHttpClient httpClient = getCloseableHttpClient(ssl);
        try{
            File file = new File(filePath);
            //设置请求信息
            RequestConfig requestConfig = RequestConfig.custom().

Hos-Resource-Mini/src/main/java/com.yihu.ehr/util/httpclient/HttpHelper.java

@@ -139,7 +139,26 @@ public class HttpHelper {
    }
    public static Response postFile(String url, List<NameValuePair> formParams, String filePath)
    {
        return HttpClientUtil.postFile(url, filePath, formParams, defaultSSL,defaultHttpUser,defaultHttpPassword);
        File file = new File(filePath);
        if(url.startsWith("https"))
        {
            return HttpClientUtil.postFile(url, file, formParams, defaultSSL,defaultHttpUser,defaultHttpPassword);
        }
        else{
        //默认http不走ssl和用户密码
        return HttpClientUtil.postFile(url, file, formParams, null,defaultHttpUser,defaultHttpPassword);
    }
    }
    public static Response postFile(String url, List<NameValuePair> formParams, File file)
    {
        if(url.startsWith("https"))
        {
            return HttpClientUtil.postFile(url, file, formParams, defaultSSL,defaultHttpUser,defaultHttpPassword);
        }
        else{
            //默认http不走ssl和用户密码
            return HttpClientUtil.postFile(url, file, formParams, null,defaultHttpUser,defaultHttpPassword);
        }
    }
    /************************** Put方法 ******************************************/
    public static Response put(String url)

Hos-Resource-Mini/src/main/java/com.yihu.ehr/util/json/JSON.java

@@ -7,6 +7,7 @@ import net.sf.json.JSONObject;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
/**
 * Created by chenweida on 2016/3/24.
@@ -14,13 +15,16 @@ import java.util.Date;
public class JSON {
    public static final String[] key = {"data", "event_no", "patient_id"};
    public static File json2File(String patientId, String eventNo, String dataset) {
    public static File json2File(Map<String,Object> params) {
        String dataset= (String) params.get("dataset");
        //先转json
        String jsonDataSet = XML2JSON.xml2JSON(dataset);
        JSONObject jo = new JSONObject();
        jo.put(key[0], dataset);
        jo.put(key[1], eventNo);
        jo.put(key[2], patientId);
        for(Map.Entry<String,Object> a:params.entrySet()){
            if(!"dataset".equals(a.getKey())){
                jo.put(a.getKey(),a.getValue());
            }
        }
        String jsonString=jo.toString();
        //json转文件
        String home = System.getProperty("catalina.home").replace('\\', '/');

Hos-Resource-Mini/src/main/resources/config/dataAcquisition.properties

@@ -1,3 +0,0 @@
service.url=https://172.19.103.73:443/api/v1.0/
service.clientId = kHAbVppx44
service.clientKey = Bd2h8rdYhep6NKOO

Hos-Resource-Mini/src/main/resources/spring/applicationContext.xml

@@ -43,5 +43,4 @@
    <bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"/>
    <util:properties id="sys" location="classpath:config/dataAcquisition.properties"/>
</beans>

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/common/indexJs.jsp

@@ -67,7 +67,8 @@
                {id: 2, text: '采集标准',icon:'${staticRoot}/images/index/menu2_icon.png', url: '${contextRoot}/datacollect/stdManager'},
                {id: 3, text: '任务跟踪',icon:'${staticRoot}/images/index/menu3_icon.png', url: '${contextRoot}/datacollect/trackJob'},
                {id: 4, text: '任务补采',icon:'${staticRoot}/images/index/menu4_icon.png', url: '${contextRoot}/datacollect/repeatJob'},
                {id: 5, text: '系统参数',icon:'${staticRoot}/images/index/menu5_icon.png', url: '${contextRoot}/system/paramManager'}
                {id: 5, text: '系统参数',icon:'${staticRoot}/images/index/menu5_icon.png', url: '${contextRoot}/system/paramManager'},
                {id: 6, text: '接口配置',icon:'${staticRoot}/images/index/menu5_icon.png', url: '${contextRoot}/dataAcquisition/dataAcquisitionManager'}
            ];
            me.menuTree = $('#ulTree').ligerTree({
                data: menu,

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/datacquisition/dataAcquistion.jsp

@@ -0,0 +1,18 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<div id="divMain" style="padding-top:10px;padding-left: 10px;padding-right:10px;">
    <div class="m-form-group" style="margin-bottom:10px;">
        <div class="m-form-control m-form-control-fr" style="float: right">
            <div id="div_new_record" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                <span>新增</span>
            </div>
        </div>
    </div>
    <div id="divGrid">
    </div>
</div>

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/datacquisition/dataAcquistionJs.jsp

@@ -0,0 +1,154 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<script>
    var dataAcquistion = {
        grid:null,
        dialog:null,
        init:function(){
            var me = this;
            $("#txtTimeFrom").ligerDateEditor({width:150,showTime:true});
            $("#txtTimeTo").ligerDateEditor({width:150,showTime:true});
            dataAcquistion.grid = $("#divGrid").ligerGrid({
                url: '${contextRoot}/dataAcquisition/getDataAcquisition',
                columns: [
                    {display:'接口名称',name:'transactioncode', width:'20%'},
                    {display:'接口代码',name:'transactioncode', width:'10%'},
                    {display:'接口请求方式',name:'request_type', width:'10%',render:function(row,index,value){
                        if(value=="1")
                        //1是查询 2是文件上传
                            return "查询";
                        else if(value=="2")
                            return "文件上传";
                    }},
                    {display:'接口请求类型',name:'url_type', width:'10%',render:function(row,index,value){
                        if(value=="1")
                            return "POST";
                        else if(value=="2")
                            return "GET";
                    }},
                    {display:'远程接口URL',name:'url', width:  '30%',align:'center'},
                    {display:'操作',name:'adapter_dataset_code', width:  '19%', render: function (row) {
                            var html = '<div class="m-inline-buttons" style="width:90px;">';
                            html += '<a class="m-btn-edit" onclick="dataAcquistion.editData(\''+row.id+'\')"></a>';
                            html += '<a class="m-btn-delete" onclick="dataAcquistion.deleteData(\''+row.id+'\')"></a>';
                            html += '</div>';
                            return html;
                        }
                    }
                ],
                onDblClickRow: function (row) {
                    dataAcquistion.editData(row.id);
                },
            });
            $("#btnRepeat").click(function(){
                me.repeat();
            });
            $("#div_new_record").click(function(){
                dataAcquistion.editData();
            });
        },
        editData:function(id){
            var title = "新增接口配置";
            var params = null;
            if (id != undefined && id != null) {
                title = "编辑接口配置";
                params = {dataId: id};
            }
            dataAcquistion.dialog = $.ligerDialog.open({
                height: 420,
                width: 600,
                title: title,
                url: '${contextRoot}/dataAcquisition/editorDataAcq',
                //load: true,
                urlParms: params
            });
        },
        //删除补采
        deleteData:function(id){
            $.ligerDialog.confirm("是否确认要删除该条记录？", function (confirm) {
                if (confirm)
                {
                    $.ajax({
                        type: "POST",
                        url : "${contextRoot}/dataAcquisition/deleteDataAcquisition",
                        dataType : "json",
                        data:{id:id},
                        cache:false,
                        success :function(data){
                            if(data.successFlg) {
                                $.ligerDialog.success("删除成功");
                                dataAcquistion.grid.reload();
                            }
                            else{
                                $.ligerDialog.error(data.message);
                            }
                        },
                        error :function(data){
                            $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                        }
                    });
                }
            });
        },
        //弹窗返回
        dialogSuccess: function (message) {
            $.ligerDialog.success(message);
            dataAcquistion.grid.reload();
            this.dialog.close();
        },
        //新增补采
        repeat:function(){
            var me = this;
            var start = $("#txtTimeFrom").ligerDateEditor("getValue");
            var end = $("#txtTimeTo").ligerDateEditor("getValue");
            if(start==null||start.length==0)
            {
                $.ligerDialog.error("补采开始时间不能为空！");
                return;
            }
            if(end==null||end.length==0)
            {
                $.ligerDialog.error("补采结束时间不能为空！");
                return;
            }
            if(start>end)
            {
                $.ligerDialog.error("开始时间不能大于结束时间！");
                return;
            }
            $.ajax({
                type: "POST",
                url : "${contextRoot}/datacollect/addJobRepeat",
                dataType : "json",
                data:{startTime:start,endTime:end},
                cache:false,
                success :function(data){
                    if(data.successFlg) {
                        $.ligerDialog.success(data.message);
                        me.grid.reload();
                    }
                    else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error :function(data){
                    $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                }
            });
        }
    };
    $(function(){
        dataAcquistion.init();
    });
</script>

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/datacquisition/editorDataAcq.jsp

@@ -0,0 +1,62 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<!--######机构管理页面 > 机构信息对话框模板页######-->
<div id="div_info_form" class="m-form-inline" style="padding-top:10px;" data-role-form>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>接口名称：</label>
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field required" name="name"/>
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>接口代码：</label>
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field required" name="transactioncode"/>
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>接口请求类型：</label>
        <div class="m-form-control">
                <input id="request_type" type="text" class="l-text-field required" name="request_type"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>接口请求方式：</label>
        <div class="m-form-control">
                <input id="url_type" type="text" class="l-text-field" name="url_type"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>url：</label>
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field" name="url"/>
            </div>
        </div>
    </div>
    <!-- 隐藏字段 -->
    <div class="m-form-group" style="display: none;">
        <input name="id" hidden="hidden"/>
    </div>
    <div class="m-form-bottom">
        <div id="btnCancel" class="l-button l-button-no">
            <span>关闭</span>
        </div>
        <div id="btnSave" class="l-button">
            <span>保存</span>
        </div>
    </div>
</div>

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/datacquisition/editorDataAcqCss.jsp

@@ -0,0 +1,21 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<style>
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group {
        margin-bottom: 0px;
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group span {
        line-height: 2
    }
    #div_wrapper #div_wrapper_right .div_wrapper_right_top .m-form-inline .m-form-group center hr {
        height: 1px;
        border: none;
        border-top: 1px solid #2d9bd2;
        margin-top: 0px;
        margin-bottom: 0px
    }
</style>

Hos-Resource-Mini/src/main/webapp/WEB-INF/jsp/datacquisition/editorDataAcqJs.jsp

@@ -0,0 +1,97 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/commons/commonInclude.jsp" %>
<script type="text/javascript">
    /* *************************** 模块初始化 ***************************** */
    var editorData = {
        //form
        //$form: $("#div_info_form"),
        actionUrl: "${contextRoot}/dataAcquisition/addDataAcquisition",
        //validator: null,
        init: function () {
            this.initForm();
            this.bindEvents();
        },
        initForm: function () {
            var me = this;
            // me.$form.attrScan();
            var modelString = "${model.id}";
            var data;
            $('#request_type').ligerComboBox({
                width:100,
                data:[{value:"查询",code:"1"},
                    {value:"文件上传",code:"2"}
                ]});
            $('#url_type').ligerComboBox({
                width:100,
                data:[{value:"POST",code:"1"},
                    {value:"GET",code:"2"}
            ]});
            if (modelString != undefined && modelString != null && modelString.length > 0) {
                data = {
                    id: "${model.id}",
                    transactioncode: "${model.transactioncode}",
                    request_type: "${model.request_type}",
                    url_type: "${model.url_type}",
                    name: "${model.name}",
                    url: "${model.url}"
                };
                me.actionUrl = "${contextRoot}/dataAcquisition/updateDataAcquisition";
            }
            $("#div_info_form").ligerAutoForm({
                data: data,
                validate: {
                    code: "required",
                    name: {
                        required: true
                    }
                },
                message: {
                    code: "代码不能为空！",
                    name: "名称不能为空！"
                }
            });
        },
        bindEvents: function () {
            var me = this;
            $("#btnSave").click(function () {
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    return;
                }
                var data = $("#div_info_form").ligerAutoForm("getData");
                $.ajax({ //ajax处理
                    type: "POST",
                    url: me.actionUrl,
                    dataType: "json",
                    data: data,
                    cache: false,
                    success: function (data) {
                        if (data.successFlg) {
                            parent.dataAcquistion.dialogSuccess("保存成功");
                        }
                        else {
                            $.ligerDialog.error(data.message);
                        }
                    },
                    error: function (data) {
                        $.ligerDialog.error("Status:" + data.status + "(" + data.statusText + ")");
                    }
                });
            });
            $("#btnCancel").click(function () {
                parent.dataAcquistion.dialog.close();
            });
        }
    };
    $(function () {
        editorData.init();
    });
</script>

Hos-Resource-Mini/src/main/webapp/WEB-INF/web.xml

@@ -63,7 +63,7 @@
        </init-param>
        <init-param>
            <param-name>notCheckURLList</param-name>
            <param-value>/loginPage;/system/loginAction;/error</param-value>
            <param-value>/loginPage;/system/loginAction;/error;/dataAcquisition/getData;/dataAcquisition/getDataAcquisition;</param-value>
        </init-param>
    </filter>
    <filter-mapping>