linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pom.xml删除无用的依赖，并返回的json全部改成alibabaJson包

Browse Source
master
zengwh 6 years ago
parent 2a7d53af59
commit 694c8bc119
28 changed files with 337 additions and 863 deletions
Show Stats Download Patch File Download Diff File

479
pom.xml
Unescape Escape View File

@ -13,511 +13,208 @@
<url>http://www.example.com</url> <url>http://www.example.com</url>
<properties> <properties>
<!-- begin 全局设置,被子工程继承 -->
<skipTest>true</skipTest>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- 编译时的编码 --> <!-- 编译时的编码 -->
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<!-- 跳过 必须依赖正式版本的检查 --> <!-- 跳过 必须依赖正式版本的检查 -->
<skipRequireRelease>true</skipRequireRelease> <skipRequireRelease>true</skipRequireRelease>
<!-- begin 框架版本 -->
<framework.version>1.0.0</framework.version>
<!-- end -->
<!-- begin 其它第三方开源版本定义 --> <!-- begin 其它第三方开源版本定义 -->
<portable.maven.version>1.1.5</portable.maven.version>
<jdk.version>1.8</jdk.version> <jdk.version>1.8</jdk.version>
<mockito.version>1.9.5</mockito.version> <spring.version>5.0.2.RELEASE</spring.version>
<!--<spring.version>3.2.2.RELEASE</spring.version>--> <mybatis.spring.version>1.2.2</mybatis.spring.version>
<mybatis.version>3.2.8</mybatis.version>
<mssql.version>7.4.1.jre8</mssql.version>
<druid.version>1.1.22</druid.version>
<shiro.version>1.2.5</shiro.version> <shiro.version>1.2.5</shiro.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<quartz.version>2.2.1</quartz.version>
<servlet.version>2.4</servlet.version> <servlet.version>2.4</servlet.version>
<jsp.version>2.1</jsp.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<postgresql.version>9.2-1004-jdbc4</postgresql.version>
<activiti.version>5.17.0</activiti.version>
<groovy.version>2.3.6</groovy.version>
<aliyun-sdk-oss.version>2.2.1</aliyun-sdk-oss.version>
<alipay-sdk.version>1.1.1</alipay-sdk.version>
<bropen-api.version>3.5.0</bropen-api.version>
<spring.version>5.0.2.RELEASE</spring.version>
<mybatis.version>3.2.8</mybatis.version>
<mybatis.spring.version>1.2.2</mybatis.spring.version>
<mybatis.paginator.version>1.2.15</mybatis.paginator.version>
<mysql.version>5.1.32</mysql.version>
<slf4j.version>1.6.4</slf4j.version>
<json-lib.version>2.4</json-lib.version>
<jackson.version>2.9.4</jackson.version>
<druid.version>1.1.22</druid.version>
<httpclient.version>4.3.5</httpclient.version> <httpclient.version>4.3.5</httpclient.version>
<javax-servlet-api.version>4.0.1</javax-servlet-api.version> <javax-servlet-api.version>4.0.1</javax-servlet-api.version>
<jsp-api.version>2.0</jsp-api.version>
<commons-lang3.version>3.3.2</commons-lang3.version> <commons-lang3.version>3.3.2</commons-lang3.version>
<commons-io.version>1.3.2</commons-io.version> <pagehelper.version>5.0.0</pagehelper.version>
<commons-net.version>3.3</commons-net.version> <alibabaJson.version>1.2.4</alibabaJson.version>
<pagehelper.version>3.4.2</pagehelper.version> <jackson.version>2.9.4</jackson.version>
<jsqlparser.version>0.9.1</jsqlparser.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version> <commons-fileupload.version>1.3.1</commons-fileupload.version>
<aspectj.version>1.8.13</aspectj.version> <logback.version>1.1.2</logback.version>
<aspectjrt.version>1.8.13</aspectjrt.version> <logback-ext-spring.version>0.1.1</logback-ext-spring.version>
<image2pdf.version>2.1.7</image2pdf.version> <pdfbox.version>2.0.16</pdfbox.version>
<lowagie.version>2.1.7</lowagie.version>
<cxf.version>3.1.8</cxf.version> <cxf.version>3.1.8</cxf.version>
<poi.version>3.9</poi.version> <poi.version>3.9</poi.version>
<gson.version>2.8.5</gson.version>
<itext.version>2.1.7</itext.version>
<lombok.version>1.16.8</lombok.version> <lombok.version>1.16.8</lombok.version>
<itextpdf.version>5.5.7</itextpdf.version>
</properties> </properties>
<!-- maven依赖 --> <!-- maven依赖 -->
<dependencies> <dependencies>
<!-- Apache工具组件 --> <!-- Spring -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.springframework</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>spring-context-support</artifactId>
<version>${commons-lang3.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.springframework</groupId>
<artifactId>commons-io</artifactId> <artifactId>spring-webmvc</artifactId>
<version>${commons-io.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<!--<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${commons-net.version}</version>
</dependency>-->
<!--json-->
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>org.springframework</groupId>
<artifactId>json-lib</artifactId> <artifactId>spring-jdbc</artifactId>
<version>${json-lib.version}</version> <version>${spring.version}</version>
<classifier>jdk15</classifier>
</dependency> </dependency>
<!-- Jackson Json处理工具包 -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>org.springframework</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>spring-aspects</artifactId>
<version>${jackson.version}</version> <version>${spring.version}</version>
</dependency>
<!-- httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency> </dependency>
<!-- 单元测试 -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.springframework</groupId>
<artifactId>junit</artifactId> <artifactId>spring-test</artifactId>
<version>${junit.version}</version> <version>${spring.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Mybatis --> <!-- Mybatis -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId> <artifactId>mybatis-spring</artifactId>
<version>${mybatis.spring.version}</version> <version>${mybatis.spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.miemiedev</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis-paginator</artifactId> <artifactId>mybatis</artifactId>
<version>${mybatis.paginator.version}</version> <version>${mybatis.version}</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>${pagehelper.version}</version>
</dependency>
<!-- MySql -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency> </dependency>
<!-- sql-server --> <!-- sql-server -->
<dependency> <dependency>
<groupId>com.microsoft.sqlserver</groupId> <groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId> <artifactId>mssql-jdbc</artifactId>
<version>7.4.1.jre8</version> <version>${mssql.version}</version>
</dependency> </dependency>
<!-- 连接池 --> <!-- 连接池 -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>${druid.version}</version> <version>${druid.version}</version>
</dependency> </dependency>
<!-- 引入pageHelper分页插件 -->
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>spring-test</artifactId> <artifactId>pagehelper</artifactId>
<version>${spring.version}</version> <version>${pagehelper.version}</version>
</dependency> </dependency>
<!-- Jackson Json处理工具包 -->
<!--alibabaJson-->
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>com.alibaba</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>fastjson</artifactId>
<version>${aspectj.version}</version> <version>${alibabaJson.version}</version>
</dependency> </dependency>
<!--fasterJson-->
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>jackson-databind</artifactId>
<version>${aspectj.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- Hex --> <!-- Apache工具组件 -->
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-lang3</artifactId>
<version>1.9</version> <version>${commons-lang3.version}</version>
</dependency> </dependency>
<!-- httpclient -->
<!-- 导入DES对称加密包 -->
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>bcprov-jdk16</artifactId> <artifactId>httpclient</artifactId>
<version>1.46</version> <version>${httpclient.version}</version>
</dependency>
<!-- Java Mail邮件 -->
<!--<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.5</version>
</dependency> </dependency>
<!-- 单元测试 -->
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>junit</groupId>
<artifactId>javax.mail</artifactId> <artifactId>junit</artifactId>
<version>1.5.4</version> <version>${junit.version}</version>
</dependency>--> <scope>test</scope>
<!-- JSP相关 -->
<!-- jsTree -->
<!-- <dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>jstree</artifactId>
<version>3.3.4</version>
</dependency>-->
<!-- https://mvnrepository.com/artifact/commons-dbutils/commons-dbutils -->
<!--<dependency>
<groupId>commons-dbutils</groupId>
<artifactId>commons-dbutils</artifactId>
<version>1.4</version>
</dependency>-->
<!-- 引入pageHelper分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>${jstl.version}</version> <version>${jstl.version}</version>
</dependency> </dependency>
<!-- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>-->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet-api.version}</version> <version>${javax-servlet-api.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>${jsp-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- 文件上传组件 --> <!-- 文件上传组件 -->
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version> <version>${commons-fileupload.version}</version>
</dependency> </dependency>
<!-- Redis客户端 -->
<!-- <dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>-->
<!-- solr客户端 -->
<!--<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solrj.version}</version>
</dependency>-->
<!-- OpenSDK中转CGI接口（后台接口）:经由 opensdk 确认登记后，才可以进行上报 -->
<!-- <dependency>
<groupId>com.manage</groupId>
<artifactId>framework-open-sdk</artifactId>
<version>${framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>1.3.0.RELEASE</version>
</dependency>
-->
<!-- SECURITY begin :进行用户认证以及授予权限的时候，通过各种各样的拦截器来控制权限的访问，从而实现安全 --> <!-- SECURITY begin :进行用户认证以及授予权限的时候，通过各种各样的拦截器来控制权限的访问，从而实现安全 -->
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId> <artifactId>shiro-spring</artifactId>
<version>${shiro.version}</version> <version>${shiro.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId>
<version>${shiro.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>${shiro.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<version>${shiro.version}</version>
</dependency>
<!-- SECURITY end -->
<!-- 工作流 -->
<!--<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-engine</artifactId>
<version>${activiti.version}</version>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-bpmn-layout</artifactId>
<version>${activiti.version}</version>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-spring</artifactId>
<version>${activiti.version}</version>
</dependency>-->
<!--实现任务调度-->
<!--<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
</dependency>-->
<!-- groovy脚本引擎 -->
<!--<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
</dependency>-->
<!--<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
</dependency>-->
<!--json-->
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>${json-lib.version}</version>
<classifier>jdk15</classifier>
</dependency>
<!-- Jackson Json处理工具包 -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<!--简化单元测试的书写-->
<!--<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>-->
<!--非web项目实现文件下载，使用apache的httpmime工具进行相关的http请求操作-->
<!--<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.5</version>
</dependency>-->
<!-- 使用JDOM操作XML-->
<!-- <dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>-->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</dependency>
<!--apache poi--> <!--apache poi-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version> <version>${poi.version}</version>
</dependency> </dependency>
<!--图片转pdf--> <!--logback-->
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>com.lowagie.text</artifactId>
<version>${image2pdf.version}</version>
</dependency>
<!--webService-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.4</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
<!-- gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.16</version>
</dependency>
<!--logBack-->
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.1.2</version> <version>${logback.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId> <artifactId>logback-core</artifactId>
<version>1.1.2</version> <version>${logback.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.logback-extensions</groupId> <groupId>org.logback-extensions</groupId>
<artifactId>logback-ext-spring</artifactId> <artifactId>logback-ext-spring</artifactId>
<version>0.1.1</version> <version>${logback-ext-spring.version}</version>
</dependency> </dependency>
<!--pdf处理类-->
<!--图片转pdf-->
<dependency> <dependency>
<groupId>com.lowagie</groupId> <groupId>com.lowagie</groupId>
<artifactId>itext</artifactId> <artifactId>itext</artifactId>
<version>${itext.version}</version> <version>${lowagie.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
<artifactId>com.lowagie.text</artifactId>
<version>${lowagie.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.itextpdf</groupId> <groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId> <artifactId>itextpdf</artifactId>
<version>5.5.7</version> <version>${itextpdf.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- 单元测试 --> <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
<!-- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>pdfbox</artifactId>
<version>RELEASE</version> <version>${pdfbox.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<!--webService-->
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>cxf-rt-transports-http</artifactId>
<version>RELEASE</version> <version>${cxf.version}</version>
<scope>compile</scope> </dependency>
</dependency>-->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>spring-jdbc</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>5.1.3.RELEASE</version> <version>${cxf.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<!--lombok--> <!--lombok-->
<dependency> <dependency>
@ -526,12 +223,6 @@
<version>${lombok.version}</version> <version>${lombok.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.8.2</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

4
src/main/java/com/emr/annotation/DynamicDataSource.java
Unescape Escape View File

@ -1,7 +1,5 @@
package com.emr.annotation; package com.emr.annotation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
@ -18,10 +16,8 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
* @Version: 1.0 * @Version: 1.0
*/ */
public class DynamicDataSource extends AbstractRoutingDataSource { public class DynamicDataSource extends AbstractRoutingDataSource {
private static final Logger log = LoggerFactory.getLogger(DynamicDataSource.class);
@Override @Override
protected Object determineCurrentLookupKey() { protected Object determineCurrentLookupKey() {
log.info("Current DataSource is " + DynamicDataSourceContextHolder.getDB());
return DynamicDataSourceContextHolder.getDB(); return DynamicDataSourceContextHolder.getDB();
} }
} }

9
src/main/java/com/emr/controller/DictionaryController.java
Unescape Escape View File

@ -6,7 +6,6 @@ import com.emr.dao.Emr_DictionaryMapper;
import com.emr.entity.Emr_Dictionary; import com.emr.entity.Emr_Dictionary;
import com.emr.entity.ResultUtil; import com.emr.entity.ResultUtil;
import com.emr.service.emrDictionary.EmrDictionaryService; import com.emr.service.emrDictionary.EmrDictionaryService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -73,9 +72,7 @@ public class DictionaryController {
public String cutomSearchTable(String typeCode) { public String cutomSearchTable(String typeCode) {
try{ try{
List<Emr_Dictionary> dictionaries = emrDictionaryMapper.selectDictionaryByTypeCode(typeCode); List<Emr_Dictionary> dictionaries = emrDictionaryMapper.selectDictionaryByTypeCode(typeCode);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(dictionaries);
String json = mapper.writeValueAsString(dictionaries);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -104,9 +101,7 @@ public class DictionaryController {
tree.setId(0); tree.setId(0);
tree.setNewName("字典列表"); tree.setNewName("字典列表");
treeList.add(tree); treeList.add(tree);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(treeList);
String json = mapper.writeValueAsString(treeList);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

16
src/main/java/com/emr/controller/FontController.java
Unescape Escape View File

@ -1,34 +1,19 @@
package com.emr.controller; package com.emr.controller;
import com.alibaba.fastjson.JSONArray;
import com.emr.dao.CommomMapper; import com.emr.dao.CommomMapper;
import com.emr.dao.recordLock.Emr_LockMapper; import com.emr.dao.recordLock.Emr_LockMapper;
import com.emr.dao.tScanAssort.T_Scan_AssortMapper; import com.emr.dao.tScanAssort.T_Scan_AssortMapper;
import com.emr.entity.Power_User;
import com.emr.entity.approve.Emr_Apply_Approve;
import com.emr.entity.recordLock.Emr_Lock;
import com.emr.service.FontService; import com.emr.service.FontService;
import com.emr.util.HttpClientTool;
import com.emr.util.HttpClientUtils;
import com.emr.util.Jpg2PdfUtil; import com.emr.util.Jpg2PdfUtil;
import com.emr.vo.FontVo.*; import com.emr.vo.FontVo.*;
import com.emr.vo.Msg; import com.emr.vo.Msg;
import com.emr.vo.User;
import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.commomSearch.CommomVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.gson.*;
import com.lowagie.text.Document; import com.lowagie.text.Document;
import com.lowagie.text.Image; import com.lowagie.text.Image;
import com.lowagie.text.Utilities; import com.lowagie.text.Utilities;
import com.lowagie.text.pdf.*; import com.lowagie.text.pdf.*;
import com.lowagie.text.pdf.codec.TiffImage; import com.lowagie.text.pdf.codec.TiffImage;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -39,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.net.URL; import java.net.URL;

6
src/main/java/com/emr/controller/FontShowRecordController.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.emr.controller; package com.emr.controller;
import com.alibaba.fastjson.JSON;
import com.emr.dao.CommomMapper; import com.emr.dao.CommomMapper;
import com.emr.entity.Power_User; import com.emr.entity.Power_User;
import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.commomSearch.CommomVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -81,9 +81,7 @@ public class FontShowRecordController {
} }
List<CommomVo> list = commomMapper.selectCommomByInpatientNo(inpatientNo); List<CommomVo> list = commomMapper.selectCommomByInpatientNo(inpatientNo);
PageInfo pageInfo = new PageInfo<>(list); PageInfo pageInfo = new PageInfo<>(list);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

15
src/main/java/com/emr/controller/LoginController.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.emr.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.emr.entity.Power_User; import com.emr.entity.Power_User;
import com.emr.service.CommomService; import com.emr.service.CommomService;
import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Client;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
@ -16,12 +16,14 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
/** /**
* @author HJL * @author HJL
* @create 2019/4/29 * @create 2019/4/29
*/ */
@Slf4j
@Controller @Controller
public class LoginController { public class LoginController {
@Value("${STR_SPLIT}") @Value("${STR_SPLIT}")
@ -36,14 +38,14 @@ public class LoginController {
private long TOKEN_EXPIRE_TIME; private long TOKEN_EXPIRE_TIME;
@Autowired @Autowired
private CommomService commomService; private CommomService commomService;
@RequestMapping(value = "/toLogin") @RequestMapping(value = "/toLogin")
public String toLogin(Model model) { public String toLogin(Model model) {
return "Login"; return "Login";
} }
@RequestMapping(value = "/login") @RequestMapping(value = "/login")
public String login(String token,Model model, String userName,HttpServletRequest request) { public String login(String token, Model model, String userName, HttpServletRequest request) throws Exception {
try {
if (StringUtils.isNoneBlank(token)) { if (StringUtils.isNoneBlank(token)) {
//创建连接工厂 //创建连接工厂
JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance(); JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance();
@ -51,9 +53,7 @@ public class LoginController {
Client client = dcf.createClient(POWER_URLHEAD + "/WebService/PowerWebService?wsdl"); Client client = dcf.createClient(POWER_URLHEAD + "/WebService/PowerWebService?wsdl");
//动态调用getInfosByUserId方法 //动态调用getInfosByUserId方法
Object[] objects = client.invoke("getInfosByUserId", token, "emr_record"); Object[] objects = client.invoke("getInfosByUserId", token, "emr_record");
ObjectMapper mapper = new ObjectMapper(); Power_User powerUser = JSON.parseObject(objects[0].toString(), Power_User.class);
//返回用户对象
Power_User powerUser = mapper.readValue(objects[0].toString(), Power_User.class);
//返回用户为空跳转到登录权限系统界面 //返回用户为空跳转到登录权限系统界面
if (null == powerUser) { if (null == powerUser) {
return "redirect:" + POWER_URLHEAD + "/login"; return "redirect:" + POWER_URLHEAD + "/login";
@ -84,9 +84,6 @@ public class LoginController {
} else { } else {
return "redirect:" + POWER_URLHEAD + "/login"; return "redirect:" + POWER_URLHEAD + "/login";
} }
}catch (Exception e){
e.printStackTrace();
}
return "redirect:/index.jsp"; return "redirect:/index.jsp";
} }

19
src/main/java/com/emr/controller/UrlFilter.java
Unescape Escape View File

@ -1,18 +1,11 @@
package com.emr.controller; package com.emr.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.emr.entity.Power_User; import com.alibaba.fastjson.JSONObject;
import com.emr.util.HttpClientTool; import com.emr.util.HttpClientTool;
import com.emr.util.PropertiesUtils; import com.emr.util.PropertiesUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.endpoint.Client;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.servlet.*; import javax.servlet.*;
@ -36,15 +29,15 @@ import java.util.Map;
*/ */
@Component @Component
public class UrlFilter implements Filter { public class UrlFilter implements Filter {
@Override
public void init(FilterConfig filterConfig) throws ServletException { public void init(FilterConfig filterConfig) throws ServletException {
} }
@Override
public void destroy() { public void destroy() {
} }
@Override
public void doFilter(ServletRequest req, ServletResponse res, public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException { FilterChain chain) throws IOException, ServletException {
//获取权限系统请求头ip+端口 //获取权限系统请求头ip+端口
@ -77,7 +70,7 @@ public class UrlFilter implements Filter {
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put("token", token); params.put("token", token);
String resultString = HttpClientTool.doPost(requestUrl, params); String resultString = HttpClientTool.doPost(requestUrl, params);
String code = JSONArray.toJSONString(JSONObject.fromObject(resultString).get("code")); String code = JSONArray.toJSONString(JSON.parseObject(resultString).get("code"));
if ("200".equals(code)) { if ("200".equals(code)) {
response.sendRedirect(POWER_URLHEAD + "/login"); response.sendRedirect(POWER_URLHEAD + "/login");
return; return;

58
src/main/java/com/emr/controller/UrlInterceptor.java
Unescape Escape View File

@ -1,58 +0,0 @@
package com.emr.controller;
import com.alibaba.fastjson.JSONArray;
import com.emr.util.HttpClientTool;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
public class UrlInterceptor extends HandlerInterceptorAdapter {
@Value("${POWER_URLHEAD}")
private String POWER_URLHEAD;
public boolean preHandle(HttpServletRequest request, HttpServletResponse response) throws Exception {
//获取相对路径
String url = request.getServletPath();
//从session中取token
String token = (String) request.getSession().getAttribute("token");
String[] split = url.split("/");
String headUrl = "/" + split[1];
//过滤第一次进入该系统请求
if(!"/login".equals(url) && StringUtils.isNoneBlank(token)) {
//静态资源不拦截验证
if (url.endsWith(".css") || url.endsWith(".js") || url.endsWith(".jpg")
|| url.endsWith(".gif") || url.endsWith(".png")) {
return true;
}
try {
// 创建url
String requestUrl = POWER_URLHEAD + "/font/checkToken";
//拼接请求参数
Map<String, String> params = new HashMap<>();
params.put("token", token);
// httpClient执行请求
String resultString = HttpClientTool.doPost(requestUrl, params);
//获取返回code
String code = JSONArray.toJSONString(JSONObject.fromObject(resultString).get("code"));
//100成功，200失败跳转到权限系统登录界面
if ("200".equals(code)) {
response.sendRedirect(POWER_URLHEAD + "/login");
}
} catch (Exception e) {
e.printStackTrace();
//失败跳转到权限系统登录界面
response.sendRedirect(POWER_URLHEAD + "/login");
}
}else{
if("/font".equals(headUrl)){
response.setHeader("Access-Control-Allow-Origin","*");
}
}
return true;
}
}

77
src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.emr.controller.commomSearch; package com.emr.controller.commomSearch;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ctc.wstx.util.StringUtil;
import com.emr.annotation.OptionalLog; import com.emr.annotation.OptionalLog;
import com.emr.controller.FormTokenFlagUtil; import com.emr.controller.FormTokenFlagUtil;
import com.emr.dao.*; import com.emr.dao.*;
@ -32,7 +31,6 @@ import com.emr.service.recordType.EmrTypeService;
import com.emr.service.tScanAssort.T_Scan_AssortService; import com.emr.service.tScanAssort.T_Scan_AssortService;
import com.emr.util.FieldPropertyConvert; import com.emr.util.FieldPropertyConvert;
import com.emr.util.Jpg2PdfUtil; import com.emr.util.Jpg2PdfUtil;
import com.emr.util.PropertiesUtils;
import com.emr.util.img2PdfUtil; import com.emr.util.img2PdfUtil;
import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo; import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
import com.emr.vo.FontVo.FontCommom; import com.emr.vo.FontVo.FontCommom;
@ -41,16 +39,14 @@ import com.emr.vo.codeType.CodeTree;
import com.emr.vo.commomSearch.CommomTree; import com.emr.vo.commomSearch.CommomTree;
import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.commomSearch.CommomVo;
import com.emr.vo.commomSearch.ScanPathVo; import com.emr.vo.commomSearch.ScanPathVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.lowagie.text.Image; import com.lowagie.text.Image;
import com.lowagie.text.Utilities; import com.lowagie.text.Utilities;
import com.lowagie.text.pdf.*; import com.lowagie.text.pdf.*;
import com.lowagie.text.pdf.codec.TiffImage; import com.lowagie.text.pdf.codec.TiffImage;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -79,12 +75,12 @@ import java.util.*;
* @UpdateRemark: 更新说明 * @UpdateRemark: 更新说明
* @Version: 1.0 * @Version: 1.0
*/ */
@Slf4j
@Controller @Controller
@RequestMapping("commom/") @RequestMapping("commom/")
public class CommomSearchController { public class CommomSearchController {
@Value("${pdfWater}") @Value("${pdfWater}")
private String pdfWater; private String pdfWater;
Logger logger = LoggerFactory.getLogger(CommomSearchController.class);
@Autowired @Autowired
private Emr_DictionaryMapper dictionaryMapper; private Emr_DictionaryMapper dictionaryMapper;
@Autowired @Autowired
@ -579,9 +575,7 @@ public class CommomSearchController {
List<CommomVo> commomVos = commomMapper.selectOtherDiagByPatientId(patientId); List<CommomVo> commomVos = commomMapper.selectOtherDiagByPatientId(patientId);
try { try {
if (null != commomVos && !commomVos.isEmpty()) { if (null != commomVos && !commomVos.isEmpty()) {
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(commomVos.get(0));
String json = mapper.writeValueAsString(commomVos.get(0));
return json;
} else { } else {
return null; return null;
} }
@ -680,9 +674,7 @@ public class CommomSearchController {
treeList.add(tree2); treeList.add(tree2);
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(treeList);
String json = mapper.writeValueAsString(treeList);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -811,9 +803,7 @@ public class CommomSearchController {
treeList.add(tree2); treeList.add(tree2);
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(treeList);
String json = mapper.writeValueAsString(treeList);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -923,9 +913,7 @@ public class CommomSearchController {
treeList.add(tree2); treeList.add(tree2);
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(treeList);
String json = mapper.writeValueAsString(treeList);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -987,7 +975,7 @@ public class CommomSearchController {
Object localObject2 = null; Object localObject2 = null;
URL paramURL = Utilities.toURL(filePath); URL paramURL = Utilities.toURL(filePath);
try { try {
if (paramURL.getProtocol().equals("file")) { if ("file".equals(paramURL.getProtocol())) {
localObject2 = paramURL.getFile(); localObject2 = paramURL.getFile();
localObject2 = Utilities localObject2 = Utilities
.unEscapeURL((String) localObject2); .unEscapeURL((String) localObject2);
@ -1006,13 +994,14 @@ public class CommomSearchController {
image = (Image) localObject2; image = (Image) localObject2;
} }
} }
if (localObject1 != null) if (localObject1 != null){
((RandomAccessFileOrArray) localObject1).close(); ((RandomAccessFileOrArray) localObject1).close();}
} finally { } finally {
if (localObject1 != null) if (localObject1 != null) {
((RandomAccessFileOrArray) localObject1).close(); ((RandomAccessFileOrArray) localObject1).close();
} }
}
} else if (file1.getName().endsWith(".png") } else if (file1.getName().endsWith(".png")
|| file1.getName().endsWith(".jpg") || file1.getName().endsWith(".jpg")
|| file1.getName().endsWith(".gif") || file1.getName().endsWith(".gif")
@ -1360,9 +1349,7 @@ public class CommomSearchController {
} }
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(map);
String json = mapper.writeValueAsString(map);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -1401,9 +1388,7 @@ public class CommomSearchController {
} }
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(map);
String json = mapper.writeValueAsString(map);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -1535,9 +1520,7 @@ public class CommomSearchController {
} }
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(treeList);
String json = mapper.writeValueAsString(treeList);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -1595,10 +1578,10 @@ public class CommomSearchController {
return ResultUtil.error("类别标志不能重复!"); return ResultUtil.error("类别标志不能重复!");
} }
} else { } else {
if (null != isExistName && isExistName.getId() != codeType.getId()) { if (null != isExistName && !isExistName.getId().equals(codeType.getId())) {
return ResultUtil.error("类别名称不能重复!"); return ResultUtil.error("类别名称不能重复!");
} else { } else {
if (null != isExistFlag && isExistFlag.getId() != codeType.getId()) { if (null != isExistFlag && !isExistFlag.getId().equals(codeType.getId())) {
return ResultUtil.error("类别标志不能重复!"); return ResultUtil.error("类别标志不能重复!");
} else { } else {
//修改 //修改
@ -1718,9 +1701,7 @@ public class CommomSearchController {
//根据手术编码和名称查询手术编码对象 //根据手术编码和名称查询手术编码对象
try { try {
List<Zd_Cm3> cm3s = cm3Mapper.selectAll(code, name); List<Zd_Cm3> cm3s = cm3Mapper.selectAll(code, name);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(cm3s);
String json = mapper.writeValueAsString(cm3s);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -1848,9 +1829,7 @@ public class CommomSearchController {
public String getDictionaryByTypeCode(String typeCode) { public String getDictionaryByTypeCode(String typeCode) {
try { try {
List<Emr_Dictionary> dictionaries = dictionaryMapper.selectDictionaryByTypeCode(typeCode); List<Emr_Dictionary> dictionaries = dictionaryMapper.selectDictionaryByTypeCode(typeCode);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(dictionaries);
String json = mapper.writeValueAsString(dictionaries);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -1874,9 +1853,7 @@ public class CommomSearchController {
public String getIcdCodeList() { public String getIcdCodeList() {
try { try {
List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(null, null); List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(null, null);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(icdCodes);
String json = mapper.writeValueAsString(icdCodes);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -1900,9 +1877,7 @@ public class CommomSearchController {
public String getIcdCodeByCodeOrName(String code, String name) { public String getIcdCodeByCodeOrName(String code, String name) {
try { try {
List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(code, name); List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(code, name);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(icdCodes);
String json = mapper.writeValueAsString(icdCodes);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -2153,7 +2128,7 @@ public class CommomSearchController {
Object localObject2 = null; Object localObject2 = null;
URL paramURL = Utilities.toURL(fileRealPath); URL paramURL = Utilities.toURL(fileRealPath);
try { try {
if (paramURL.getProtocol().equals("file")) { if ("file".equals(paramURL.getProtocol())) {
localObject2 = paramURL.getFile(); localObject2 = paramURL.getFile();
localObject2 = Utilities localObject2 = Utilities
.unEscapeURL((String) localObject2); .unEscapeURL((String) localObject2);
@ -2172,13 +2147,15 @@ public class CommomSearchController {
image = (Image) localObject2; image = (Image) localObject2;
} }
} }
if (localObject1 != null) if (localObject1 != null) {
((RandomAccessFileOrArray) localObject1).close(); ((RandomAccessFileOrArray) localObject1).close();
}
} finally { } finally {
if (localObject1 != null) if (localObject1 != null) {
((RandomAccessFileOrArray) localObject1).close(); ((RandomAccessFileOrArray) localObject1).close();
} }
}
} else if (file1.getName().endsWith(".png") } else if (file1.getName().endsWith(".png")
|| file1.getName().endsWith(".jpg") || file1.getName().endsWith(".jpg")
|| file1.getName().endsWith(".gif") || file1.getName().endsWith(".gif")
@ -2199,7 +2176,7 @@ public class CommomSearchController {
if (width > 1024 || heigth > 786) { if (width > 1024 || heigth > 786) {
image.scalePercent(percent + 5); image.scalePercent(percent + 5);
pageCount++; pageCount++;
if (pageCount == index) { if (pageCount.equals(index)) {
//当前页返回 //当前页返回
list.clear(); list.clear();
list.add(scanPathVo); list.add(scanPathVo);
@ -2214,7 +2191,7 @@ public class CommomSearchController {
tempHeight += heigth; tempHeight += heigth;
if (tempHeight > 786) { if (tempHeight > 786) {
pageCount++; pageCount++;
if (pageCount == index) { if (pageCount.equals(index)) {
//当前页返回 //当前页返回
list.clear(); list.clear();
list.add(scanPathVo); list.add(scanPathVo);

10
src/main/java/com/emr/controller/distributionManage/DistributionController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.emr.controller.distributionManage; package com.emr.controller.distributionManage;
import com.alibaba.fastjson.JSON;
import com.emr.annotation.OptionalLog; import com.emr.annotation.OptionalLog;
import com.emr.controller.FormTokenFlagUtil; import com.emr.controller.FormTokenFlagUtil;
import com.emr.dao.Zd_AssortMapper; import com.emr.dao.Zd_AssortMapper;
@ -11,7 +12,6 @@ import com.emr.entity.emrUserReader.Emr_User_Reader;
import com.emr.service.Zd_AssortServiceImpl; import com.emr.service.Zd_AssortServiceImpl;
import com.emr.service.emrRoleReader.EmrRoleRearderService; import com.emr.service.emrRoleReader.EmrRoleRearderService;
import com.emr.service.emrUserReader.EmrUserRearderService; import com.emr.service.emrUserReader.EmrUserRearderService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -152,9 +152,7 @@ public class DistributionController {
} }
} }
PageInfo pageInfo = new PageInfo<>(assorts); PageInfo pageInfo = new PageInfo<>(assorts);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -251,9 +249,7 @@ public class DistributionController {
public String getAssortByAssortId(@PathVariable("assortId") String assortId){ public String getAssortByAssortId(@PathVariable("assortId") String assortId){
try{ try{
Zd_Assort assort = assortMapper.getAssortByAssortId(assortId); Zd_Assort assort = assortMapper.getAssortByAssortId(assortId);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(assort);
String json = mapper.writeValueAsString(assort);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

26
src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.emr.controller.emrApprove; package com.emr.controller.emrApprove;
import com.alibaba.fastjson.JSON;
import com.emr.annotation.OptionalLog; import com.emr.annotation.OptionalLog;
import com.emr.dao.emrReasonAnnoModel.Emr_Reason_Anno_ModelMapper; import com.emr.dao.emrReasonAnnoModel.Emr_Reason_Anno_ModelMapper;
import com.emr.entity.Power_User; import com.emr.entity.Power_User;
@ -7,7 +8,6 @@ import com.emr.entity.ResultUtil;
import com.emr.entity.emrReasonAnnoModel.Emr_Reason_Anno_Model; import com.emr.entity.emrReasonAnnoModel.Emr_Reason_Anno_Model;
import com.emr.service.emrReasonAnnoModel.AnnotationTemplateService; import com.emr.service.emrReasonAnnoModel.AnnotationTemplateService;
import com.emr.util.ExportExcelUtil; import com.emr.util.ExportExcelUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -71,9 +71,7 @@ public class AnnotationTemplateController {
public String selectNotContentAllAnnoTypeByCreater(HttpServletRequest request){ public String selectNotContentAllAnnoTypeByCreater(HttpServletRequest request){
try { try {
List<Emr_Reason_Anno_Model> types = annotationTemplateService.selectNotContentAllAnnoTypeByCreater(request); List<Emr_Reason_Anno_Model> types = annotationTemplateService.selectNotContentAllAnnoTypeByCreater(request);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(types);
String json = mapper.writeValueAsString(types);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
} }
@ -102,9 +100,7 @@ public class AnnotationTemplateController {
model.setId(0); model.setId(0);
model.setTypeName("类别列表"); model.setTypeName("类别列表");
types.add(model); types.add(model);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(types);
String json = mapper.writeValueAsString(types);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -169,10 +165,10 @@ public class AnnotationTemplateController {
Emr_Reason_Anno_Model reason = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "reason",null,null); Emr_Reason_Anno_Model reason = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "reason",null,null);
Emr_Reason_Anno_Model anno = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "anno",null,null); Emr_Reason_Anno_Model anno = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "anno",null,null);
if("reason".equals(reasonAnnoModel.getTypeFlag()) || "anno".equals(reasonAnnoModel.getTypeFlag())){ if("reason".equals(reasonAnnoModel.getTypeFlag()) || "anno".equals(reasonAnnoModel.getTypeFlag())){
if(null != reason && reason.getId() != reasonAnnoModel.getId()){ if(null != reason && !reason.getId().equals(reasonAnnoModel.getId())){
return ResultUtil.error("类别标志不能重复!"); return ResultUtil.error("类别标志不能重复!");
} }
if(null != anno && anno.getId() != reasonAnnoModel.getId()){ if(null != anno && !anno.getId().equals(reasonAnnoModel.getId())){
return ResultUtil.error("类别标志不能重复!"); return ResultUtil.error("类别标志不能重复!");
} }
} }
@ -274,9 +270,7 @@ public class AnnotationTemplateController {
public String getAnnoTemplateById(Integer id){ public String getAnnoTemplateById(Integer id){
try { try {
Emr_Reason_Anno_Model model = annoModelMapper.getAnnoTemplateById(id); Emr_Reason_Anno_Model model = annoModelMapper.getAnnoTemplateById(id);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(model);
String json = mapper.writeValueAsString(model);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -328,9 +322,7 @@ public class AnnotationTemplateController {
} }
} }
PageInfo pageInfo = new PageInfo<>(models); PageInfo pageInfo = new PageInfo<>(models);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -401,9 +393,7 @@ public class AnnotationTemplateController {
public String getAnnoTemplateByParentId(Integer parentId){ public String getAnnoTemplateByParentId(Integer parentId){
try { try {
String content = annoModelMapper.selectContentByParentId(parentId); String content = annoModelMapper.selectContentByParentId(parentId);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(content);
String json = mapper.writeValueAsString(content);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

26
src/main/java/com/emr/controller/emrApprove/ApproveController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.emr.controller.emrApprove; package com.emr.controller.emrApprove;
import com.alibaba.fastjson.JSON;
import com.emr.annotation.OptionalLog; import com.emr.annotation.OptionalLog;
import com.emr.controller.FormTokenFlagUtil; import com.emr.controller.FormTokenFlagUtil;
import com.emr.dao.CommomMapper; import com.emr.dao.CommomMapper;
@ -18,7 +19,6 @@ import com.emr.util.ConvertToSelectJson;
import com.emr.util.DateUtils; import com.emr.util.DateUtils;
import com.emr.util.ExportExcelUtil; import com.emr.util.ExportExcelUtil;
import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.commomSearch.CommomVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -93,9 +93,7 @@ public class ApproveController {
try { try {
List<Emr_Apply_Approve> approves = applyApproveService.selectNotSumbitPatientIdsByUser(userName, patientId,type); List<Emr_Apply_Approve> approves = applyApproveService.selectNotSumbitPatientIdsByUser(userName, patientId,type);
if(null != approves && !approves.isEmpty()){ if(null != approves && !approves.isEmpty()){
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(approves.get(approves.size() - 1));
String json = mapper.writeValueAsString(approves.get(approves.size() - 1));
return json;
}else{ }else{
return null; return null;
} }
@ -482,9 +480,7 @@ public class ApproveController {
} }
} }
PageInfo pageInfo = new PageInfo<>(approves); PageInfo pageInfo = new PageInfo<>(approves);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -518,9 +514,7 @@ public class ApproveController {
emrApplyApprove.setDisTime(fmt.format(disDate)); emrApplyApprove.setDisTime(fmt.format(disDate));
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(emrApplyApprove);
String json = mapper.writeValueAsString(emrApplyApprove);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -725,9 +719,7 @@ public class ApproveController {
} }
} }
PageInfo pageInfo = new PageInfo<>(approves); PageInfo pageInfo = new PageInfo<>(approves);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -918,9 +910,7 @@ public class ApproveController {
} }
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(strs);
String json = mapper.writeValueAsString(strs);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -952,9 +942,7 @@ public class ApproveController {
} }
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(strs);
String json = mapper.writeValueAsString(strs);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

18
src/main/java/com/emr/controller/emrApprove/CollectionController.java
Unescape Escape View File

@ -11,9 +11,7 @@ import com.emr.entity.ResultUtil;
import com.emr.entity.emrCollect.Emr_Collect; import com.emr.entity.emrCollect.Emr_Collect;
import com.emr.service.emrCollect.EmrCollectService; import com.emr.service.emrCollect.EmrCollectService;
import com.emr.service.emrFunGroupDistribution.FunGroupDistributionService; import com.emr.service.emrFunGroupDistribution.FunGroupDistributionService;
import com.emr.service.templateSearch.TemplateSearchService;
import com.emr.util.ExportExcelUtil; import com.emr.util.ExportExcelUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -119,9 +117,7 @@ public class CollectionController {
collect.setId(0); collect.setId(0);
collect.setCollectTypeName("收藏列表"); collect.setCollectTypeName("收藏列表");
collects.add(collect); collects.add(collect);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(collects);
String json = mapper.writeValueAsString(collects);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -409,9 +405,7 @@ public class CollectionController {
} }
} }
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(collect);
String json = mapper.writeValueAsString(collect);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -438,9 +432,7 @@ public class CollectionController {
try{ try{
//根据用户id和patientId查询收藏对象 //根据用户id和patientId查询收藏对象
Emr_Collect collect = emrCollectService.selectCollectByUserIdAndPatientId(userId, patientId); Emr_Collect collect = emrCollectService.selectCollectByUserIdAndPatientId(userId, patientId);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(collect);
String json = mapper.writeValueAsString(collect);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -495,9 +487,7 @@ public class CollectionController {
} }
} }
PageInfo pageInfo = new PageInfo<>(collects); PageInfo pageInfo = new PageInfo<>(collects);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

13
src/main/java/com/emr/controller/emrLock/EmrLockController.java
Unescape Escape View File

@ -1,12 +1,9 @@
package com.emr.controller.emrLock; package com.emr.controller.emrLock;
import com.emr.dao.recordLock.Emr_LockMapper; import com.alibaba.fastjson.JSON;
import com.emr.entity.recordLock.Emr_Lock; import com.emr.entity.recordLock.Emr_Lock;
import com.emr.service.emrLock.EmrLockServiceImpl; import com.emr.service.emrLock.EmrLockServiceImpl;
import com.emr.vo.EmrLockVo; import com.emr.vo.EmrLockVo;
import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
import com.emr.vo.FontVo.LockVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -74,9 +71,7 @@ public class EmrLockController {
//查询 //查询
List<EmrLockVo> list = emrLockService.getLockList(lockVo); List<EmrLockVo> list = emrLockService.getLockList(lockVo);
PageInfo pageInfo = new PageInfo<>(list); PageInfo pageInfo = new PageInfo<>(list);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -107,9 +102,7 @@ public class EmrLockController {
for (int i = 0; i < emr_locks.size(); i++) { for (int i = 0; i < emr_locks.size(); i++) {
locks += "'" + emr_locks.get(i).getPatientId() + "',"; locks += "'" + emr_locks.get(i).getPatientId() + "',";
} }
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(locks);
String json = mapper.writeValueAsString(locks);
return json;
}else{ }else{
return ""; return "";
} }

10
src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java
Unescape Escape View File

@ -1,15 +1,12 @@
package com.emr.controller.emrPrintOrDownLoadInfo; package com.emr.controller.emrPrintOrDownLoadInfo;
import com.alibaba.fastjson.JSON;
import com.emr.annotation.OptionalLog; import com.emr.annotation.OptionalLog;
import com.emr.entity.ResultUtil; import com.emr.entity.ResultUtil;
import com.emr.entity.emrCollect.Emr_Collect;
import com.emr.service.emrPrintOrDownLoadInfo.PrintOrDownLoadInfoService; import com.emr.service.emrPrintOrDownLoadInfo.PrintOrDownLoadInfoService;
import com.emr.util.ExportExcelUtil; import com.emr.util.ExportExcelUtil;
import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo; import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.collections.list.AbstractLinkedList;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -17,7 +14,6 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -86,9 +82,7 @@ public class PrintOrDownLoadInfoController {
} }
PageInfo pageInfo = new PageInfo<>(updateList); PageInfo pageInfo = new PageInfo<>(updateList);
pageInfo.setTotal(size); pageInfo.setTotal(size);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

12
src/main/java/com/emr/controller/otherManage/BackDatabaseController.java
Unescape Escape View File

@ -1,14 +1,12 @@
package com.emr.controller.otherManage; package com.emr.controller.otherManage;
import com.emr.annotation.OptionalLog; import com.alibaba.fastjson.JSON;
import com.emr.dao.emrLog.Emr_LogMapper; import com.emr.dao.emrLog.Emr_LogMapper;
import com.emr.entity.Power_User; import com.emr.entity.Power_User;
import com.emr.entity.ResultUtil; import com.emr.entity.ResultUtil;
import com.emr.entity.approve.Emr_Apply_Approve;
import com.emr.entity.emrLog.Emr_Log; import com.emr.entity.emrLog.Emr_Log;
import com.emr.service.emrLog.LogService; import com.emr.service.emrLog.LogService;
import com.emr.util.ExportExcelUtil; import com.emr.util.ExportExcelUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -60,7 +58,6 @@ public class BackDatabaseController {
* @UpdateRemark: 更新说明 * @UpdateRemark: 更新说明
* @Version: 1.0 * @Version: 1.0
*/ */
@OptionalLog(module = "查看",methods="日志管理页面")
@RequiresPermissions("/otherManage/backupDatabase") @RequiresPermissions("/otherManage/backupDatabase")
@RequestMapping("backupDatabase") @RequestMapping("backupDatabase")
public String backupDatabase(Model model){ public String backupDatabase(Model model){
@ -106,9 +103,7 @@ public class BackDatabaseController {
} }
} }
PageInfo pageInfo = new PageInfo<>(logs); PageInfo pageInfo = new PageInfo<>(logs);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -127,7 +122,6 @@ public class BackDatabaseController {
* @UpdateRemark: 更新说明 * @UpdateRemark: 更新说明
* @Version: 1.0 * @Version: 1.0
*/ */
@OptionalLog(module = "删除",methods = "日志管理",fieldName = "logContent",tableName = "emr_log")
@RequiresPermissions("/otherManage/deleteLogById") @RequiresPermissions("/otherManage/deleteLogById")
@RequestMapping("deleteLogById/{logId}") @RequestMapping("deleteLogById/{logId}")
@ResponseBody @ResponseBody
@ -153,7 +147,6 @@ public class BackDatabaseController {
* @UpdateRemark: 更新说明 * @UpdateRemark: 更新说明
* @Version: 1.0 * @Version: 1.0
*/ */
@OptionalLog(module = "批量删除",methods = "日志管理")
@RequestMapping("deleteLogByIds/{ids}") @RequestMapping("deleteLogByIds/{ids}")
@RequiresPermissions("/otherManage/deleteLogByIds") @RequiresPermissions("/otherManage/deleteLogByIds")
@ResponseBody @ResponseBody
@ -190,7 +183,6 @@ public class BackDatabaseController {
* @UpdateRemark: 更新说明 * @UpdateRemark: 更新说明
* @Version: 1.0 * @Version: 1.0
*/ */
@OptionalLog(module = "导出excel",methods = "日志管理")
@RequiresPermissions("/otherManage/exportExcel") @RequiresPermissions("/otherManage/exportExcel")
@RequestMapping(value="exportExcel",produces = {"text/json;charset=UTF-8"}) @RequestMapping(value="exportExcel",produces = {"text/json;charset=UTF-8"})
@ResponseBody @ResponseBody

14
src/main/java/com/emr/controller/otherManage/FunGroupDistributionController.java
Unescape Escape View File

@ -13,7 +13,6 @@ import com.emr.vo.Emr_Fun_Group_DistributionVo;
import com.emr.vo.Msg; import com.emr.vo.Msg;
import com.emr.vo.PowerTree; import com.emr.vo.PowerTree;
import com.emr.vo.User; import com.emr.vo.User;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -22,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -190,7 +190,7 @@ public class FunGroupDistributionController {
*/ */
@OptionalLog(module = "新增",methods = "功能组别分配",fieldName = "userNames") @OptionalLog(module = "新增",methods = "功能组别分配",fieldName = "userNames")
@RequiresPermissions("/funGroupDistribution/addFunGroupDistribution") @RequiresPermissions("/funGroupDistribution/addFunGroupDistribution")
@RequestMapping("addFunGroupDistribution") @RequestMapping(value="addFunGroupDistribution",method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Msg addFunGroupDistribution(Emr_Fun_Group_DistributionVo distributionVo, HttpServletRequest request) { public Msg addFunGroupDistribution(Emr_Fun_Group_DistributionVo distributionVo, HttpServletRequest request) {
try { try {
@ -216,7 +216,7 @@ public class FunGroupDistributionController {
*/ */
@RequestMapping("getFunGroupDistributionList") @RequestMapping("getFunGroupDistributionList")
@ResponseBody @ResponseBody
public String getFunGroupDistributionList(Emr_Fun_Group_Distribution distribution, Integer page, Integer limit, String startTime, String endTime, HttpServletRequest request) { public PageInfo getFunGroupDistributionList(Emr_Fun_Group_Distribution distribution, Integer page, Integer limit, String startTime, String endTime, HttpServletRequest request) {
try { try {
if(null != page && null != limit){ if(null != page && null != limit){
PageHelper.startPage(page, limit); PageHelper.startPage(page, limit);
@ -247,12 +247,10 @@ public class FunGroupDistributionController {
} }
} }
PageInfo pageInfo = new PageInfo<>(list); PageInfo pageInfo = new PageInfo<>(list);
ObjectMapper mapper = new ObjectMapper(); return pageInfo;
String json = mapper.writeValueAsString(pageInfo);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return ""; return null;
} }
} }
@ -331,7 +329,7 @@ public class FunGroupDistributionController {
*/ */
@OptionalLog(module = "删除",methods = "功能组别分配",fieldName = "userName",tableName = "emr_fun_group_distribution") @OptionalLog(module = "删除",methods = "功能组别分配",fieldName = "userName",tableName = "emr_fun_group_distribution")
@RequiresPermissions("/funGroupDistribution/deleteById") @RequiresPermissions("/funGroupDistribution/deleteById")
@RequestMapping("deleteById/{id}") @RequestMapping(value="deleteById/{id}",method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Msg deleteById(@PathVariable("id")Integer id) { public Msg deleteById(@PathVariable("id")Integer id) {
try { try {

15
src/main/java/com/emr/controller/printing/PrintingController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.emr.controller.printing; package com.emr.controller.printing;
import com.alibaba.fastjson.JSON;
import com.emr.annotation.OptionalLog; import com.emr.annotation.OptionalLog;
import com.emr.controller.FormTokenFlagUtil; import com.emr.controller.FormTokenFlagUtil;
import com.emr.dao.Zd_AssortMapper; import com.emr.dao.Zd_AssortMapper;
@ -7,11 +8,9 @@ import com.emr.entity.Power_User;
import com.emr.entity.ResultUtil; import com.emr.entity.ResultUtil;
import com.emr.entity.Zd_Assort; import com.emr.entity.Zd_Assort;
import com.emr.entity.recordType.Emr_Type; import com.emr.entity.recordType.Emr_Type;
import com.emr.entity.recordType.Emr_Type_Related;
import com.emr.service.recordType.EmrTypeRelatedService; import com.emr.service.recordType.EmrTypeRelatedService;
import com.emr.service.recordType.EmrTypeService; import com.emr.service.recordType.EmrTypeService;
import com.emr.vo.emrType.EmrTypeVo; import com.emr.vo.emrType.EmrTypeVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -221,10 +220,10 @@ public class PrintingController {
} }
Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request); Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request);
Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request); Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request);
if (null != type && type.getId() != emrType.getId()) { if (null != type && !type.getId().equals(emrType.getId())) {
return ResultUtil.error("该类别名称已存在！"); return ResultUtil.error("该类别名称已存在！");
} }
if (null != type1 && type1.getId() != emrType.getId()) { if (null != type1 && !type1.getId().equals(emrType.getId())) {
return ResultUtil.error("该类别标志已存在！"); return ResultUtil.error("该类别标志已存在！");
} }
if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())){ if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())){
@ -260,10 +259,10 @@ public class PrintingController {
if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())) { if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())) {
Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request); Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request);
Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request); Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request);
if (null != type && type.getId() != emrType.getId()) { if (null != type && !type.getId().equals(emrType.getId())) {
return ResultUtil.error("该类别名称已存在！"); return ResultUtil.error("该类别名称已存在！");
} }
if (null != type1 && type1.getId() != emrType.getId()) { if (null != type1 && !type1.getId().equals(emrType.getId())) {
return ResultUtil.error("该类别标志已存在！"); return ResultUtil.error("该类别标志已存在！");
} }
emrTypeService.updateEmrType(emrType, selectFlagId, request); emrTypeService.updateEmrType(emrType, selectFlagId, request);
@ -341,9 +340,7 @@ public class PrintingController {
emrTypeVo.setTypeName("类别列表"); emrTypeVo.setTypeName("类别列表");
types.add(emrTypeVo); types.add(emrTypeVo);
types.addAll(typeVoList); types.addAll(typeVoList);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(types);
String json = mapper.writeValueAsString(types);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;

13
src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
Unescape Escape View File

@ -33,7 +33,6 @@ import com.emr.vo.commomSearch.CommomVo;
import com.emr.vo.commomSearch.ScanPathForPatientListVo; import com.emr.vo.commomSearch.ScanPathForPatientListVo;
import com.emr.vo.commomSearch.ScanPathVo; import com.emr.vo.commomSearch.ScanPathVo;
import com.emr.vo.templateSearch.Emr_Modle_RelatedVo; import com.emr.vo.templateSearch.Emr_Modle_RelatedVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -290,9 +289,7 @@ public class TemplateSearchController {
list.add(customize); list.add(customize);
List<Emr_Customize> templates = customizeMapper.selectAllByTree(); List<Emr_Customize> templates = customizeMapper.selectAllByTree();
list.addAll(templates); list.addAll(templates);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(list);
String json = mapper.writeValueAsString(list);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -536,9 +533,7 @@ public class TemplateSearchController {
modle.setModleName("模板选择列表"); modle.setModleName("模板选择列表");
modles.add(modle); modles.add(modle);
modles.addAll(modleList); modles.addAll(modleList);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(modles);
String json = mapper.writeValueAsString(modles);
return json;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -1029,9 +1024,7 @@ public class TemplateSearchController {
} }
} }
PageInfo pageInfo = new PageInfo<>(commomVos); PageInfo pageInfo = new PageInfo<>(commomVos);
ObjectMapper mapper = new ObjectMapper(); return JSON.toJSONString(pageInfo);
String json = mapper.writeValueAsString(pageInfo);
return json;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;

12
src/main/java/com/emr/controller/testController.java
Unescape Escape View File

@ -1,12 +0,0 @@
package com.emr.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class testController {
@RequestMapping("index1")
public String index1(){
return "index1";
}
}

1
src/main/java/com/emr/entity/emrCode/T_Operate.java
Unescape Escape View File

@ -1,6 +1,5 @@
package com.emr.entity.emrCode; package com.emr.entity.emrCode;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;

7
src/main/java/com/emr/service/CommomService.java
Unescape Escape View File

@ -1,9 +1,8 @@
package com.emr.service; package com.emr.service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject;
import com.emr.vo.User; import com.emr.vo.User;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
@ -87,9 +86,9 @@ public class CommomService {
resultString = EntityUtils.toString(response.getEntity(), "UTF-8"); resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
} }
if(StringUtils.isNoneBlank(resultString)) { if(StringUtils.isNoneBlank(resultString)) {
JSONObject jsonObject = JSONObject.fromObject(resultString); JSONObject jsonObject = JSON.parseObject(resultString);
String extend = jsonObject.getString("extend"); String extend = jsonObject.getString("extend");
JSONObject extendObject = JSONObject.fromObject(extend); JSONObject extendObject = JSONObject.parseObject(extend);
String userList1 = extendObject.getString("userList"); String userList1 = extendObject.getString("userList");
userList = (List<User>) JSON.parseArray(userList1, User.class); userList = (List<User>) JSON.parseArray(userList1, User.class);
} }

8
src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java
Unescape Escape View File

@ -1,14 +1,12 @@
package com.emr.service.approve; package com.emr.service.approve;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject;
import com.emr.annotation.DBSource;
import com.emr.dao.approve.Emr_Apply_ApproveMapper; import com.emr.dao.approve.Emr_Apply_ApproveMapper;
import com.emr.entity.Power_User; import com.emr.entity.Power_User;
import com.emr.entity.approve.Emr_Apply_Approve; import com.emr.entity.approve.Emr_Apply_Approve;
import com.emr.service.CommomService; import com.emr.service.CommomService;
import com.emr.vo.User; import com.emr.vo.User;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
@ -131,9 +129,9 @@ public class AppleApproveServiceImpl implements ApplyApproveService{
if (response.getStatusLine().getStatusCode() == 200) { if (response.getStatusLine().getStatusCode() == 200) {
resultString = EntityUtils.toString(response.getEntity(), "UTF-8"); resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
} }
JSONObject jsonObject = JSONObject.fromObject(resultString); JSONObject jsonObject = JSON.parseObject(resultString);
String extend = jsonObject.getString("extend"); String extend = jsonObject.getString("extend");
JSONObject extendObject = JSONObject.fromObject(extend); JSONObject extendObject = JSONObject.parseObject(extend);
String userList1 = extendObject.getString("userList"); String userList1 = extendObject.getString("userList");
List<User> userList = (List<User>) JSON.parseArray(userList1,User.class); List<User> userList = (List<User>) JSON.parseArray(userList1,User.class);
for (int i = 0; i < userList.size(); i++) { for (int i = 0; i < userList.size(); i++) {

7
src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
Unescape Escape View File

@ -53,13 +53,6 @@
<property name="prefix" value="/WEB-INF/views/" /> <property name="prefix" value="/WEB-INF/views/" />
<property name="suffix" value=".jsp" /> <property name="suffix" value=".jsp" />
</bean> </bean>
<mvc:interceptors>
<mvc:interceptor>
<mvc:mapping path="/**"/>
<mvc:exclude-mapping path="/static/**"/>
<bean class="com.emr.controller.UrlInterceptor"/>
</mvc:interceptor>
</mvc:interceptors>
<bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver"> <bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
<property name="exceptionMappings"> <property name="exceptionMappings">
<props> <props>

168
src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp
Unescape Escape View File

@ -19,69 +19,50 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
/* body {
margin-right: -15px;
margin-bottom: -15px;
}*/
.leftDiv { .leftDiv {
width:25%; border-right: 10px solid #c1d7e3;
height: 100%;
background-color: #fff background-color: #fff
} }
.rightDiv { .rightDiv {
width:74%;
height:70%;
margin-left:1%;
background-color: #fff background-color: #fff
} }
.searchDiv { .searchDiv {
margin-top:2%; margin: 10px 20px;
} }
.form-group{
margin-top:-3%; .zTreeDemo {
} height: 394px !important;
.form-control{
margin: 0 auto;
width:80%;
}
.input{
width:200%;
} }
.treeBtns{
margin-top:-2%; .form-group {
margin-left:6%; margin-bottom: 5px;
} }
.treeBtn { .treeBtn {
margin-left: 13%; margin-left: 13%;
} }
.insertbtn { .insertbtn {
right: 5%!important; width: 80px;
margin-top: 1%;
width: 12%;
position: absolute;
} }
.btns { .btns {
width:100%; width: 230px;
margin-left:48%; margin: 0 auto;
margin-top:10px;
}
.savebtnDiv{
width:50%;
} }
.savebtn { .savebtn {
width:70%; width: 110px;
margin-left:23%;
}
.delbtnDiv{
width:50%;
} }
.delbtn { .delbtn {
width:70%; width: 110px;
} }
.content{
position: absolute; .main-content {
margin-top: 4%; height: calc(100vh - 43px);
margin-left: 9%;
} }
</style> </style>
</head> </head>
@ -93,11 +74,12 @@
<span class="headspan">自定义模板设计</span> <span class="headspan">自定义模板设计</span>
</div> </div>
</div> </div>
<div class="row main-content">
<!--树--> <!--树-->
<div class="leftDiv left"> <div class="col-md-3 leftDiv">
<div class="searchDiv"> <div class="searchDiv">
<input type="text" id="key" value="" class="form-control input-sm" <input type="text" id="key" value="" class="form-control input-sm"
placeholder="名称" maxlength="15"/><br/> placeholder="名称" maxlength="15"/>
</div> </div>
<div class="treeBtns"> <div class="treeBtns">
<button type="button" class="btn btn-success btn-sm treeBtn" onclick="expandAll();">全部展开</button> <button type="button" class="btn btn-success btn-sm treeBtn" onclick="expandAll();">全部展开</button>
@ -108,35 +90,41 @@
</div> </div>
</div> </div>
<!--内容--> <!--内容-->
<div class="rightDiv left"> <div class="col-md-9 rightDiv">
<form class="form-horizontal" role="form" id="form"> <shiro:hasPermission name="/template/addTemplate">
<div class="row" style="padding: 10px 0">
<div class="col-md-9"></div>
<div class="col-md-3" style="padding-left: 25px">
<button type="button" class="btn btn-sm btn-info insertbtn" onclick="add()">添加</button>
</div>
</div>
</shiro:hasPermission>
<div class="row">
<form class="form-horizontal" role="form" id="form" style="width: 60%;height:423px;margin: 0 auto">
<input type="hidden" id="id" name="id"> <input type="hidden" id="id" name="id">
<input type="hidden" name="formToken" id="formToken" value="${formToken}"> <input type="hidden" name="formToken" id="formToken" value="${formToken}">
<input type="hidden" id="treeId"> <input type="hidden" id="treeId">
<input type="hidden" id="parentId1" value="0"> <input type="hidden" id="parentId1" value="0">
<input type="hidden" id="childNode"> <input type="hidden" id="childNode">
<div class="row"> <div class="_content" id="contentDiv" _style="display: none">
<shiro:hasPermission name="/template/addTemplate">
<button type="button" class="btn btn-sm btn-info insertbtn" onclick="add()">添加</button>
</shiro:hasPermission>
</div>
<div class="row">
<div class="content" id="contentDiv" style="display: none">
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">字段值：</label> <label class="col-sm-4 control-label">字段值：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<input type="text" class="form-control input-sm input" name="columnValue" id="columnValue" maxlength="30"> <input type="text" class="form-control input-sm input" name="columnValue"
id="columnValue"
maxlength="30">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">字段名/模板名：</label> <label class="col-sm-4 control-label">字段名/模板名：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<input type="text" class="form-control input-sm input" name="columnName" id="columnName" maxlength="15"> <input type="text" class="form-control input-sm input" name="columnName" id="columnName"
maxlength="15">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">字段类型：</label> <label class="col-sm-4 control-label">字段类型：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<select class="form-control input-sm input" id="columnType" name="columnType"> <select class="form-control input-sm input" id="columnType" name="columnType">
<option value="">请选择</option> <option value="">请选择</option>
<option value="1">字符串</option> <option value="1">字符串</option>
@ -146,23 +134,25 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group" id="block"> <div class="form-group" id="block" style="display: none">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">表值：</label> <label class="col-sm-4 control-label">表值：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<input type="text" class="form-control input-sm input" name="tableValue" id="tableValue" maxlength="30"> <input type="text" class="form-control input-sm input" name="tableValue" id="tableValue"
maxlength="30">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">表名：</label> <label class="col-sm-4 control-label">表名：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<input type="text" class="form-control input-sm input" name="tableName" id="tableName" maxlength="15"> <input type="text" class="form-control input-sm input" name="tableName" id="tableName"
maxlength="15">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">选项：</label> <label class="col-sm-4 control-label">选项：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<select class="form-control input-sm input" id="selectValue" name="selectValue"> <select class="form-control input-sm input" id="selectValue" name="selectValue">
<option value="1">选中</option> <option value="1">选中</option>
<option value="0">未选中</option> <option value="0">未选中</option>
@ -170,8 +160,8 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">父级：</label> <label class="col-sm-4 control-label">父级：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<select class="form-control input-sm input" id="parentId" name="parentId"> <select class="form-control input-sm input" id="parentId" name="parentId">
<option value="0">模板列表</option> <option value="0">模板列表</option>
<c:forEach items="${parents}" var="parent"> <c:forEach items="${parents}" var="parent">
@ -181,14 +171,15 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">排序：</label> <label class="col-sm-4 control-label">排序：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<input type="number" class="form-control input-sm input" id="customizeSort" name="customizeSort" oninput="if(value.length>9)value=value.slice(0,9)"> <input type="number" class="form-control input-sm input" id="customizeSort"
name="customizeSort" oninput="if(value.length>9)value=value.slice(0,9)">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">有效否：</label> <label class="col-sm-4 control-label">有效否：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<select class="form-control input-sm input" name="effective" id="effective"> <select class="form-control input-sm input" name="effective" id="effective">
<option value="1">是</option> <option value="1">是</option>
<option value="0">否</option> <option value="0">否</option>
@ -196,30 +187,33 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label">备注：</label> <label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-7"> <div class="col-sm-8">
<textarea class="form-control input-sm input" name="remark" id="remark" maxlength="50"></textarea> <textarea class="form-control input-sm input" name="remark" id="remark"
maxlength="50"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" style="margin:15px auto">
<div class="col-sm-4"></div>
<div class="col-sm-8">
<div class="btns"> <div class="btns">
<div class="savebtnDiv left">
<shiro:hasPermission name="/template/addTemplate"> <shiro:hasPermission name="/template/addTemplate">
<button type="button" class="btn btn-sm btn-info savebtn" onclick="save()">保存</button> <button type="button" class="btn btn-sm btn-info savebtn" onclick="save()">保存
</button>
</shiro:hasPermission> </shiro:hasPermission>
</div>
<div class="delbtnDiv left">
<shiro:hasPermission name="/template/deleteTemplate"> <shiro:hasPermission name="/template/deleteTemplate">
<button type="button" class="btn btn-sm btn-danger delbtn" onclick="del()">删除</button> <button type="button" class="btn btn-sm btn-danger delbtn" onclick="del()">删除
</button>
</shiro:hasPermission> </shiro:hasPermission>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</form> </form>
</div> </div>
</div> </div>
</div>
</div>
<script src="${path}/static/js/recordManage/templateSearch/templateList1.js"></script> <script src="${path}/static/js/recordManage/templateSearch/templateList1.js"></script>
</body> </body>
</html> </html>

13
src/main/webapp/static/js/distributionManage/distributionManage.js
Unescape Escape View File

@ -153,17 +153,12 @@ function saveDistribution(){
if(data.code == 0){ if(data.code == 0){
flag = true; flag = true;
toastr.success("保存成功!"); toastr.success("保存成功!");
window.location.reload();
if($("#assortId").val() != ''){
setTimeout(function () {
refreshTable(); refreshTable();
},1000); $('#myModal1').modal('hide');
}
}else{ }else{
toastr.error(data.msg); toastr.error(data.msg);
} }
} },
}) })
}else{ }else{
toastr.warning("名称不能重复!"); toastr.warning("名称不能重复!");
@ -185,8 +180,6 @@ function deleteAssortByAssortId(assortId){
if (data.code == 0) { if (data.code == 0) {
flag = true; flag = true;
toastr.success("删除成功!"); toastr.success("删除成功!");
window.location.reload();
$('#myModal1').modal('hide');
} else { } else {
toastr.error("删除失败，请联系超管!"); toastr.error("删除失败，请联系超管!");
} }
@ -196,7 +189,7 @@ function deleteAssortByAssortId(assortId){
if (flag) { if (flag) {
refreshTable(); refreshTable();
} }
}, 1000) }, 500)
} }
} }
}) })

5
src/main/webapp/static/js/otherManage/dictionaryList.js
Unescape Escape View File

@ -173,6 +173,10 @@ function add(){
$("#form")[0].reset(); $("#form")[0].reset();
$("#id").val(""); $("#id").val("");
$("#parentId").empty(); $("#parentId").empty();
//根目录节点情况
if(typecode == ''){
typecode = '0';
}
$("#parentId").append("<option value='"+typecode+"'>"+name+"</option>"); $("#parentId").append("<option value='"+typecode+"'>"+name+"</option>");
//是0为根节点显示类型输入框，否则显示代码框 //是0为根节点显示类型输入框，否则显示代码框
if($("#parentId").val() == 0){ if($("#parentId").val() == 0){
@ -287,6 +291,7 @@ function save(){
var typename = $("#typename").val(); var typename = $("#typename").val();
var code = $("#code").val(); var code = $("#code").val();
var name = $("#name").val(); var name = $("#name").val();
debugger
//分类 //分类
if(parentId == 0){ if(parentId == 0){
if(typecode == ''){ if(typecode == ''){

1
src/main/webapp/static/js/otherManage/funGroupDistribution.js
Unescape Escape View File

@ -203,6 +203,7 @@ function deleteById(id){
url: path + '/funGroupDistribution/deleteById/' + id, url: path + '/funGroupDistribution/deleteById/' + id,
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
debugger
if (data.code == 100) { if (data.code == 100) {
toastr.success("删除成功!"); toastr.success("删除成功!");
refreshTable(); refreshTable();

Write Preview
Loading…
Cancel
Save