流程修改——档案上传入库

hos-camel2/src/main/java/camel/central/archives/processor/ArchivesService.java

@@ -2,6 +2,7 @@ package camel.central.archives.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.core.encrypt.MD5;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import org.apache.camel.Exchange;
@@ -9,6 +10,7 @@ import org.apache.camel.Message;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.io.File;
import java.io.IOException;
/**
@@ -25,8 +27,8 @@ public class ArchivesService {
    public void bodyValue(Exchange exchange) {
        Message in = exchange.getIn();
        String body = in.getBody(String.class);
        System.out.println("入库解析结果："+body);
        exchange.getOut().setBody(body);
    }
@@ -52,5 +54,9 @@ public class ArchivesService {
    }
    public static void main(String[] args) throws Exception {
        String value= MD5.getMd5ByFile(new File("E:\\test\\可使用包\\dc3ec66729fef8f1311f247a34fa7e_4.zip"));
        System.out.println(value);
    }
}

hos-camel2/src/main/java/camel/central/archives/route/ArchivesRouterBuilder.java

@@ -36,12 +36,12 @@ public class ArchivesRouterBuilder extends RouteBuilder {
        context.addComponent(ArchivesConstant.CAMEL_COMPONENT, JmsComponent.jmsComponentAutoAcknowledge(connectionFactory));
        // 档案上传接口代理 (兼容非病人维度上传）
        from("jetty:http://0.0.0.0:9912/api/dataset_package?bridgeEndpoint=true&enableMultipartFilter=false").routeId("datasetUpload1")
        from("jetty:http://0.0.0.0:9912/api/datasetPackages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("datasetUpload1")
                .removeHeaders("CamelHttp*")
                .setHeader("User-Agent", header("UserAgent"))//使用postman测试时，无法设置User-Agent，使用UserAgent来获取
//                .setHeader("User-Agent", header("UserAgent"))//使用postman测试时，无法设置User-Agent，使用UserAgent来获取
//                .to("jetty:http://192.168.1.221:10140/api/v1.0/dataset_package")
                .to("jetty:http://192.168.131.106:10140/api/v1.0/datasetPackages")//上传档案
                .to("jetty:http://192.168.1.221:10140/api/v1.0/datasetPackages")//上传档案
//                .to("jetty:http://192.168.131.106:10140/api/v1.0/datasetPackages")//上传档案
                .choice()
                .when(header(Exchange.HTTP_RESPONSE_CODE).isEqualTo("200")).to(ExchangePattern.InOnly, ArchivesConstant.CAMEL_ENDPOINT)//成功：发送入库消息
                .otherwise().log("上传失败").to("stream:out")
@@ -51,7 +51,8 @@ public class ArchivesRouterBuilder extends RouteBuilder {
        //入库请求（消费MQ消息，发送入库接口请求）
        from(ArchivesConstant.CAMEL_ENDPOINT)
                .to("bean:archivesService?method=storageArchive")//参数设置
                .to("restlet:http://192.168.131.129:10170/api/v1.0/datasetPackages/resolve?restletMethod=PUT")
                .to("restlet:http://192.168.1.221:10170/api/v1.0/datasetPackages/resolve?restletMethod=PUT")
//                .to("bean:archivesService?method=bodyValue")//返回值
        ;
        ;

hos-camel2/src/main/java/camel/central/gateway/route/GatewayRouterBuilder.java

@@ -3,7 +3,9 @@ package camel.central.gateway.route;
import camel.central.gateway.processor.ErrorHandle;
import camel.central.gateway.processor.GatewayProcessor;
import camel.central.gateway.processor.WsProcessor;
import com.yihu.hos.web.framework.constant.ArchivesConstant;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.JettyHttpComponent;
import org.apache.camel.util.jsse.KeyManagersParameters;
@@ -53,10 +55,20 @@ public class GatewayRouterBuilder extends RouteBuilder {
                .to("jetty:http://192.168.1.221:10000?bridgeEndpoint=true&throwExceptionOnFailure=false");
        // 档案上传接口代理
        from("jetty:http://0.0.0.0:9990/api/packages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("proxyUploadPack")
        from("jetty:http://0.0.0.0:9999/api/packages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("proxyUploadPack")
                .removeHeaders("CamelHttp*")
                .to("jetty:http://192.168.1.221:10140/api/v1.0/packages");
        // 档案上传-非病人档案维度代理接口(锐软上传）
        from("jetty:http://0.0.0.0:9999/api/datasetPackages?bridgeEndpoint=true&enableMultipartFilter=false").routeId("datasetUpload2")
                .removeHeaders("CamelHttp*")
//                .to("jetty:http://192.168.1.221:10140/api/v1.0/dataset_package")
                .to("jetty:http://192.168.1.221:10140/api/v1.0/datasetPackages")//上传档案
                .choice()
                .when(header(Exchange.HTTP_RESPONSE_CODE).isEqualTo("200")).to(ExchangePattern.InOnly, ArchivesConstant.CAMEL_ENDPOINT)//成功：发送入库消息
                .otherwise().log("上传失败").to("stream:out")
                .endChoice();
        //统一网关入口（restful）
        from("jetty:http://0.0.0.0:9999/api?bridgeEndpoint=true&enableMultipartFilter=false").routeId("api")
                .setHeader("User-Agent", header("UserAgent"))//使用postman测试时，无法设置User-Agent，使用UserAgent来获取

src/main/java/com/yihu/hos/standard/controller/AdapterDatasetController.java

@@ -1,10 +1,9 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.service.adapter.AdapterDatasetService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterDatasetService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +19,7 @@ import java.io.UnsupportedEncodingException;
 */
@RestController("AdapterDatasetController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterDatasetController", description = "适配数据集管理", tags = {"适配数据集"})
//@Api(protocols = "https", value = "AdapterDatasetController", description = "适配数据集管理", tags = {"适配数据集"})
public class AdapterDatasetController extends BaseController {
    @Resource(name = AdapterDatasetService.BEAN_ID)

src/main/java/com/yihu/hos/standard/controller/AdapterDictController.java

@@ -6,7 +6,6 @@ import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +17,7 @@ import javax.annotation.Resource;
 */
@RestController("AdapterDictController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
//@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
public class AdapterDictController extends BaseController {
    @Resource(name = AdapterDictService.BEAN_ID)

src/main/java/com/yihu/hos/standard/controller/AdapterDictEntryController.java

@@ -1,10 +1,9 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.service.adapter.AdapterDictEntryService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterDictEntryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +17,7 @@ import javax.annotation.Resource;
 */
@RestController("AdapterDictEntryController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterDictEntryController", description = "适配字典项管理", tags = {"适配字典项"})
//@Api(protocols = "https", value = "AdapterDictEntryController", description = "适配字典项管理", tags = {"适配字典项"})
public class AdapterDictEntryController extends BaseController {
    @Resource(name = AdapterDictEntryService.BEAN_ID)

src/main/java/com/yihu/hos/standard/controller/AdapterMetadataController.java

@@ -8,7 +8,6 @@ import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +19,7 @@ import javax.annotation.Resource;
 */
@RestController("AdapterMetadataController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "AdapterMetadataController", description = "适配字典管理", tags = {"适配字典"})
//@Api(protocols = "https", value = "AdapterMetadataController", description = "适配字典管理", tags = {"适配字典"})
public class AdapterMetadataController extends BaseController {
    @Resource(name = AdapterMetadataService.BEAN_ID)
    private AdapterMetadataService metadataService;

src/main/java/com/yihu/hos/standard/controller/InitController.java

@@ -3,7 +3,6 @@ package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.service.adapter.AdapterDictService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,7 +16,7 @@ import javax.annotation.Resource;
 */
@RestController("InitController")
@RequestMapping("/init")
@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
//@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
public class InitController extends BaseController {
    @Resource(name = AdapterDictService.BEAN_ID)

src/main/java/com/yihu/hos/standard/controller/PublisherController.java

@@ -4,7 +4,6 @@ import com.yihu.hos.standard.service.standard.StdPublisherService;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +17,7 @@ import javax.annotation.Resource;
 */
@RestController("PublisherController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "PublisherController", description = "发布者管理", tags = {"发布者"})
//@Api(protocols = "https", value = "PublisherController", description = "发布者管理", tags = {"发布者"})
public class PublisherController extends BaseController {
    @Resource(name = StdPublisherService.BEAN_ID)

src/main/java/com/yihu/hos/standard/controller/SchemeController.java

@@ -1,10 +1,9 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +14,7 @@ import javax.annotation.Resource;
@RestController("SchemeController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeController", description = "适配方案管理", tags = {"适配方案"})
//@Api(protocols = "https", value = "SchemeController", description = "适配方案管理", tags = {"适配方案"})
public class SchemeController extends BaseController {
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;

src/main/java/com/yihu/hos/standard/controller/SchemeVersionController.java

@@ -1,12 +1,11 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.model.TreeResult;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +18,7 @@ import java.util.List;
@RestController("SchemeVersionController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeVersionController", description = "适配版本管理", tags = {"适配版本"})
//@Api(protocols = "https", value = "SchemeVersionController", description = "适配版本管理", tags = {"适配版本"})
public class SchemeVersionController extends BaseController {
    @Resource(name = AdapterSchemeVersionService.BEAN_ID)
    private AdapterSchemeVersionService adapterSchemeVersion;

src/main/java/com/yihu/hos/standard/controller/StandardController.java

@@ -1,13 +1,12 @@
package com.yihu.hos.standard.controller;
import com.yihu.hos.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.hos.standard.service.standard.StandardService;
import com.yihu.hos.web.framework.constant.SqlConstants;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.hos.standard.service.standard.StandardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,7 +17,7 @@ import javax.annotation.Resource;
@RestController("StandardController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StandardController", description = "标准管理", tags = {"标准"})
//@Api(protocols = "https", value = "StandardController", description = "标准管理", tags = {"标准"})
public class StandardController extends BaseController {
    @Resource(name = StandardService.BEAN_ID)
    private StandardService standardService;

src/main/java/com/yihu/hos/standard/controller/StandardVersionController.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 */
@RestController("StandardVersionController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StandardVersionController", description = "标准版本管理", tags = {"标准版本"})
//@Api(protocols = "https", value = "StandardVersionController", description = "标准版本管理", tags = {"标准版本"})
public class StandardVersionController extends BaseController {
    @Resource(name = StandardVersionService.BEAN_ID)
    private StandardVersionService standardVersionService;

src/main/java/com/yihu/hos/standard/controller/StdDatasetController.java

@@ -7,7 +7,6 @@ import com.yihu.hos.standard.service.standard.StdDatasetService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +22,7 @@ import java.util.Map;
 */
@RestController("StdDatasetController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdDatasetController", description = "标准数据集管理", tags = {"标准数据集"})
//@Api(protocols = "https", value = "StdDatasetController", description = "标准数据集管理", tags = {"标准数据集"})
public class StdDatasetController extends BaseController {
    @Resource(name = StdDatasetService.BEAN_ID)
    private StdDatasetService stdDatasetService;

src/main/java/com/yihu/hos/standard/controller/StdDictController.java

@@ -9,7 +9,6 @@ import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +25,7 @@ import java.util.Map;
 */
@RestController("StdDictController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdDictController", description = "标准字典管理", tags = {"标准字典"})
//@Api(protocols = "https", value = "StdDictController", description = "标准字典管理", tags = {"标准字典"})
public class StdDictController extends BaseController {
    @Resource(name = StdDictService.BEAN_ID)
    StdDictService stdDictService;

src/main/java/com/yihu/hos/standard/controller/StdDictEntryController.java

@@ -7,7 +7,6 @@ import com.yihu.hos.standard.service.standard.StdDictEntryService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +22,7 @@ import java.util.Map;
 */
@RestController("StdDictEntryController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdDictEntryController", description = "标准字典项管理", tags = {"标准字典项"})
//@Api(protocols = "https", value = "StdDictEntryController", description = "标准字典项管理", tags = {"标准字典项"})
public class StdDictEntryController extends BaseController {
    @Resource(name = StdDictEntryService.BEAN_ID)
    StdDictEntryService stdDictEntryService;

src/main/java/com/yihu/hos/standard/controller/StdMetadataController.java

@@ -8,7 +8,6 @@ import com.yihu.hos.standard.service.standard.StdMetadataService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +23,7 @@ import java.util.Map;
 */
@RestController("StdMetadataController")
@RequestMapping("/standardCenter")
@Api(protocols = "https", value = "StdMetadataController", description = "标准数据元管理", tags = {"标准数据元"})
//@Api(protocols = "https", value = "StdMetadataController", description = "标准数据元管理", tags = {"标准数据元"})
public class StdMetadataController extends BaseController {
    @Resource(name = StdMetadataService.BEAN_ID)
    StdMetadataService stdMetadataService;

src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -110,8 +110,8 @@
                {id: 7, text: '用户安全', icon: '${staticRoot}/images/index/menu06.png'},
                {id: 71, pid: 7, text: '机构管理', url: '${contextRoot}/org/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 72, pid: 7, text: '用户管理', url: '${contextRoot}/user/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 73, pid: 7, text: '角色管理', url: '${contextRoot}/role/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 74, pid: 7, text: '权限管理', url: '${contextRoot}/authority/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                <%--{id: 73, pid: 7, text: '角色管理', url: '${contextRoot}/role/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                <%--{id: 74, pid: 7, text: '权限管理', url: '${contextRoot}/authority/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                //质控规则管理
                {id: 8, text: '质控管理', icon: '${staticRoot}/images/index/menu05.png'},
                {id: 81, pid: 8, text: '规则管理', url: '${contextRoot}/rule/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
@@ -123,8 +123,8 @@
                {id: 9, text: '系统配置', icon: '${staticRoot}/images/index/menu07.png'},
                {id: 91, pid: 9, text: '系统参数', url: '${contextRoot}/param/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 92, pid: 9, text: '字典管理', url: '${contextRoot}/dict/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 93, pid: 9, text: '菜单配置', url: '${contextRoot}/menu/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 94, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                <%--{id: 93, pid: 9, text: '菜单配置', url: '${contextRoot}/menu/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                <%--{id: 94, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},--%>
                {id: 95, pid: 9, text: '数据源配置', url: '${contextRoot}/datasource/configSources', icon: '${staticRoot}/images/index/Ins_icon.png'},
            ];