Sfoglia il codice sorgente

任务编排 按钮 保存 接口

esb 9 anni fa
parent
commit
8a2c49b168

+ 24 - 1
Hos-Resource-WS/pom.xml

@ -13,6 +13,18 @@
        <jackson.version>2.4.6</jackson.version>
        <spring.version>4.1.8.RELEASE</spring.version>
    </properties>
    <pluginRepositories>
        <pluginRepository>
            <id>pluginCentral</id>
            <name>pluginCentral</name>
            <url>http://172.19.103.47:8081/nexus/content/repositories/central/</url>
        </pluginRepository>
        <pluginRepository>
            <id>pluginReleases</id>
            <name>pluginReleases</name>
            <url>http://172.19.103.47:8081/nexus/content/repositories/releases/</url>
        </pluginRepository>
    </pluginRepositories>
    <!--用于发布到服务器 对应setting的对应server表情里面的id -->
    <distributionManagement>
        <repository>
@ -26,8 +38,19 @@
            <url>http://172.19.103.47:8081/nexus/content/repositories/snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
    <repositories>
        <repository>
            <id>repositoryCentral</id>
            <name>repositoryCentral</name>
            <url>http://172.19.103.47:8081/nexus/content/repositories/central/</url>
        </repository>
        <repository>
            <id>repositoryReleases</id>
            <name>repositoryReleases</name>
            <url>http://172.19.103.47:8081/nexus/content/repositories/releases/</url>
        </repository>
    </repositories>
    <dependencies>
        <!--=============数据库驱动 start =============-->
        <dependency>
            <groupId>com.yihu.core</groupId>

+ 22 - 34
Hos-Resource-WS/src/main/java/com.yihu.ehr/service/SystemManager.java

@ -14,6 +14,7 @@ import com.yihu.ehr.service.thread.StandardUpdateThread;
import com.yihu.ehr.service.thread.ThreadManage;
import com.yihu.ehr.util.httpclient.EsbHttp;
import com.yihu.ehr.util.httpclient.Response;
import com.yihu.ehr.ws.SQLWebService;
import org.json.JSONObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -101,7 +102,7 @@ public class SystemManager implements ISystemManager {
    private void saveSystemParams(String key, String value) throws Exception {
        Object obj = db.scalar("select 1 from system_param where param_key='" + key + "'");
        if (obj==null) {
        if (obj == null) {
            addSystemParams(key, value);
        } else {
            String sql = "update system_param set param_value = '" + value + "' where param_key='" + key + "'";
@ -139,7 +140,8 @@ public class SystemManager implements ISystemManager {
        if (id != null && id.length() > 0) {
            sql = "update system_datasource set name = '" + name + "',config='" + config + "' where id='" + id + "'";
        }
        //更新数据源
        SQLWebService.db = new DBHelper("new", config);
        if (db.execute(sql)) {
            return Result.success("保存成功!");
        } else {
@ -157,22 +159,18 @@ public class SystemManager implements ISystemManager {
            DBDriver.registerDriver(uri);
            Connection conn = DriverManager.getConnection(uri);
            if(conn!=null) {
                String message="连接测试成功!";
                if(conn.isClosed())
                {
            if (conn != null) {
                String message = "连接测试成功!";
                if (conn.isClosed()) {
                    message = "连接测试失败!";
                }
                conn.close();
                return Result.success(message);
            }
            else {
            } else {
                return Result.error("连接测试失败!");
            }
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@ -211,21 +209,20 @@ public class SystemManager implements ISystemManager {
                        userInfo.setRealName(userObject.getString("realName"));
                        String orgCode = "";
                        String orgName = "";
                        if(userObject.has("organization") && !userObject.get("organization").equals(null)) {
                        if (userObject.has("organization") && !userObject.get("organization").equals(null)) {
                            JSONObject orgInfo = userObject.getJSONObject("organization");
                            orgCode = orgInfo.getString("orgCode");
                            orgName = orgInfo.getString("fullName");
                            userInfo.setOrgCode(orgCode);
                            userInfo.setOrgName(orgName);
                        }
                        else{
                        } else {
                            return Result.error("该用户未配置机构!");
                        }
                        session.setAttribute("userInfo", userInfo);
                        //判断组织编码是否为空
                        String orgCodeOld = this.getSystemParam("ORG_CODE");
                        if (orgCodeOld==null || orgCodeOld.length() == 0) {
                        if (orgCodeOld == null || orgCodeOld.length() == 0) {
                            this.saveSystemParams("FINGER_PRINT", UUID.randomUUID().toString());
                            this.saveSystemParams("ORG_CODE", orgCode);
                            this.saveSystemParams("ORG_NAME", orgName);
@ -238,43 +235,34 @@ public class SystemManager implements ISystemManager {
                                standardUpdateThread.start();
                            }
                            return Result.success("登录成功!");
                        }
                        else {
                        } else {
                            if (orgCodeOld.equals(orgCode)) {
                                return Result.success("登录成功!");
                            } else {
                                return Result.error("机构编码不一致!");
                            }
                        }
                    }
                    else{
                    } else {
                        return Result.error("获取用户信息失败!");
                    }
                }
                else {
                    if(obj.has("message"))
                    {
                        return Result.error("登录失败!"+obj.getString("message"));
                    }
                    else{
                } else {
                    if (obj.has("message")) {
                        return Result.error("登录失败!" + obj.getString("message"));
                    } else {
                        return Result.error("登录失败!");
                    }
                }
            }
            else {
            } else {
                String msg = "登录失败。";
                if (response != null)
                {
                    msg +="(错误代码:"+ response.getStatusCode() + ",错误信息:"+response.getBody()+")";
                if (response != null) {
                    msg += "(错误代码:" + response.getStatusCode() + ",错误信息:" + response.getBody() + ")";
                }
                return Result.error(msg);
            }
        }
        catch (Exception ex) {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }

+ 15 - 0
Hos-Resource-WS/src/main/java/com.yihu.ehr/ws/SQLWebService.java

@ -1,6 +1,9 @@
package com.yihu.ehr.ws;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.model.DataSource;
import com.yihu.ehr.ws.inf.ISQLWebService;
import net.sf.json.JSONObject;
import javax.jws.WebService;
@ -9,4 +12,16 @@ import javax.jws.WebService;
 */
@WebService(endpointInterface = "com.yihu.ehr.ws.inf.ISQLWebService", serviceName = "testWS")
public class SQLWebService implements ISQLWebService {
    public static DBHelper db = null;
    @Override
    public String excuteSQL(String sql) {
        if (db == null) {
            DBHelper dbTemp = new DBHelper();
            DataSource source = dbTemp.load(DataSource.class, "select * from system_datasource");
            db = new DBHelper("new", source.getConfig());
        }
        return JSONObject.fromObject(db.query(sql)).toString();
    }
}

+ 4 - 0
Hos-Resource-WS/src/main/java/com.yihu.ehr/ws/inf/ISQLWebService.java

@ -1,5 +1,7 @@
package com.yihu.ehr.ws.inf;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
/**
@ -7,4 +9,6 @@ import javax.jws.WebService;
 */
@WebService
public interface ISQLWebService {
    @WebMethod
    public String excuteSQL(@WebParam(name = "sql") String sql);
}

+ 1 - 1
Hos-Resource-WS/src/main/resources/config/dbhelper.properties

@ -1,2 +1,2 @@
defaultName = localDB
defaultUri = jdbc:sqlite://D:/db/localDB.db
defaultUri = jdbc:sqlite::resource:db/localDB.db

BIN
Hos-Resource-WS/src/main/resources/db/localDB.db


+ 1 - 1
Hos-Resource-WS/src/main/resources/spring/spring-cxf.xml

@ -9,7 +9,7 @@
	<import resource="classpath:META-INF/cxf/cxf.xml"/>
	<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
	<jaxws:endpoint id="/testWebService"
		implementor="com.yihu.ehr.ws.TestWS"
		implementor="com.yihu.ehr.ws.SQLWebService"
		address="/testWS" />
		
</beans> 

+ 2 - 1
Hos-Resource-WS/src/main/webapp/WEB-INF/web.xml

@ -15,10 +15,11 @@
        <param-value>classpath:spring/applicationContext.xml,classpath:spring/spring-cxf.xml</param-value>
    </context-param>
    <!--线程
    <listener>
        <listener-class>com.yihu.ehr.common.ApplicationStart</listener-class>
    </listener>
    <!--线程
    <listener>
        <listener-class>com.yihu.ehr.common.ThreadStart</listener-class>
    </listener>-->