Merge remote-tracking branch 'origin/master'

.gitignore

@@ -0,0 +1,7 @@
+src/main/.DS_Store
+src/main/resources/.DS_Store
+.DS_Store
+.idea/*
+log/*
+src/test/java/com/sagacloud/Test.java
+target/*

src/main/resources/test/config.properties

@@ -1,4 +1,4 @@
 dataPlatform.baseUrl=http://192.168.20.225:8080/data-platform-3
 #venders.baseUrl=http://192.168.20.225:8080/venders
-venders.baseUrl=http://101.201.234.108:28888/venders
+venders.baseUrl=http://101.200.32.13:28888/venders
 

target/classes/config.properties

@@ -1,4 +0,0 @@
-dataPlatform.baseUrl=http://192.168.20.225:8080/data-platform-3
-#venders.baseUrl=http://192.168.20.225:8080/venders
-venders.baseUrl=http://101.201.234.108:28888/venders
-

target/classes/documentation.md

@@ -1,196 +0,0 @@
-#生产商
-##查询项目下的资产[辅助服务接口]
-    http://<host>:<port>/venders-dp/manufacturer/property/query  
-post体：
-    
-    {
-        "venderId":"",      //必填，厂商id
-        "projectId":""      //必填，项目id
-    }  
-    
-返回：
-
-    {
-        "result":"success",
-        "resultMsg":"",
-        "content":[
-            {
-                "propertyId":"",                // 资产id
-                "EquipLocalName":"",            // 本地名称
-                "EquipLocalId":"",              // 本地编码
-                "brand":"",                     // 品牌
-                "product":"",                   // 产品名
-                "specification":"",             // 型号
-                "picture":"",                   // 正面照名称，根据名称去图片服务中获取
-                "platePic":"",                  // 名牌照片名称，同正面照
-                "productionDate":"",            // 生产日期
-                "serialNumber":""               // 出厂编号
-            }
-        ]        
-    }    
-
-#供应商
-##查询项目下的资产[辅助服务接口]
-    http://<host>:<port>/venders-dp/supplier/property/query    
-post体：
-    
-    {
-        "venderId":"",              // String, 必填, 维修商Id
-        "projectId":""              // String, 必填, 项目id  
-    } 
-返回：
-
-    {
-        "result":"success",
-        "resultMsg":"",
-        "content":[
-            {
-                "propertyId":"",                // 资产id
-                "EquipLocalName":"",            // 本地名称
-                "EquipLocalId":"",              // 本地编码
-                "brand":"",                     // 品牌
-                "product":"",                   // 产品名
-                "specification":"",             // 型号
-                "price":"",                     // 采购价格
-                "warranty":"",                  // 保修期
-                "productionDate":"",            // 生产日期
-                "serial number":"",             // 出厂编号
-                "contractId":""                 // 合同编号
-            }
-        ]
-    }
-    
-    {
-        "result":"failure",
-        "resultMsg":"***"
-    }             
-
-#保险商
-##获取在保资产清单[辅助服务接口]
-    http://<host>:<port>/venders-dp/insurance/project/query     
-post体：
-    
-    {
-        "vendorId":"",               //String,必填,保险商Id
-        "projectId":""               // String 必填, 数据平台项目id
-    }
-    
-返回：
-
-    {
-        "result":"success",
-        "resultMsg":"",
-        "content":[
-            {
-                "id":"**********",       // 该资产在数据平台的id
-                "infos":{
-                    "EquipLocalName":"***",                   // 本地名称(信息点均为数据平台资产的信息点)
-                    "********":"*****",          // 
-                    ......
-                }
-            },.......        
-        ]
-    }
-    
-    {
-        "result":"failure",
-        "resultMsg":"***"
-    }
-##获取所有保单列表[辅助服务接口]
-    http://<host>:<port>/venders-dp/insurance/contract/query     
-post体：
-    
-    {
-        "vendorId":"",               //String,必填,保险商Id
-        "projectId":""               //String, 必填, 项目id
-    }
-    
-返回：
-
-    {
-        "result":"success",
-        "resultMsg":"",
-        "content":[
-            {
-                "insuranceNo":"***",                   // 保单Id
-                "expireDate":"*****",          // 截止日期
-                "propertyCount":10,              // 保单内资产数量
-                "insuranceFile":"****"           // 保险文件key
-            },.......        
-        ]
-    }
-    
-    {
-        "result":"failure",
-        "resultMsg":"***"
-    }
-
-##根据保单获取资产[辅助服务接口]
-    http://<host>:<port>/venders-dp/insurance/contract/property/query     
-post体：
-    
-    {
-        "venderId":"",             //String,必填,保险商Id
-        "insuranceNo":"",              //String,必填,保单编号
-    }
-    
-返回：
-
-    {
-        "result":"success",
-        "resultMsg":"",
-        "content":[
-            {
-                "id":"****",         // 资产的id
-                "infos":{            // 信息点
-                    "EquipLocalName":"",        // 资产本地名称
-                    "EquipLocalId":"",          // 资产本地编码
-                    "Brand":"",                 // 品牌
-                    "Product":"",               // 产品名
-                    "Specification":"",         // 型号
-                }
-            },......
-        ]
-    }   
-    
-    {
-        "result":"failure",
-        "resultMsg":"***"
-    }
-    
-#维修商
-##查询指定项目内合同有效期内的资产/查询指定项目内历史维护资产[辅助服务接口]
-    http://<host>:<port>/venders-dp/maintainance/property/query
-post体：
-    
-    {
-        "venderId":"****",             // String, 必填, 维修商Id
-        "projectId":"*****",          // String, 必填, 项目id
-        "expire":true                   //Boolean, 必填. true 查询维护合同过期资产, false 查询在维护期的资产
-    }
-    
-返回：
-
-    {
-        "result":"success",
-        "resultMsg":"",
-        "content":[
-            {
-                "id":"****",                 //资产id
-                "infos":{
-                    "EquipLocalName":"",               // 本地名称
-                    "EquipLocalId":"",               // 本地编码
-                    "Brand":"",                   // 品牌
-                    "Product":"",                 // 标牌名
-                    "Specification":"",           // 型号
-                    "MaintainDeadline":"",              // 合同截止日期
-                    "MaintainPeriod":100                   // 保养周期
-                }
-            },........
-        ]
-    }
-    
-    {
-        "result":"failure",
-        "resultMsg":"***"
-    }

target/classes/log4j.properties

@@ -1,19 +0,0 @@
-#log4j.rootLogger=INFO,loggerId
-log4j.rootLogger=INFO,ConsoleAppender,loggerId
-
-
-
-log4j.appender.loggerId=org.apache.log4j.RollingFileAppender  
-log4j.appender.loggerId.layout=org.apache.log4j.PatternLayout
-log4j.appender.loggerId.ImmediateFlush=true 
-log4j.appender.loggerId.layout.ConversionPattern=%d{yyyy-MM-dd HH\:mm\:ss.SSS} [%p][%c] %t %m%n 
-log4j.appender.loggerId.File=log/venders-dp/venders-dp.log
-log4j.appender.loggerId.MaxFileSize=300MB  
-log4j.appender.loggerId.MaxBackupIndex=10 
-
-log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.ConsoleAppender.Threshold=INFO
-log4j.appender.ConsoleAppender.ImmediateFlush=true
-log4j.appender.ConsoleAppender.Target=System.out
-log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.ConsoleAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH\:mm\:ss.SSS} [%p][%c] %t %m%n

target/classes/template.html

@@ -1,52 +0,0 @@
-<!-- 插件官网地址：http://ruby-china.org/topics/17028 -->
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>venders-dp</title>
-        <link rel="stylesheet" type="text/css" href="http://47.93.33.207:8889/static-content/markdownToc_files/github2-rightpart.css" media="all">
-        <link rel="stylesheet" type="text/css" href="http://47.93.33.207:8889/static-content/markdownToc_files/github1-contents.css">
-        <link rel="stylesheet" href="http://47.93.33.207:8889/static-content/markdownToc_files/zTreeStyle.css" type="text/css">
-        <style>
-            .ztree li a.curSelectedNode {
-                padding-top: 0px;
-                background-color: #FFE6B0;
-                color: black;
-                height: 16px;
-                border: 1px #FFB951 solid;
-                opacity: 0.8;
-            }
-            .ztree{
-                overflow: auto;
-                height:100%;
-                min-height: 200px;
-                top: 0px;
-            }
-        </style>
-    </head>
-    <body style="">
-        <div>
-            <div style="width:30%;">
-                <ul id="tree" class="ztree" style="width: 260px; overflow: auto; position: fixed; z-index: 2147483647; border: 0px none; left: 0px; bottom: 0px;">
-                <!-- 目录内容在网页另存为之后将插入到此处 -->
-                </ul>
-            </div>
-            <div id="readme" style="width:70%;margin-left:25%;">
-                <article class="markdown-body">
-                    #replaceMePlease#
-                </article>
-            </div>
-        </div>
-    <script src="http://47.93.33.207:8889/static-content/markdownToc_files/jquery-1.10.2.min.js"></script>
-    <script src="http://47.93.33.207:8889/static-content/markdownToc_files/jquery.ztree.all-3.5.min.js"></script>
-    <script src="http://47.93.33.207:8889/static-content/markdownToc_files/jquery.ztree_toc.min.js"></script>
-    <script type="text/javascript">
-        $(document).ready(function(){
-            $('#tree').ztree_toc({
-                is_auto_number:false,
-                documment_selector:'.markdown-body',
-                is_expand_all: true
-            });
-        });
-    </script>
-    </body>
-</html>

target/venders-dp/META-INF/MANIFEST.MF

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Built-By: Xiaoyu
-Created-By: IntelliJ IDEA
-Build-Jdk: 1.8.0_102
-

target/venders-dp/WEB-INF/classes/config.properties

@@ -1,2 +0,0 @@
-dataPlatform.baseUrl=http://192.168.20.225:8080/data-platform-3
-

target/venders-dp/WEB-INF/classes/log4j.properties

@@ -1,19 +0,0 @@
-#log4j.rootLogger=INFO,loggerId
-log4j.rootLogger=INFO,ConsoleAppender,loggerId
-
-
-
-log4j.appender.loggerId=org.apache.log4j.RollingFileAppender  
-log4j.appender.loggerId.layout=org.apache.log4j.PatternLayout
-log4j.appender.loggerId.ImmediateFlush=true 
-log4j.appender.loggerId.layout.ConversionPattern=%d{yyyy-MM-dd HH\:mm\:ss.SSS} [%p][%c] %t %m%n 
-log4j.appender.loggerId.File=log/venders-dp/venders-dp.log
-log4j.appender.loggerId.MaxFileSize=300MB  
-log4j.appender.loggerId.MaxBackupIndex=10 
-
-log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.ConsoleAppender.Threshold=INFO
-log4j.appender.ConsoleAppender.ImmediateFlush=true
-log4j.appender.ConsoleAppender.Target=System.out
-log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.ConsoleAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH\:mm\:ss.SSS} [%p][%c] %t %m%n

target/venders-dp/WEB-INF/classes/template.html

@@ -1,52 +0,0 @@
-<!-- 插件官网地址：http://ruby-china.org/topics/17028 -->
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>venders-dp</title>
-        <link rel="stylesheet" type="text/css" href="http://47.93.33.207:8889/static-content/markdownToc_files/github2-rightpart.css" media="all">
-        <link rel="stylesheet" type="text/css" href="http://47.93.33.207:8889/static-content/markdownToc_files/github1-contents.css">
-        <link rel="stylesheet" href="http://47.93.33.207:8889/static-content/markdownToc_files/zTreeStyle.css" type="text/css">
-        <style>
-            .ztree li a.curSelectedNode {
-                padding-top: 0px;
-                background-color: #FFE6B0;
-                color: black;
-                height: 16px;
-                border: 1px #FFB951 solid;
-                opacity: 0.8;
-            }
-            .ztree{
-                overflow: auto;
-                height:100%;
-                min-height: 200px;
-                top: 0px;
-            }
-        </style>
-    </head>
-    <body style="">
-        <div>
-            <div style="width:30%;">
-                <ul id="tree" class="ztree" style="width: 260px; overflow: auto; position: fixed; z-index: 2147483647; border: 0px none; left: 0px; bottom: 0px;">
-                <!-- 目录内容在网页另存为之后将插入到此处 -->
-                </ul>
-            </div>
-            <div id="readme" style="width:70%;margin-left:25%;">
-                <article class="markdown-body">
-                    #replaceMePlease#
-                </article>
-            </div>
-        </div>
-    <script src="http://47.93.33.207:8889/static-content/markdownToc_files/jquery-1.10.2.min.js"></script>
-    <script src="http://47.93.33.207:8889/static-content/markdownToc_files/jquery.ztree.all-3.5.min.js"></script>
-    <script src="http://47.93.33.207:8889/static-content/markdownToc_files/jquery.ztree_toc.min.js"></script>
-    <script type="text/javascript">
-        $(document).ready(function(){
-            $('#tree').ztree_toc({
-                is_auto_number:false,
-                documment_selector:'.markdown-body',
-                is_expand_all: true
-            });
-        });
-    </script>
-    </body>
-</html>

target/venders-dp/WEB-INF/web.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This web.xml file is not required when using Servlet 3.0 container,
-     see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-<!--    <servlet>
-        <servlet-name>Jersey Web Application</servlet-name>
-        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
-        <init-param>
-            <param-name>jersey.config.server.provider.packages</param-name>
-            <param-value>com.sagacloud</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>-->
-    <!--<servlet>
-        <servlet-name>startupservlet</servlet-name>
-        <servlet-class>com.sagacloud.servlet.StartupServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>-->
-    <listener>
-        <listener-class>com.sagacloud.listener.VendersDpCamelContextInitialListener</listener-class>
-    </listener>
-    <!--<servlet-mapping>
-        <servlet-name>Jersey Web Application</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>-->
-    <!-- Camel servlet used in the Camel application -->
-    <servlet>
-        <servlet-name>CamelServlet</servlet-name>
-        <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Camel servlet mapping -->
-    <servlet-mapping>
-        <servlet-name>CamelServlet</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-</web-app>

target/venders-dp/index.jsp

@@ -1,8 +0,0 @@
-<html>
-<body>
-    <h2>Jersey RESTful Web Application!</h2>
-    <p><a href="webapi/myresource">Jersey resource</a>
-    <p>Visit <a href="http://jersey.java.net">Project Jersey website</a>
-    for more information on Jersey!
-</body>
-</html>