Merge remote-tracking branch 'origin/master'

.gitignore

@@ -0,0 +1,42 @@
#project files
ehr.ipr
ehr.iws
ehr.ids
*.html
*.iml
*/target/*
*/*/target/*
.idea/*
# ---> Java
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*#
# thrift generate code
commons-thrift-services/src/main/java/com/yihu/ehr/adaption
commons-thrift-services/src/main/java/com/yihu/ehr/app
commons-thrift-services/src/main/java/com/yihu/ehr/browser
commons-thrift-services/src/main/java/com/yihu/ehr/data/domain
commons-thrift-services/src/main/java/com/yihu/ehr/dict
commons-thrift-services/src/main/java/com/yihu/ehr/geography
commons-thrift-services/src/main/java/com/yihu/ehr/hadoop
commons-thrift-services/src/main/java/com/yihu/ehr/lang
commons-thrift-services/src/main/java/com/yihu/ehr/org
commons-thrift-services/src/main/java/com/yihu/ehr/pack
commons-thrift-services/src/main/java/com/yihu/ehr/patient
commons-thrift-services/src/main/java/com/yihu/ehr/profile
commons-thrift-services/src/main/java/com/yihu/ehr/resolve
commons-thrift-services/src/main/java/com/yihu/ehr/resource
commons-thrift-services/src/main/java/com/yihu/ehr/security
commons-thrift-services/src/main/java/com/yihu/ehr/std
commons-thrift-services/src/main/java/com/yihu/ehr/user

src/test/java/com/yihu/ehr/test/DataHandling.java

@@ -25,6 +25,8 @@ public class DataHandling {
    private static final int thread = 10;
    private static final ObjectMapper objectMapper = new ObjectMapper();
    private static final String token = "ffd13e62-e67a-45b3-9c33-cc3d935fab30";
    public static void main(String [] args) {
        start();
    }
@@ -58,7 +60,7 @@ public class DataHandling {
                            System.getProperty("java.io.tmpdir") + java.io.File.separator + filePath.substring(filePath.lastIndexOf("/") + 1),
                            null, null);*/
                        Map<String, String> header = new HashMap<>();
                        header.put("token", "ae416ecb-c944-4e01-a8fa-98f1d7c9535f");
                        header.put("token", token);
                        String _id = data.get("_id").toString();
                        file = HttpUtils.download("http://jksr.srswjw.gov.cn:1235/gateway/pack-mgr/api/v1.0/packages/download/" + _id,
                                System.getProperty("java.io.tmpdir") + File.separator + filePath.substring(filePath.lastIndexOf("/") + 1),
@@ -67,7 +69,7 @@ public class DataHandling {
                        if (remotePath != null) {
                            sourceMap.put("remote_path", remotePath);
                            sourceMap.put("pwd", data.get("pwd"));
                            sourceMap.put("receive_date", data.get("receive_date"));
                            sourceMap.put("receive_date", "2018-09-05 13:00:00");
                            sourceMap.put("org_code", data.get("org_code"));
                            sourceMap.put("org_name", data.get("org_name"));
                            sourceMap.put("org_area", data.get("org_area"));
@@ -83,7 +85,7 @@ public class DataHandling {
                            params.put("index", "json_archives");
                            params.put("type", "info");
                            params.put("source", objectMapper.writeValueAsString(sourceMap));
                            HttpResponse httpResponse = HttpUtils.doPost("http://172.17.110.227:10770/api/v1.0/elasticSearch/index", params, null);
                            HttpResponse httpResponse = HttpUtils.doPost("http://172.17.110.181:10770/api/v1.0/elasticSearch/index", params, null);
                            LOGGER.info(httpResponse.getContent());
                        }
                    } catch (Exception e) {
@@ -102,14 +104,14 @@ public class DataHandling {
        Map<String, Object> params = new HashMap<>();
        params.put("index", "json_archives");
        params.put("type", "info");
        params.put("filter", "event_date>=2018-07-01 00:00:00;event_date<2018-08-01 00:00:00;pack_type=1;archive_status=3");
        params.put("filter", "pack_type=2;archive_status=3;");
        params.put("sorts", "+event_date");
        params.put("page", page);
        params.put("size", size);
        Map<String, String> header = new HashMap<>();
        header.put("token", "ae416ecb-c944-4e01-a8fa-98f1d7c9535f");
        header.put("token", token);
        try {
            HttpResponse response = HttpUtils.doGet("http://jksr.srswjw.gov.cn:1235/gateway/dfs/api/v1.0/elasticSearch/pageSort", params, header);
            HttpResponse response = HttpUtils.doGet("http://jksr.srswjw.gov.cn:1235/gateway/dfs/api/v1.0/elasticSearch/page", params, header);
            Envelop envelop = objectMapper.readValue(response.getContent(), Envelop.class);
            return envelop;
        } catch (Exception e) {
@@ -123,7 +125,7 @@ public class DataHandling {
        params.put("objectId", "profile");
        params.put("creator", "Progr1mmer");
        try {
            HttpResponse httpResponse = HttpUtils.doUpload("http://172.17.110.227:10770/api/v1.0/fastDfs/upload", params, null, "file", file);
            HttpResponse httpResponse = HttpUtils.doUpload("http://172.17.110.181:10770/api/v1.0/fastDfs/upload", params, null, "file", file);
            if (httpResponse.isSuccessFlg()) {
                Envelop envelop = objectMapper.readValue(httpResponse.getContent(), Envelop.class);
                Map<String, Object> data = (Map<String, Object>) envelop.getObj();