init

META-INF/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

pom.xml

@@ -0,0 +1,178 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.dashitech</groupId>
+	<artifactId>HSMSV1-CallSocket</artifactId>
+	<version>1.0.0</version>
+	<packaging>jar</packaging>
+
+	<name>HSMSV1-CallSocket</name>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.5.8.RELEASE</version>
+		<relativePath />
+	</parent>
+<!--	<artifactId>spring-boot-starter-logging</artifactId>
+	<name>Spring Boot Logging Starter</name>
+	<description>Starter for logging using Logback. Default logging starter</description>
+	<url>http://projects.spring.io/spring-boot/</url>-->
+	<properties>
+		<tomcat.version>7.0.59</tomcat.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+
+	<!--	<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-nop</artifactId>
+			<version>1.7.24</version>
+		</dependency>-->
+	<!--	<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>-->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+
+<!--		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j</artifactId>
+		</dependency>-->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.0.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpmime</artifactId>
+			<version>4.3.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>4.2.4.RELEASE</version>
+		</dependency>
+
+
+		<!-- db -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.transaction</groupId>
+					<artifactId>javax.transaction-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.spec.javax.transaction</groupId>
+			<artifactId>jboss-transaction-api_1.2_spec</artifactId>
+			<version>1.0.0.Final</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
+			<version>1.0.18</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.83</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.34</version>
+		</dependency>
+
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>2.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.atmosphere</groupId>
+			<artifactId>atmosphere-runtime</artifactId>
+			<version>2.4.28</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.netty</groupId>
+			<artifactId>netty</artifactId>
+			<version>3.2.5.Final</version>
+		</dependency>
+		<!-- end -->
+	</dependencies>
+	<build>
+
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

src/main/java/com/dashitech/Application.java

@@ -0,0 +1,44 @@
+package com.dashitech;
+
+import org.atmosphere.cpr.AtmosphereServlet;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.Ordered;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+//import org.mybatis.spring.annotation.MapperScan;
+
+
+@SpringBootApplication
+@EnableAsync
+@EnableScheduling
+@PropertySource({"classpath:application-custom.properties", "application.properties"})
+@ImportResource(locations = "classpath*:/application-context.xml")
+//@Import({DynamicDataSourceRegister.class}) // 注册动态多数据源
+//@MapperScan("com.dashitech.dao.mysqldb1")//将项目中对应的mapper类的路径加进来就可以了
+public class Application {
+
+    @Bean
+    public ServletRegistrationBean camelWebSocketServlet() {
+        ServletRegistrationBean bean = new ServletRegistrationBean(new AtmosphereServlet(), "/webSocket/*");
+        bean.setName("phoneWebSocket");
+        bean.setLoadOnStartup(0);
+        bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
+        return bean;
+    }
+
+    public static void main(String[] args) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        System.out.println("hsmsV1-CallSocket>>>>>>>>>>>>>>>>>>startData"+sdf.format(new Date()));
+        SpringApplication.run(Application.class, args);
+    }
+
+}

src/main/java/com/dashitech/bean/BaseBean.java

@@ -0,0 +1,43 @@
+package com.dashitech.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by chi on 2019/9/9.
+ */
+public class BaseBean implements Serializable {
+    /**
+     * bean类型
+     */
+    private String beanType;
+
+    /**
+     *对象数组
+    */
+    private List<Object> objectList;
+
+    public String getBeanType() {
+        return beanType;
+    }
+
+    public void setBeanType(String beanType) {
+        this.beanType = beanType;
+    }
+
+    public List<Object> getObjectList() {
+        return objectList;
+    }
+
+    public void setObjectList(List<Object> objectList) {
+        this.objectList = objectList;
+    }
+
+    @Override
+    public String toString() {
+        return "BaseBean{" +
+                "beanType='" + beanType + '\'' +
+                ", objectList=" + objectList +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/dao/ICallLogDAO.java

@@ -0,0 +1,17 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.CallLogEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+public interface ICallLogDAO extends JpaRepository<CallLogEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    CallLogEntity save(CallLogEntity callLogEntity);
+
+    @Query(value = "select hos_id from itsm_system_hospital_config where _key = ?1 and _value =?2 limit 1 ",nativeQuery = true)
+    String selectSernelNo(String key,String value);
+}

src/main/java/com/dashitech/businessdata/dao/IDepartmentDAO.java

@@ -0,0 +1,48 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.DepartmentEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by chi on 2019/9/12.
+ */
+@Repository
+public interface IDepartmentDAO extends JpaRepository<DepartmentEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    DepartmentEntity save(DepartmentEntity departmentEntity);
+
+    //@Query(value = "select id from DepartmentEntity where deleteFlag = 0 and pcode =?1 limit 1 ",nativeQuery = true)
+    @Query(value = "select id from itsm_uc_dept where delete_flag = 0 and code =?1 limit 1 ",nativeQuery = true)
+    Long selectIdByCode(String code);
+
+    @Query(value = "SELECT id FROM itsm_uc_hospital WHERE delete_flag = 0 and _hos_no=?1 limit 1", nativeQuery = true)
+    Long getHospitalIdByHosNo(String hosNo);
+
+/*    @Query(value = "SELECT dept FROM itsm_uc_dept g WHERE g._phone =?1 AND g.delete_flag = 0 limit 1", nativeQuery = true)
+    String getDeptNameByPhone(String phone);*/
+    @Query(value = "SELECT dept FROM itsm_uc_dept g WHERE g.many_phone like CONCAT('%',:phone,'%') AND g.delete_flag = 0 limit 1", nativeQuery = true)
+    String getDeptNameByPhone(@Param("phone")String phone);
+
+    @Query(value = "SELECT d.dept FROM itsm_uc_dept d WHERE id = (SELECT create_department_id FROM itsm_transport_workorder g WHERE g.work_order_phone =?1 LIMIT 1);",nativeQuery = true)
+    String getDeptNameByWorkOrderPhone(String phone);
+
+    @Query(value = "select code from itsm_uc_dept where delete_flag = 0",nativeQuery = true)
+    List<String> getDeptCodeList();
+
+
+    //用来补数据的查询
+    @Query(value = "select * from itsm_uc_dept where delete_flag = 0 and (input_code is null or pinyin is null)",nativeQuery = true)
+    List<DepartmentEntity> getNoPyDeptList();
+//    @Modifying
+//    @Query("update itsm_uc_dept set input_code = ?1 ,pinyin = ?2 where input_code is null or pinyin is null")
+//    void upPinyin(String inputCode,String pinyin);
+
+    @Query(value = "SELECT id FROM itsm_uc_hospital WHERE _hos_no =?1 AND delete_flag = 0 ", nativeQuery = true)
+    Long getHosIdByCode(String gender);
+}

src/main/java/com/dashitech/businessdata/dao/IDictionaryDAO.java

@@ -0,0 +1,26 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.DictionaryEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+public interface IDictionaryDAO extends JpaRepository<DictionaryEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    DictionaryEntity save(DictionaryEntity dictionaryEntity);
+
+    @Query(value = "SELECT * FROM itsm_base_dictionary g WHERE g.deleted = FALSE AND g._key =?1",nativeQuery = true)
+    List<DictionaryEntity> selectDictionaryByKey(String key);
+
+    @Query(value = "SELECT id FROM itsm_base_dictionary g WHERE g._key =:_key and g._value =:_value",nativeQuery = true)
+    Long selectDictionaryByKeyValueId(@Param("_key")String _key, @Param("_value")String _value);
+
+    @Query(value = "SELECT _value FROM itsm_base_dictionary g WHERE g._key =:_key and g._desc =:_desc limit 1",nativeQuery = true)
+    String selectDictionaryByKeyDescValue(@Param("_key")String _key, @Param("_desc")String _desc);
+}

src/main/java/com/dashitech/businessdata/dao/IDrugsBagDAO.java

@@ -0,0 +1,18 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.DrugsBagEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+/**
+ * Created by chi on 2019/9/12.
+ */
+public interface IDrugsBagDAO  extends JpaRepository<DrugsBagEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    DrugsBagEntity save(DrugsBagEntity drugsBagEntity);
+
+    @Query(value = "select id from DrugsBagEntity where packid=:packid")
+    Long selectIdByPackid(@Param("packid")String packid);
+}

src/main/java/com/dashitech/businessdata/dao/IDrugsDAO.java

@@ -0,0 +1,15 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.DrugsEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by chi on 2019/9/10.
+ */
+public interface IDrugsDAO extends JpaRepository<DrugsEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    DrugsEntity save(DrugsEntity drugsEntity);
+
+
+}

src/main/java/com/dashitech/businessdata/dao/IHospitalConfigDAO.java

@@ -0,0 +1,19 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.HospitalConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+ * Created by xuweihua on 2021/5/8.
+ */
+public interface IHospitalConfigDAO  extends JpaRepository<HospitalConfig, String> {
+    @SuppressWarnings("unchecked")
+    HospitalConfig save(HospitalConfig hospitalConfig);
+
+    @Query(value = "select * from itsm_system_hospital_config where _active = 1 and _key LIKE CONCAT(?1,'%') and hos_id = ?2",nativeQuery = true)
+    List<HospitalConfig> getHospitalConfigList(String key,String hosid);
+
+}

src/main/java/com/dashitech/businessdata/dao/IInspectDAO.java

@@ -0,0 +1,38 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.InspectEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by chi on 2019/9/12.
+ */
+public interface IInspectDAO  extends JpaRepository<InspectEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    InspectEntity save(InspectEntity inspectEntity);
+
+    @Query(value = "select id from InspectEntity where inspectCode=:inspectCode")
+    Long selectIdByInspectCode(@Param("inspectCode")String inspectCode);
+
+    @Query(value = "select ie from InspectEntity ie where ie.inspectCode=:inspectCode")
+    List<InspectEntity> selectInspectByInspectCode(@Param("inspectCode")String inspectCode);
+
+    @Query(value = "select ie from InspectEntity ie where ie.inspectCode like CONCAT(:inspectCode,'%')")
+    List<InspectEntity> selectInspectByInspectCodeLike(@Param("inspectCode")String inspectCode);
+
+    @Query(value = "select ie from InspectEntity ie where ie.inspectState in (307,443) and ie.patientCode=:patientCode")
+    List<InspectEntity> selectInspectByPatientCode(@Param("patientCode")String patientCode);
+
+    @Modifying
+    @Transactional
+    @Query(value = "UPDATE itsm_transport_inspect set yytime = ?2 WHERE inspect_code = ?1",nativeQuery = true)
+    int upInspectYyTime(String inspectCode,String yytime);
+
+
+}

src/main/java/com/dashitech/businessdata/dao/IJPBagDAO.java

@@ -0,0 +1,18 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.JPBagEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+/**
+ * Created by chi on 2019/9/12.
+ */
+public interface IJPBagDAO extends JpaRepository<JPBagEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    JPBagEntity save(JPBagEntity jpBagEntity);
+
+    @Query(value = "select id from JPBagEntity where packid=:packid")
+    Long selectIdByPackid(@Param("packid")String packid);
+}

src/main/java/com/dashitech/businessdata/dao/IJPDetailsDAO.java

@@ -0,0 +1,12 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.JPDetailsEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by chi on 2019/9/12.
+ */
+public interface IJPDetailsDAO extends JpaRepository<JPDetailsEntity, String> {
+    @SuppressWarnings("unchecked")
+    JPDetailsEntity save(JPDetailsEntity jpDetailsEntity);
+}

src/main/java/com/dashitech/businessdata/dao/IPatientDAO.java

@@ -0,0 +1,33 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.PatientEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by chi on 2019/9/11.
+ */
+public interface IPatientDAO extends JpaRepository<PatientEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    PatientEntity save(PatientEntity patientEntity);
+
+    //@Query(value = "select id from PatientEntity where patientcode =?1 limit 1 ")
+    @Query(value = "select id from itsm_patient where patientcode =?1 limit 1 ",nativeQuery = true)
+    Integer selectIdByCode(String code);
+
+    @Query(value = "select * from itsm_patient where bednum is not null and pinyin is null",nativeQuery = true)
+    List<PatientEntity> selectPatient();
+
+    @Query(value = "select * from itsm_patient where patientcode =?1 limit 1 ",nativeQuery = true)
+    PatientEntity selectPatientByCode(String code);
+
+    @Modifying
+    @Transactional
+    @Query(value = "UPDATE itsm_patient set bednum = null WHERE patientcode <> ?1 and bednum = ?2 and roomnum = ?3 and department = ?4 ",nativeQuery = true)
+    int upPatientBednum(String patientcode,String bednum,String roomnum,Integer department);
+}

src/main/java/com/dashitech/businessdata/dao/IPatientLogDAO.java

@@ -0,0 +1,20 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.PatientLogEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by xuweihua on 2021/1/13.
+ */
+public interface IPatientLogDAO extends JpaRepository<PatientLogEntity, String> {
+    @SuppressWarnings("unchecked")
+    PatientLogEntity save(PatientLogEntity patientLogEntity);
+
+    @Modifying
+    @Transactional
+    @Query(value = "DELETE FROM itsm_patient_log WHERE time < date_add(now(),interval-1 month)",nativeQuery = true)
+    int deletePatientLog();
+}

src/main/java/com/dashitech/businessdata/dao/ISpecimenDAO.java

@@ -0,0 +1,41 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.SpecimenEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by chi on 2019/9/10.
+ */
+public interface ISpecimenDAO extends JpaRepository<SpecimenEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    SpecimenEntity save(SpecimenEntity specimen);
+
+    @Query(value = "select se from SpecimenEntity se where id=:id")
+    SpecimenEntity getById(@Param("id") Long id);
+
+    @Query(value = "select id from SpecimenEntity where scode=:scode")
+    Long selectIdByScode(@Param("scode")String scode);
+
+    @Query(value = "SELECT id FROM itsm_uc_hospital WHERE _hos_no =?1 AND delete_flag = 0 ", nativeQuery = true)
+    Long getHosIdByCode(String gender);
+
+    @Query(value = "select se from SpecimenEntity se where se.orderNumber=:orderNumber")
+    List<SpecimenEntity> selectListByorderNumber(@Param("orderNumber")String orderNumber);
+
+    @Modifying
+    @Transactional
+    @Query(value = "UPDATE itsm_transport_specimen set spe_state = ?1 WHERE patient_no = ?2 and spe_state = 332 and gdid is null",nativeQuery = true)
+    int upSpecimenState(Long state,Integer patientNo);
+
+    @Modifying
+    @Transactional
+    @Query(value = "update itsm_transport_specimen SET spe_state = (SELECT id from itsm_base_dictionary WHERE _key = 'speState' and _value = '110') WHERE spe_state = (SELECT id from itsm_base_dictionary WHERE _key = 'speState' and _value = '1') and print_date <= date_add(now(),interval-1 day)",nativeQuery = true)
+    int upSpecimenState();
+}

src/main/java/com/dashitech/businessdata/dao/ISpecimenHistoryDAO.java

@@ -0,0 +1,22 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.SpecimenEntity;
+import com.dashitech.businessdata.entity.SpecimenHistoryEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by xuweihua on 2020/12/17.
+ */
+public interface ISpecimenHistoryDAO  extends JpaRepository<SpecimenHistoryEntity, String> {
+    @SuppressWarnings("unchecked")
+    SpecimenEntity save(SpecimenEntity specimen);
+
+
+    @Modifying
+    @Transactional
+    @Query(value = "DELETE FROM itsm_specimen_history WHERE creat_time < date_add(now(),interval-1 month)",nativeQuery = true)
+    int deleteSpecimenHistoryLog();
+}

src/main/java/com/dashitech/businessdata/dao/ISystemConfigureDAO.java

@@ -0,0 +1,19 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.SystemConfigureEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+public interface ISystemConfigureDAO extends JpaRepository<SystemConfigureEntity, String> {
+    @SuppressWarnings("unchecked")
+    SystemConfigureEntity save(SystemConfigureEntity systemConfigureEntity);
+
+    @Query(value = "select valueconfig from SystemConfigureEntity where keyconfig=:keyconfig")
+    String selectValueByKey(@Param("keyconfig")String keyconfig);
+
+
+}

src/main/java/com/dashitech/businessdata/dao/IUserDAO.java

@@ -0,0 +1,24 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.UserEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+/**
+ * Created by chi on 2019/9/12.
+ */
+public interface IUserDAO extends JpaRepository<UserEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    UserEntity save(UserEntity userEntity);
+
+    //@Query(value = "select id from UserEntity where ACCOUNT =?1")
+    @Query(value = "select id from itsm_uc_user where ACCOUNT =?1 limit 1",nativeQuery = true)
+    Long selectIdByAccount(String account);
+
+    @Query(value = "SELECT id FROM itsm_base_dictionary WHERE _key='user_gender' and _value =?1", nativeQuery = true)
+    Long getGenderIdById(String gender);
+
+    @Query(value = "select * from itsm_uc_user where ACCOUNT =?1 limit 1",nativeQuery = true)
+    UserEntity selectByAccount(String account);
+}

src/main/java/com/dashitech/businessdata/dao/IWorkOrderDAO.java

@@ -0,0 +1,20 @@
+package com.dashitech.businessdata.dao;
+
+import com.dashitech.businessdata.entity.WorkOrderEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+ * Created by xuweihua on 2020/11/20.
+ */
+public interface IWorkOrderDAO  extends JpaRepository<WorkOrderEntity, String> {
+    @SuppressWarnings("unchecked")
+    WorkOrderEntity save(WorkOrderEntity workOrderEntity);
+
+    @Query(value = "select * from itsm_transport_workorder where patientId =?1 and gdstate in(69,70,71,433) " +
+            "and task_type_id in (SELECT id from itsm_task_type WHERE delete_flag = 0 and association_type_id = " +
+            "(SELECT id from itsm_base_dictionary WHERE _key = 'association_types' and _value = 'inspect' LIMIT 1))",nativeQuery = true)
+    List<WorkOrderEntity> selectWorkOrderByPatientId(String patientId);
+}

src/main/java/com/dashitech/businessdata/dao/TestDao.java

@@ -0,0 +1,41 @@
+package com.dashitech.businessdata.dao;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Created by chi on 2019/9/26.
+ */
+@Service
+public class TestDao {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+    /*     
+     *不指定数据源使用默认数据源
+     *
+    *@return
+     */
+
+//    public List<CallOnEntity> getList1() {
+//
+//        String sql = "select * from itsm_transport_callon";
+//        List<Map<String, Object>> callOnEntities = jdbcTemplate.queryForList(sql);
+//
+//        return null;
+//    }
+//
+//    public List<CallOnEntity> getList2() {
+//
+//        String sql = "select * from itsm_transport_callon";
+//        List<Map<String, Object>> callOnEntities = jdbcTemplate.queryForList(sql);
+//
+//        return null;
+//    }
+
+}

src/main/java/com/dashitech/businessdata/entity/CallLogEntity.java

@@ -0,0 +1,165 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+
+@Entity
+@Table(name = "itsm_call_log")
+public class CallLogEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("version")
+    @Column(name = "verion")
+    private Integer version;
+
+    @I18n("来电科室")
+    @Column(name = "call_dept")
+    private String callDept;
+
+    @I18n("通道号")
+    @Column(name = "phyIDA")
+    private String phyIDA;
+
+    @I18n("主叫号码")
+    @Column(name = "DTMFA")
+    private String dTMFA;
+
+    @I18n("被叫号码")
+    @Column(name = "DTMFB")
+    private String dTMFB;
+
+    @I18n("录音起始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "response_time")
+    private Date responseTime;
+
+    @I18n("录音时长单位秒")
+    @Column(name = "long_time")
+    private String longTime;
+
+    @I18n("原文件存放位置")
+    @Column(name = "_path")
+    private String path;
+
+    @I18n("呼入呼出 1 呼入 0 呼出")
+    @Column(name = "call_type")
+    private Integer callType;
+
+    @I18n("已接未接 1 已接 0 未接")
+    @Column(name = "call_state")
+    private Integer callState;
+
+    @I18n("院区id")
+    @Column(name = "hos_id")
+    private Integer hosId;
+
+    public Integer getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(Integer hosId) {
+        this.hosId = hosId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCallDept() {
+        return callDept;
+    }
+
+    public void setCallDept(String callDept) {
+        this.callDept = callDept;
+    }
+
+    public String getPhyIDA() {
+        return phyIDA;
+    }
+
+    public void setPhyIDA(String phyIDA) {
+        this.phyIDA = phyIDA;
+    }
+
+    public String getdTMFA() {
+        return dTMFA;
+    }
+
+    public void setdTMFA(String dTMFA) {
+        this.dTMFA = dTMFA;
+    }
+
+    public String getdTMFB() {
+        return dTMFB;
+    }
+
+    public void setdTMFB(String dTMFB) {
+        this.dTMFB = dTMFB;
+    }
+
+    public Date getResponseTime() {
+        return responseTime;
+    }
+
+    public void setResponseTime(Date responseTime) {
+        this.responseTime = responseTime;
+    }
+
+    public String getLongTime() {
+        return longTime;
+    }
+
+    public void setLongTime(String longTime) {
+        this.longTime = longTime;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public Integer getCallType() {
+        return callType;
+    }
+
+    public void setCallType(Integer callType) {
+        this.callType = callType;
+    }
+
+    public Integer getCallState() {
+        return callState;
+    }
+
+    public void setCallState(Integer callState) {
+        this.callState = callState;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+}

src/main/java/com/dashitech/businessdata/entity/DepartmentEntity.java

@@ -0,0 +1,167 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ *  hospital 主表为id，这里为编码
+ */
+
+@Entity
+@Table(name = "itsm_uc_dept")
+public class DepartmentEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name="id",length = 20)
+	private Long id;
+
+	@I18n("科室名")
+	@Column(name="dept")
+	private String dept;
+
+	@I18n("科室编码")
+	@Column(name="code")
+	private String pcode;
+
+
+	@I18n("删除标识")
+	@Column(name = "delete_flag")
+	private Integer deleteFlag;
+
+	@I18n("科室别名")
+	@Column(name = "dept_alias")
+	private String deptalias;
+
+
+	@I18n("科室类型，检查科室1、检验科室2、临床科室3、其他科室4")
+	@Column(name = "_type")
+	private String type;
+
+	@I18n("科室位置")
+	@Column(name = "_address")
+	private String address;
+
+	@I18n("所属院区")
+	@Column(name = "_hospital_id")
+	private Long hospital;
+
+	@I18n("电话号码")
+	@Column(name = "_phone")
+	private String phone;
+
+	@I18n("开头字母拼音")
+	@Column(name = "input_code")
+	private String inputCode;
+
+	@I18n("全拼")
+	@Column(name = "pinyin")
+	private String pinyin;
+
+	public String getInputCode() {
+		return inputCode;
+	}
+
+	public void setInputCode(String inputCode) {
+		this.inputCode = inputCode;
+	}
+
+	public String getPinyin() {
+		return pinyin;
+	}
+
+	public void setPinyin(String pinyin) {
+		this.pinyin = pinyin;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getDept() {
+		return dept;
+	}
+
+	public void setDept(String dept) {
+		this.dept = dept;
+	}
+
+	public String getPcode() {
+		return pcode;
+	}
+
+	public void setPcode(String pcode) {
+		this.pcode = pcode;
+	}
+
+	public Integer getDeleteFlag() {
+		return deleteFlag;
+	}
+
+	public void setDeleteFlag(Integer deleteFlag) {
+		this.deleteFlag = deleteFlag;
+	}
+
+	public String getDeptalias() {
+		return deptalias;
+	}
+
+	public void setDeptalias(String deptalias) {
+		this.deptalias = deptalias;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public Long getHospital() {
+		return hospital;
+	}
+
+	public void setHospital(Long hospital) {
+		this.hospital = hospital;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	@Override
+	public String toString() {
+		return "DepartmentEntity{" +
+				"id=" + id +
+				", dept='" + dept + '\'' +
+				", pcode='" + pcode + '\'' +
+				", deleteFlag=" + deleteFlag +
+				", deptalias='" + deptalias + '\'' +
+				", type='" + type + '\'' +
+				", address='" + address + '\'' +
+				", hospital=" + hospital +
+				", phone='" + phone + '\'' +
+				'}';
+	}
+}

src/main/java/com/dashitech/businessdata/entity/DictionaryEntity.java

@@ -0,0 +1,225 @@
+package com.dashitech.businessdata.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+
+@Entity
+@Table(name = "itsm_base_dictionary")
+public class DictionaryEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    /**
+     * 所属模块
+     */
+    @Column(name="model")
+    private String model;
+
+    /**
+     * key
+     */
+    @Column(name="_key")
+    private String key;
+
+    /**
+     * 显示名称
+     */
+    @Column(name="_name")
+    private String name;
+
+    /**
+     * 值
+     */
+    @Column(name="_value")
+    private String value;
+
+    /**
+     * 描述
+     */
+    @Column(name="_desc")
+    private String desc;
+
+    /**
+     * 排序
+     */
+    @Column(name="orders")
+    private Integer orders;
+
+    /**
+     * 是否已删除，1删除，0正常
+     */
+    @Column(name = "deleted",columnDefinition = "BIT")
+    private Boolean deleted = false;
+
+    /**
+     * 是不是系统字段
+     */
+    @Column(name="system",columnDefinition = "BIT")
+    private Boolean system = false;
+
+    /**
+     * 添加时间
+     */
+    @Column(name="add_time")
+    private Date addTime = new Date();
+
+    /**
+     * 修改时间
+     */
+    @Column(name="up_time")
+    private Date upTime;
+
+    /**
+     * 修改人
+     */
+    @Column(name="operator")
+    private String operator;
+
+    /**
+     * 拼音简写
+     */
+    @Column(name="input_code")
+    private String inputcode;
+
+    /**
+     * 扩展字段1
+     */
+    @Column(name = "extra1")
+    private String extra1;
+
+    /**
+     * 扩展字段2
+     */
+    @Column(name = "extra2")
+    private String extra2;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public Integer getOrders() {
+        return orders;
+    }
+
+    public void setOrders(Integer orders) {
+        this.orders = orders;
+    }
+
+    public Boolean getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public Boolean getSystem() {
+        return system;
+    }
+
+    public void setSystem(Boolean system) {
+        this.system = system;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public Date getUpTime() {
+        return upTime;
+    }
+
+    public void setUpTime(Date upTime) {
+        this.upTime = upTime;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getInputcode() {
+        return inputcode;
+    }
+
+    public void setInputcode(String inputcode) {
+        this.inputcode = inputcode;
+    }
+
+    public String getExtra1() {
+        return extra1;
+    }
+
+    public void setExtra1(String extra1) {
+        this.extra1 = extra1;
+    }
+
+    public String getExtra2() {
+        return extra2;
+    }
+
+    public void setExtra2(String extra2) {
+        this.extra2 = extra2;
+    }
+}

src/main/java/com/dashitech/businessdata/entity/DrugsBagEntity.java

@@ -0,0 +1,145 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by chi on 2019/9/12.
+ * 药品大包表
+ *
+ * launch、target 这里为编码 主表为id
+ */
+@Entity
+@Table(name = "itsm_transport_drugs_bag")
+public class DrugsBagEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("来源科室（发药科室），这里为编码 主表为id")
+    @Column(name="launch")
+    private String launch;
+
+    @I18n("目标科室（申请科室），这里为编码 主表为id")
+    @Column(name="target")
+    private String target;
+
+    @I18n("药品包号")
+    @Column(name = "packid")
+    private String packid;
+
+    @I18n("药品状态")
+    @Column(name = "drugs_state")
+    private Long drugsState;
+
+    @I18n("打包时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "pack_time")
+    private Date packTime;
+
+    @I18n("批次创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "creat_time")
+    private Date creatTime;
+
+    @I18n("批次号")
+    @Column(name = "batch_No")
+    private String batchNo;
+
+    @I18n("院区编码")
+    @Column(name = "hos_id")
+    private String hosId;
+
+    public String getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(String hosId) {
+        this.hosId = hosId;
+    }
+
+    public String getLaunch() {
+        return launch;
+    }
+
+    public void setLaunch(String launch) {
+        this.launch = launch;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public String getPackid() {
+        return packid;
+    }
+
+    public void setPackid(String packid) {
+        this.packid = packid;
+    }
+
+    public Long getDrugsState() {
+        return drugsState;
+    }
+
+    public void setDrugsState(Long drugsState) {
+        this.drugsState = drugsState;
+    }
+
+    public Date getPackTime() {
+        return packTime;
+    }
+
+    public void setPackTime(Date packTime) {
+        this.packTime = packTime;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    @Override
+    public String toString() {
+        return "DrugsBagEntity{" +
+                "id=" + id +
+                ", launch='" + launch + '\'' +
+                ", target='" + target + '\'' +
+                ", packid='" + packid + '\'' +
+                ", drugsState=" + drugsState +
+                ", packTime=" + packTime +
+                ", creatTime=" + creatTime +
+                ", batchNo='" + batchNo + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/DrugsEntity.java

@@ -0,0 +1,137 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * Created by chi on 2019/9/10.
+ */
+@Entity
+@Table(name = "itsm_transport_drugs")
+public class DrugsEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Integer id;
+
+    @I18n("病人唯一标识")
+    @Column(name = "patient_no")
+    private String patientNo;
+
+    @I18n("病人信息")
+    @Column(name = "patient_info")
+    private String patientInfo;
+
+    @I18n("药品具体信息")
+    @Column(name = "drugs_info")
+    private String drugsInfo;
+
+    @I18n("药品计量")
+    @Column(name = "drugs_num")
+    private Integer drugsNum;
+
+    @I18n("打包号批次号")
+    @Column(name = "bag_id")
+    private Long bagId;
+
+    @I18n("床号")
+    @Column(name = "bed_num")
+    private String bedNum;
+
+    @I18n("院区编码")
+    @Column(name = "hos_id")
+    private String hosId;
+
+    @I18n("药品类型")
+    @Column(name = "drug_type")
+    private String drugType;
+
+    public String getDrugType() {
+        return drugType;
+    }
+
+    public void setDrugType(String drugType) {
+        this.drugType = drugType;
+    }
+
+    public String getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(String hosId) {
+        this.hosId = hosId;
+    }
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPatientNo() {
+        return patientNo;
+    }
+
+    public void setPatientNo(String patientNo) {
+        this.patientNo = patientNo;
+    }
+
+    public String getPatientInfo() {
+        return patientInfo;
+    }
+
+    public void setPatientInfo(String patientInfo) {
+        this.patientInfo = patientInfo;
+    }
+
+    public String getDrugsInfo() {
+        return drugsInfo;
+    }
+
+    public void setDrugsInfo(String drugsInfo) {
+        this.drugsInfo = drugsInfo;
+    }
+
+    public Integer getDrugsNum() {
+        return drugsNum;
+    }
+
+    public void setDrugsNum(Integer drugsNum) {
+        this.drugsNum = drugsNum;
+    }
+
+    public Long getBagId() {
+        return bagId;
+    }
+
+    public void setBagId(Long bagId) {
+        this.bagId = bagId;
+    }
+
+    public String getBedNum() {
+        return bedNum;
+    }
+
+    public void setBedNum(String bedNum) {
+        this.bedNum = bedNum;
+    }
+
+    @Override
+    public String toString() {
+        return "DrugsEntity{" +
+                "id=" + id +
+                ", patientNo='" + patientNo + '\'' +
+                ", patientInfo='" + patientInfo + '\'' +
+                ", drugsInfo='" + drugsInfo + '\'' +
+                ", drugsNum=" + drugsNum +
+                ", bagId=" + bagId +
+                ", bedNum='" + bedNum + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/HospitalConfig.java

@@ -0,0 +1,68 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * Created by xuweihua on 2021/5/8.
+ */
+@Entity
+@Table(name = "itsm_system_hospital_config")
+public class HospitalConfig  implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Integer id;
+
+    @Column(name = "_key")
+    private String key;
+    @Column(name = "_value")
+    private String value;
+    @Column(name = "_value2")
+    private String value2;
+    @Column(name = "hos_id")
+    private Long hosId;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getValue2() {
+        return value2;
+    }
+
+    public void setValue2(String value2) {
+        this.value2 = value2;
+    }
+
+    public Long getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(Long hosId) {
+        this.hosId = hosId;
+    }
+}

src/main/java/com/dashitech/businessdata/entity/InspectEntity.java

@@ -0,0 +1,270 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by chi on 2019/9/12.
+ * 送检信息，病人检查
+ * execDept、applyDept 主表为id，这里是编码
+ */
+@Entity
+@Table(name = "itsm_transport_inspect")
+public class InspectEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("病人标识")
+    @Column(name = "patient_code")
+    private String patientCode;
+
+    @I18n("病人姓名")
+    @Column(name = "patient_name")
+    private String patientName;
+
+    @I18n("腕带条码")
+    @Column(name = "patient_bar_code")
+    private String barCode;
+
+    @I18n("状态")//待检查  待到达 待送达 检查中 已完成,申请
+    @Column(name="inspect_state")
+    private Integer inspectState;
+
+    @I18n("自定义检查状态")
+    @Column(name = "inspect_check_type")
+    private Integer inspectCheckType;
+
+    @I18n("申请检查单标识")
+    @Column(name = "inspect_code")
+    private String inspectCode;
+
+    @I18n("检查标识类型")
+    @Column(name = "inspect_type_code")
+    private String inspectTypeCode;
+
+    @I18n("检查类型名称")
+    @Column(name = "inspect_type_name")
+    private String inspectName;
+
+    @I18n("申请科室,主表为id这里为编码")
+    @Column(name="apply_dept")
+    private String applyDept;
+
+    @I18n("检查部位名称")
+    @Column(name = "inspect_bwname")
+    private String bwName;
+
+    @I18n("执行科室,主表为id这里为编码")
+    @Column(name="exec_Dept")
+    private String execDept;
+
+    @I18n("预约时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "yytime")
+    private Date yyTime;
+
+    @I18n("床号")
+    @Column(name = "bed_num")
+    private String bedNum;
+
+    @I18n("检查时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "inspect_time")
+    private Date inspectTime;
+
+    @I18n("检查人")
+    @Column(name = "inspector")
+    private String inspector;
+
+    @I18n("预约号码")
+    @Column(name = "reservation_number")
+    private String reservationNumber;
+
+    @I18n("优先级")
+    @Column(name = "priority")
+    private String priority;
+
+    @I18n("院区id")
+    @Column(name = "hos_id")
+    private Long hosId;
+
+    public Integer getInspectCheckType() {
+        return inspectCheckType;
+    }
+
+    public void setInspectCheckType(Integer inspectCheckType) {
+        this.inspectCheckType = inspectCheckType;
+    }
+
+    public Long getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(Long hosId) {
+        this.hosId = hosId;
+    }
+
+    public String getPriority() {
+        return priority;
+    }
+
+    public void setPriority(String priority) {
+        this.priority = priority;
+    }
+
+    public String getReservationNumber() {
+        return reservationNumber;
+    }
+
+    public void setReservationNumber(String reservationNumber) {
+        this.reservationNumber = reservationNumber;
+    }
+
+    public String getInspectName() {
+        return inspectName;
+    }
+
+    public void setInspectName(String inspectName) {
+        this.inspectName = inspectName;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPatientCode() {
+        return patientCode;
+    }
+
+    public void setPatientCode(String patientCode) {
+        this.patientCode = patientCode;
+    }
+
+    public String getPatientName() {
+        return patientName;
+    }
+
+    public void setPatientName(String patientName) {
+        this.patientName = patientName;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public Integer getInspectState() {
+        return inspectState;
+    }
+
+    public void setInspectState(Integer inspectState) {
+        this.inspectState = inspectState;
+    }
+
+    public String getInspectCode() {
+        return inspectCode;
+    }
+
+    public void setInspectCode(String inspectCode) {
+        this.inspectCode = inspectCode;
+    }
+
+    public String getInspectTypeCode() {
+        return inspectTypeCode;
+    }
+
+    public void setInspectTypeCode(String inspectTypeCode) {
+        this.inspectTypeCode = inspectTypeCode;
+    }
+
+    public String getBwName() {
+        return bwName;
+    }
+
+    public void setBwName(String bwName) {
+        this.bwName = bwName;
+    }
+
+    public Date getYyTime() {
+        return yyTime;
+    }
+
+    public void setYyTime(Date yyTime) {
+        this.yyTime = yyTime;
+    }
+
+    public String getBedNum() {
+        return bedNum;
+    }
+
+    public void setBedNum(String bedNum) {
+        this.bedNum = bedNum;
+    }
+
+    public Date getInspectTime() {
+        return inspectTime;
+    }
+
+    public void setInspectTime(Date inspectTime) {
+        this.inspectTime = inspectTime;
+    }
+
+    public String getInspector() {
+        return inspector;
+    }
+
+    public void setInspector(String inspector) {
+        this.inspector = inspector;
+    }
+
+    public String getApplyDept() {
+        return applyDept;
+    }
+
+    public void setApplyDept(String applyDept) {
+        this.applyDept = applyDept;
+    }
+
+    public String getExecDept() {
+        return execDept;
+    }
+
+    public void setExecDept(String execDept) {
+        this.execDept = execDept;
+    }
+
+    @Override
+    public String toString() {
+        return "InspectEntity{" +
+                "id=" + id +
+                ", patientCode='" + patientCode + '\'' +
+                ", patientName='" + patientName + '\'' +
+                ", barCode='" + barCode + '\'' +
+                ", inspectState=" + inspectState +
+                ", inspectCode='" + inspectCode + '\'' +
+                ", inspectTypeCode='" + inspectTypeCode + '\'' +
+                ", applyDept='" + applyDept + '\'' +
+                ", bwName='" + bwName + '\'' +
+                ", execDept='" + execDept + '\'' +
+                ", yyTime=" + yyTime +
+                ", bedNum='" + bedNum + '\'' +
+                ", inspectTime=" + inspectTime +
+                ", inspector='" + inspector + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/JPBagEntity.java

@@ -0,0 +1,120 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by chi on 2019/9/12.
+ * 静配大包表
+ * target、launch 这里为编码 主表为id
+ */
+@Entity
+@Table(name = "itsm_jp_bag")
+public class JPBagEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("大包id")
+    @Column(name = "packid")
+    private String packid;
+
+    @I18n("目标科室编码，这里为编码 主表为id（发起申请的临床科室编码）")
+    @Column(name = "target")
+    private String target;
+
+    @I18n("来源科室编码，这里为编码 主表为id（发药科室编码）")
+    @Column(name = "launch")
+    private String launch;
+
+    @I18n("大包创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "creat_time")
+    private Date creatTime;
+
+    @I18n("药品状态")
+    @Column(name = "jp_state")
+    private Integer jpState;
+
+    @I18n("院区编码")
+    @Column(name = "hos_id")
+    private String hosID;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPackid() {
+        return packid;
+    }
+
+    public void setPackid(String packid) {
+        this.packid = packid;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public String getLaunch() {
+        return launch;
+    }
+
+    public void setLaunch(String launch) {
+        this.launch = launch;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public Integer getJpState() {
+        return jpState;
+    }
+
+    public void setJpState(Integer jpState) {
+        this.jpState = jpState;
+    }
+
+    public String getHosID() {
+        return hosID;
+    }
+
+    public void setHosID(String hosID) {
+        this.hosID = hosID;
+    }
+
+    @Override
+    public String toString() {
+        return "JPBagEntity{" +
+                "id=" + id +
+                ", packid='" + packid + '\'' +
+                ", target='" + target + '\'' +
+                ", launch='" + launch + '\'' +
+                ", creatTime=" + creatTime +
+                ", jpState=" + jpState +
+                ", hosID='" + hosID + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/JPDetailsEntity.java

@@ -0,0 +1,114 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * Created by chi on 2019/9/12.
+ * 静配详情
+ */
+@Entity
+@Table(name = "itsm_jp_details")
+public class JPDetailsEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Integer id;
+
+    @I18n("病人唯一标识")
+    @Column(name = "patient_no")
+    private String patientNo;
+
+    @I18n("病人信息")
+    @Column(name = "patient_info")
+    private String patientInfo;
+
+    @I18n("药品具体信息")
+    @Column(name = "jp_info")
+    private String jpInfo;
+
+    @I18n("药品计量")
+    @Column(name = "jp_num")
+    private Integer jpNum;
+
+    @I18n("关联大包，批次号")
+    @Column(name = "bag_id")
+    private Long bagId;
+
+    @I18n("床号")
+    @Column(name = "bed_num")
+    private String bedNum;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPatientNo() {
+        return patientNo;
+    }
+
+    public void setPatientNo(String patientNo) {
+        this.patientNo = patientNo;
+    }
+
+    public String getPatientInfo() {
+        return patientInfo;
+    }
+
+    public void setPatientInfo(String patientInfo) {
+        this.patientInfo = patientInfo;
+    }
+
+    public String getJpInfo() {
+        return jpInfo;
+    }
+
+    public void setJpInfo(String jpInfo) {
+        this.jpInfo = jpInfo;
+    }
+
+    public Integer getJpNum() {
+        return jpNum;
+    }
+
+    public void setJpNum(Integer jpNum) {
+        this.jpNum = jpNum;
+    }
+
+    public Long getBagId() {
+        return bagId;
+    }
+
+    public void setBagId(Long bagId) {
+        this.bagId = bagId;
+    }
+
+    public String getBedNum() {
+        return bedNum;
+    }
+
+    public void setBedNum(String bedNum) {
+        this.bedNum = bedNum;
+    }
+
+    @Override
+    public String toString() {
+        return "JPDetailsEntity{" +
+                "id=" + id +
+                ", patientNo='" + patientNo + '\'' +
+                ", patientInfo='" + patientInfo + '\'' +
+                ", jpInfo='" + jpInfo + '\'' +
+                ", jpNum=" + jpNum +
+                ", bagId=" + bagId +
+                ", bedNum='" + bedNum + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/PatientEntity.java

@@ -0,0 +1,236 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by chi on 2019/9/11.
+ *
+ * department主表为id 这里为编码
+ */
+@Entity
+@Table(name = "itsm_patient")
+public class PatientEntity  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Integer id;
+
+    @I18n("病人标识")
+    @Column(name = "patientcode")
+    private String patientcode;
+
+    @I18n("病人姓名")
+    @Column(name = "patientname")
+    private String patientname;
+
+    @I18n("住院科室id，主表为id这里为编码")
+    @Column(name = "department")
+    private Integer department;
+
+    @I18n("住院号")
+    @Column(name = "residence_no")
+    private String residenceNo;
+
+    @I18n("腕带条码")
+    @Column(name = "Bar_code")
+    private String barCode;
+
+    @I18n("房间号")
+    @Column(name = "roomnum")
+    private String roomnum;
+
+    @I18n("床号")
+    @Column(name = "bednum" )
+    private String bednum;
+
+    @I18n("年龄")
+    @Column(name = "age" )
+    private String age;
+
+    @Column(name = "VERSION" )
+    private Integer version;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "hospitalized_time" )
+    private Date hospitalizedTime;
+
+    @I18n("拼音")
+    @Column(name = "pinyin" )
+    private String pinyin;
+    @I18n("拼音简写")
+    @Column(name = "input_code" )
+    private String inputCode;
+
+    @I18n("是否重点关注,1为重点关注 0为不需重点关注")
+    @Column(name = "focus_patient")
+    private Integer focusPatient;
+
+    @I18n("院区id")
+    @Column(name = "hos_id")
+    private Long hosId;
+
+    @I18n("护理等级(字典表id)")
+    @Column(name = "level_of_care_id")
+    private Long levelOfCare;
+
+    @I18n("病情代理(字典表id)")
+    @Column(name = "state_of_an_illness_id")
+    private Long stateOfAnIllness;
+
+    public Long getStateOfAnIllness() {
+        return stateOfAnIllness;
+    }
+
+    public void setStateOfAnIllness(Long stateOfAnIllness) {
+        this.stateOfAnIllness = stateOfAnIllness;
+    }
+
+    public Long getLevelOfCare() {
+        return levelOfCare;
+    }
+
+    public void setLevelOfCare(Long levelOfCare) {
+        this.levelOfCare = levelOfCare;
+    }
+
+    public Long getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(Long hosId) {
+        this.hosId = hosId;
+    }
+
+    public Integer getFocusPatient() {
+        return focusPatient;
+    }
+
+    public void setFocusPatient(Integer focusPatient) {
+        this.focusPatient = focusPatient;
+    }
+
+    public String getPinyin() {
+        return pinyin;
+    }
+
+    public void setPinyin(String pinyin) {
+        this.pinyin = pinyin;
+    }
+
+    public String getInputCode() {
+        return inputCode;
+    }
+
+    public void setInputCode(String inputCode) {
+        this.inputCode = inputCode;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public Date getHospitalizedTime() {
+        return hospitalizedTime;
+    }
+
+    public void setHospitalizedTime(Date hospitalizedTime) {
+        this.hospitalizedTime = hospitalizedTime;
+    }
+
+    public String getPatientcode() {
+        return patientcode;
+    }
+
+    public void setPatientcode(String patientcode) {
+        this.patientcode = patientcode;
+    }
+
+    public String getPatientname() {
+        return patientname;
+    }
+
+    public void setPatientname(String patientname) {
+        this.patientname = patientname;
+    }
+
+    public Integer getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(Integer department) {
+        this.department = department;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getRoomnum() {
+        return roomnum;
+    }
+
+    public void setRoomnum(String roomnum) {
+        this.roomnum = roomnum;
+    }
+
+    public String getBednum() {
+        return bednum;
+    }
+
+    public void setBednum(String bednum) {
+        this.bednum = bednum;
+    }
+
+    public String getResidenceNo() {
+        return residenceNo;
+    }
+
+    public void setResidenceNo(String residenceNo) {
+        this.residenceNo = residenceNo;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    @Override
+    public String toString() {
+        return "PatientEntity{" +
+                "id=" + id +
+                ", patientcode='" + patientcode + '\'' +
+                ", patientname='" + patientname + '\'' +
+                ", department='" + department + '\'' +
+                ", residenceNo='" + residenceNo + '\'' +
+                ", barCode='" + barCode + '\'' +
+                ", roomnum='" + roomnum + '\'' +
+                ", bednum='" + bednum + '\'' +
+                ", age='" + age + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/PatientLogEntity.java

@@ -0,0 +1,125 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by xuweihua on 2021/1/12.
+ */
+@Entity
+@Table(name = "itsm_patient_log")
+public class PatientLogEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("类型")
+    @Column(name = "type")
+    private Long type;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "time" )
+    private Date time;
+
+    @I18n("申请科室")
+    @Column(name = "sq_dept")
+    private Long sqDept;
+
+    @I18n("转入科室")
+    @Column(name = "zr_dept")
+    private Long zrDept;
+
+    @I18n("病人id")
+    @Column(name = "patient_id")
+    private Long patientId;
+
+    @I18n("前床号")
+    @Column(name = "qbednum")
+    private String qbednum;
+
+    @I18n("床号")
+    @Column(name = "bednum")
+    private String bednum;
+
+    @I18n("院区id")
+    @Column(name = "hos_id")
+    private Long hosId;
+
+    public Long getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(Long hosId) {
+        this.hosId = hosId;
+    }
+
+    public String getQbednum() {
+        return qbednum;
+    }
+
+    public void setQbednum(String qbednum) {
+        this.qbednum = qbednum;
+    }
+
+    public String getBednum() {
+        return bednum;
+    }
+
+    public void setBednum(String bednum) {
+        this.bednum = bednum;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getType() {
+        return type;
+    }
+
+    public void setType(Long type) {
+        this.type = type;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public Long getSqDept() {
+        return sqDept;
+    }
+
+    public void setSqDept(Long sqDept) {
+        this.sqDept = sqDept;
+    }
+
+    public Long getZrDept() {
+        return zrDept;
+    }
+
+    public void setZrDept(Long zrDept) {
+        this.zrDept = zrDept;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+}

src/main/java/com/dashitech/businessdata/entity/SpecimenEntity.java

@@ -0,0 +1,291 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by chi on 2019/9/10.
+ *标本
+ * doctor、putNurse、collectNurse、inspector、patientNo、sickRoom、checkDept，主表为id 这里为编码
+ */
+@Entity
+@Table(name = "itsm_transport_specimen")
+public class SpecimenEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("标本采集时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "print_date")
+    private Date printDate;
+
+    @I18n("医生申请时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "doctor_apply_time")
+    private Date doctorApplyTime;
+
+    @I18n("护士贴标时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "nurse_put_time")
+    private Date nursePutTime;
+
+
+    @I18n("采集护士，主表为id 这里为编码")
+    @Column(name="collect_nurse_id")
+    private String collectNurse;
+
+    @I18n("检验人员，主表为id 这里为编码")
+    @Column(name="inspector")
+    private String inspector;
+
+    @I18n("检验时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "inspection_time")
+    private Date inspectionTime;
+
+    @I18n("标本状态： 0新标本，1已取标本  2已送达标本")
+    @Column(name="spe_state")
+    private Integer speState;
+
+    @I18n("标本类型")
+    @Column(name="stype")
+    private String stype;
+
+    @I18n("标本条码")
+    @Column(name = "scode")
+    private String scode;
+
+    @I18n("病人唯一标识，主表为id 这里为编码")
+    @Column(name = "patient_no")
+    private String patientNo;
+
+    @I18n("病人姓名")
+    @Column(name = "patientname")
+    private String patientName;
+
+    @I18n("住院科室(起点科室)，主表为id 这里为编码")
+    @Column(name="sick_room")
+    private String sickRoom;
+
+    @I18n("检验科室(目标科室)，主表为id 这里为编码")
+    @Column(name="check_dept")
+    private String checkDept;
+
+    @I18n("房间号")
+    @Column(name = "roomnum")
+    private String roomNum;
+
+    @I18n("床号")
+    @Column(name = "bednum")
+    private String bedNum;
+
+    @I18n("是否紧急，0一般，1加急")
+    @Column(name = "urgent")
+    private Integer  urgent;
+
+    @I18n("院区编码")
+    @Column(name = "hos_id")
+    private String hosID;
+
+    @I18n("检验的单号")
+    @Column(name = "order_number")
+    private String orderNumber;
+
+    @I18n("系统送达时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "sys_arrive_time")
+    private Date sysArriveTime;
+
+    public Date getSysArriveTime() {
+        return sysArriveTime;
+    }
+
+    public void setSysArriveTime(Date sysArriveTime) {
+        this.sysArriveTime = sysArriveTime;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getPrintDate() {
+        return printDate;
+    }
+
+    public void setPrintDate(Date printDate) {
+        this.printDate = printDate;
+    }
+
+    public Date getDoctorApplyTime() {
+        return doctorApplyTime;
+    }
+
+    public void setDoctorApplyTime(Date doctorApplyTime) {
+        this.doctorApplyTime = doctorApplyTime;
+    }
+
+    public Date getNursePutTime() {
+        return nursePutTime;
+    }
+
+    public void setNursePutTime(Date nursePutTime) {
+        this.nursePutTime = nursePutTime;
+    }
+
+    public String getCollectNurse() {
+        return collectNurse;
+    }
+
+    public void setCollectNurse(String collectNurse) {
+        this.collectNurse = collectNurse;
+    }
+
+    public void setSickRoom(String sickRoom) {
+        this.sickRoom = sickRoom;
+    }
+
+    public void setCheckDept(String checkDept) {
+        this.checkDept = checkDept;
+    }
+
+    public String getInspector() {
+        return inspector;
+    }
+
+    public void setInspector(String inspector) {
+        this.inspector = inspector;
+    }
+
+    public Date getInspectionTime() {
+        return inspectionTime;
+    }
+
+    public void setInspectionTime(Date inspectionTime) {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Integer getSpeState() {
+        return speState;
+    }
+
+    public void setSpeState(Integer speState) {
+        this.speState = speState;
+    }
+
+    public String getStype() {
+        return stype;
+    }
+
+    public void setStype(String stype) {
+        this.stype = stype;
+    }
+
+    public String getScode() {
+        return scode;
+    }
+
+    public void setScode(String scode) {
+        this.scode = scode;
+    }
+
+    public String getPatientNo() {
+        return patientNo;
+    }
+
+    public void setPatientNo(String patientNo) {
+        this.patientNo = patientNo;
+    }
+
+    public String getPatientName() {
+        return patientName;
+    }
+
+    public void setPatientName(String patientName) {
+        this.patientName = patientName;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getBedNum() {
+        return bedNum;
+    }
+
+    public void setBedNum(String bedNum) {
+        this.bedNum = bedNum;
+    }
+
+    public Integer getUrgent() {
+        return urgent;
+    }
+
+    public void setUrgent(Integer urgent) {
+        this.urgent = urgent;
+    }
+
+    public String getSickRoom() {
+        return sickRoom;
+    }
+
+    public String getCheckDept() {
+        return checkDept;
+    }
+
+    public String getHosID() {
+        return hosID;
+    }
+
+    public void setHosID(String hosID) {
+        this.hosID = hosID;
+    }
+
+    @Override
+    public String toString() {
+        return "SpecimenEntity{" +
+                "id=" + id +
+                ", printDate=" + printDate +
+                ", doctorApplyTime=" + doctorApplyTime +
+                ", nursePutTime=" + nursePutTime +
+                ", collectNurse='" + collectNurse + '\'' +
+                ", inspector='" + inspector + '\'' +
+                ", inspectionTime=" + inspectionTime +
+                ", speState=" + speState +
+                ", stype='" + stype + '\'' +
+                ", scode='" + scode + '\'' +
+                ", patientNo='" + patientNo + '\'' +
+                ", patientName='" + patientName + '\'' +
+                ", sickRoom='" + sickRoom + '\'' +
+                ", checkDept='" + checkDept + '\'' +
+                ", roomNum='" + roomNum + '\'' +
+                ", bedNum='" + bedNum + '\'' +
+                ", urgent=" + urgent +
+                ", hosID='" + hosID + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/SpecimenHistoryEntity.java

@@ -0,0 +1,91 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Dictionary;
+
+/**
+ * Created by xuweihua on 2020/12/17.
+ * 标本历史
+ */
+@Entity
+@Table(name = "itsm_specimen_history")
+public class SpecimenHistoryEntity implements Serializable {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("创建")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "creat_time")
+    private Date creatTime;
+
+    @I18n("操作类型")
+    @Column(name="operation_type")
+    private Long operationType;
+
+    @I18n("操作人")
+    @Column(name = "operation_user_name")
+    private String operationUserName;
+
+    @I18n("操作人id")
+    @Column(name = "operation_user_id")
+    private Long operationUserId;
+
+    @I18n("标本编码")
+    @Column(name = "scode")
+    private String scode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public Long getOperationType() {
+        return operationType;
+    }
+
+    public void setOperationType(Long operationType) {
+        this.operationType = operationType;
+    }
+
+    public String getOperationUserName() {
+        return operationUserName;
+    }
+
+    public void setOperationUserName(String operationUserName) {
+        this.operationUserName = operationUserName;
+    }
+
+    public Long getOperationUserId() {
+        return operationUserId;
+    }
+
+    public void setOperationUserId(Long operationUserId) {
+        this.operationUserId = operationUserId;
+    }
+
+    public String getScode() {
+        return scode;
+    }
+
+    public void setScode(String scode) {
+        this.scode = scode;
+    }
+}

src/main/java/com/dashitech/businessdata/entity/SystemConfigureEntity.java

@@ -0,0 +1,76 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+@Entity
+@Table(name = "itsm_system_configurations")
+public class SystemConfigureEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("字段名")
+    @Column(name="keyconfig")
+    private String keyconfig;
+
+    @I18n("字段中文名")
+    @Column(name="label")
+    private String label;
+
+    @I18n("字段值")
+    @Column(name="valueconfig")
+    private String valueconfig;
+
+    @I18n("排序")
+    @Column(name="orders")
+    private String orders;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getKeyconfig() {
+        return keyconfig;
+    }
+
+    public void setKeyconfig(String keyconfig) {
+        this.keyconfig = keyconfig;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getValueconfig() {
+        return valueconfig;
+    }
+
+    public void setValueconfig(String valueconfig) {
+        this.valueconfig = valueconfig;
+    }
+
+    public String getOrders() {
+        return orders;
+    }
+
+    public void setOrders(String orders) {
+        this.orders = orders;
+    }
+}

src/main/java/com/dashitech/businessdata/entity/UserEntity.java

@@ -0,0 +1,241 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * Created by chi on 2019/10/9.
+ *
+ *  hospital、dept 字段为编码、转换到主表要变成id
+ */
+@Entity
+@Table(name = "itsm_uc_user")
+public class UserEntity  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+
+    /**
+     * 账号、工号
+     */
+    @I18n("账号")
+    @Column(name = "ACCOUNT", nullable = false)
+    private String account;
+
+    @I18n("密码")
+    @Column(name = "PWD", nullable = false)
+    private String pwd;
+    /**
+     * 姓名
+     */
+    @I18n("名称")
+    @Column(name = "NAME", nullable = false)
+    private String name;
+
+    @I18n("院区编码，主表为id这里为编码")
+    @Column(name = "hospital_id")
+    private String hospital;
+    /**
+     * 性别key male
+     */
+    @I18n("性别")
+    @Column(name="GENDER")
+    private Long genderId;
+    /**
+     * 电话号码
+     */
+//    @I18n("电话号码")
+//    @Column(name = "PHONE")
+//    private String phone;
+//
+//    @I18n("座机号码")
+//    @Column(name = "DIALING")
+//    private String dialing;
+
+    @I18n("所属科室为科室id")
+    @Column(name="DEPTID")
+    private String dept;
+
+//    @I18n("微信号")
+//    @Column(name = "WEIXIN")
+//    private String weixin;
+
+
+    @I18n("删除标识")
+    @Column(name = "delete_flag")
+    private Integer deleteFlag;
+
+    @I18n("用户类型，护士1、工友2、医生3")
+    @Column(name="usertype")
+    private String usertype;
+
+//    @I18n("HIS系统员工ID")
+//    @Column(name = "hisid")
+//    private String hisid;
+//
+//    @I18n("跟登录账号一样没啥用，单点登录标识")
+//    @Column(name = "emp_no")
+//    private String empno;
+
+    @I18n("拼音全拼")
+    @Column(name="pinyin")
+    private  String pingYin;
+
+    @I18n("拼音首字符")
+    @Column(name = "input_code")
+    private String inputCode;
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    public String getPingYin() {
+        return pingYin;
+    }
+
+    public void setPingYin(String pingYin) {
+        this.pingYin = pingYin;
+    }
+
+    public String getInputCode() {
+        return inputCode;
+    }
+
+    public void setInputCode(String inputCode) {
+        this.inputCode = inputCode;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getGenderId() {
+        return genderId;
+    }
+
+    public void setGenderId(Long genderId) {
+        this.genderId = genderId;
+    }
+
+
+//    public String getPhone() {
+//        return phone;
+//    }
+//
+//    public void setPhone(String phone) {
+//        this.phone = phone;
+//    }
+//
+//    public String getDialing() {
+//        return dialing;
+//    }
+//
+//    public void setDialing(String dialing) {
+//        this.dialing = dialing;
+//    }
+
+//    public String getWeixin() {
+//        return weixin;
+//    }
+//
+//    public void setWeixin(String weixin) {
+//        this.weixin = weixin;
+//    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getUsertype() {
+        return usertype;
+    }
+
+    public void setUsertype(String usertype) {
+        this.usertype = usertype;
+    }
+
+//    public String getHisid() {
+//        return hisid;
+//    }
+//
+//    public void setHisid(String hisid) {
+//        this.hisid = hisid;
+//    }
+//
+//    public String getEmpno() {
+//        return empno;
+//    }
+//
+//    public void setEmpno(String empno) {
+//        this.empno = empno;
+//    }
+
+    public String getHospital() {
+        return hospital;
+    }
+
+    public void setHospital(String hospital) {
+        this.hospital = hospital;
+    }
+
+    public String getDept() {
+        return dept;
+    }
+
+    public void setDept(String dept) {
+        this.dept = dept;
+    }
+
+    @Override
+    public String toString() {
+        return "UserEntity{" +
+                "id=" + id +
+                ", account='" + account + '\'' +
+                ", name='" + name + '\'' +
+                ", gender='" + genderId + '\'' +
+//                ", phone='" + phone + '\'' +
+//                ", dialing='" + dialing + '\'' +
+                ", dept=" + dept +
+//                ", weixin='" + weixin + '\'' +
+                ", deleteFlag=" + deleteFlag +
+                ", usertype='" + usertype + '\'' +
+//                ", hisid='" + hisid + '\'' +
+//                ", empno='" + empno + '\'' +
+                '}';
+    }
+}

src/main/java/com/dashitech/businessdata/entity/WorkOrderEntity.java

@@ -0,0 +1,88 @@
+package com.dashitech.businessdata.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * Created by xuweihua on 2020/11/20.
+ */
+@Entity
+@Table(name = "itsm_transport_workorder")
+public class WorkOrderEntity  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Integer id;
+
+    // 创建科室不展示实体
+    @I18n("创建科室")
+    @Column(name="create_department_id")
+    private Integer  createDept;
+    @I18n("起点科室id")
+    @Column(name="start_department_id")
+    private Integer  startDept;
+
+    @I18n("终点科室")
+    @Column(name="end_department_ids")
+    private String endDeptIds;
+
+    @I18n("工单状态")
+    @Column(name="gdstate")
+    private Integer  gdState;
+
+    @I18n("病人唯一标识")
+    @Column(name="patientId")
+    private String patientId;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStartDept() {
+        return startDept;
+    }
+
+    public void setStartDept(Integer startDept) {
+        this.startDept = startDept;
+    }
+
+    public Integer getGdState() {
+        return gdState;
+    }
+
+    public void setGdState(Integer gdState) {
+        this.gdState = gdState;
+    }
+
+    public String getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(String patientId) {
+        this.patientId = patientId;
+    }
+
+    public Integer getCreateDept() {
+        return createDept;
+    }
+
+    public void setCreateDept(Integer createDept) {
+        this.createDept = createDept;
+    }
+
+    public String getEndDeptIds() {
+        return endDeptIds;
+    }
+
+    public void setEndDeptIds(String endDeptIds) {
+        this.endDeptIds = endDeptIds;
+    }
+}

src/main/java/com/dashitech/callcenter/init/SocketInit.java

@@ -0,0 +1,63 @@
+package com.dashitech.callcenter.init;
+
+import com.dashitech.businessdata.dao.ISystemConfigureDAO;
+import com.dashitech.callcenter.socket.HandlerThread;
+import com.dashitech.utils.ThreadPoolFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+@Service
+public class SocketInit implements ApplicationRunner {
+
+    @Autowired
+    ISystemConfigureDAO systemConfigureDAO;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        //如果系统配置表的开关字段为1则连接话机socket 否则不连
+        if (systemConfigureDAO.selectValueByKey("callSocketSwitch").equals("1")) {
+            int PORT = 8087;
+            // TODO Auto-generated method stub
+            ServerSocket sock = null;
+            sock = new ServerSocket(PORT);
+
+            try {
+                while (true) {
+                    final Socket Client = sock.accept();
+                //    System.out.println("1111111111111111");
+                    //启动一个线程执行后续客户端发来的监听
+                    ThreadPoolFactory.getCachedPool().submit(new Runnable() {
+                        @Override
+                        public void run() {
+                            new HandlerThread(Client).run();
+                //            System.out.println("22222222222222222");
+                        }
+                    });
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                if (sock != null) {
+                    try {
+                        sock.close();
+                        System.out.println("电话socket关闭连接");
+                    } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+            }
+        } else {
+            System.out.println("callSocketSwitch 字段未开启");
+        }
+    }
+}

src/main/java/com/dashitech/callcenter/socket/HandlerThread.java

@@ -0,0 +1,397 @@
+package com.dashitech.callcenter.socket;
+
+import com.dashitech.businessdata.dao.ICallLogDAO;
+import com.dashitech.businessdata.dao.IDepartmentDAO;
+import com.dashitech.businessdata.dao.IDictionaryDAO;
+import com.dashitech.businessdata.dao.IHospitalConfigDAO;
+import com.dashitech.businessdata.entity.CallLogEntity;
+import com.dashitech.businessdata.entity.HospitalConfig;
+import com.dashitech.callcenter.webSocket.service.PhoneWebSocket;
+import com.dashitech.utils.JsonUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.net.Socket;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by chi on 2020/8/6.
+ */
+@Service
+public class HandlerThread  {
+
+    //  这里使用静态，让 service 属于类
+    private static ICallLogDAO callLogDAO;
+    @Autowired
+    public void setCallLogDAO(ICallLogDAO callLogDAO) {
+        HandlerThread.callLogDAO = callLogDAO;
+    }
+
+    private static IDictionaryDAO dictionaryDAO;
+    @Autowired
+    public void setDictionaryDAO(IDictionaryDAO dictionaryDAO) {
+        HandlerThread.dictionaryDAO = dictionaryDAO;
+    }
+
+    private static IDepartmentDAO departmentDAO;
+    @Autowired
+    public void setDepartmentDAO(IDepartmentDAO departmentDAO) {
+        HandlerThread.departmentDAO = departmentDAO;
+    }
+
+    private static IHospitalConfigDAO hospitalConfigDAO;
+    @Autowired
+    public void setHospitalConfigDAO(IHospitalConfigDAO hospitalConfigDAO) {
+        HandlerThread.hospitalConfigDAO = hospitalConfigDAO;
+    }
+
+    private Socket sc;
+
+    private static Map<String,String> phoneMap = new HashMap<>();
+
+    private static Map<String,CallLogEntity> phoneLog = new HashMap<>();
+    private String his = "";
+    public HandlerThread() {
+    }
+
+    public HandlerThread(Socket client) {
+        sc = client;
+    }
+
+    public void run() {
+        // TODO Auto-generated method stub
+        DataInputStream input = null;
+        DataOutputStream output = null;
+        try {
+           // sc.setSoTimeout(10000);
+            input = new DataInputStream(sc.getInputStream());
+            output = new DataOutputStream(sc.getOutputStream());
+            String reset = "";
+            //持续读取内部消息
+            while (true) {
+               //  System.out.println("处理客户端数据："+input.readUTF());
+             //   System.out.println("3333333333333333333333");
+                //获取信息流长度
+                byte[] b = new byte[4];
+                reset = "keepalive";
+                input.read(b);
+                int count = bytes2Int(b);
+             //   System.out.println("count::"+count);
+                //根据信息流长度获取信息流
+                byte[] b1 = new byte[count];
+                input.read(b1);
+                //将信息流转换为String
+                String data = new String(b1);
+                System.out.println("data:"+data+"his"+his);
+                if (data != null || !data.equals("")&&data.substring(0,1).equals("{")) {
+                    if (JsonUtil.toJSONObject(data).containsKey("channelStatusList")){
+                        List llist = JsonUtil.toJSONObject(data).optJSONArray("channelStatusList");
+                        JSONObject jsonObject = JsonUtil.toJSONObject(llist.get(0).toString());
+                        sendSocket(jsonObject,his);
+                        handleCallLog(jsonObject,his);
+                        reset = "channelstatus";
+                    }else if(JsonUtil.toJSONObject(data).containsKey("recordList")){
+                        saveCallLog(data,his);
+                        reset = "addrec";
+                    }
+                }
+                if (data != null && data.length() >= 10) {
+                    String dataStr = "";
+                    if (reset.equals("addrec")){
+                        dataStr = "{\"cmd\":\""+reset+"\",\"error\":\"0\", \"timestamp\":\""+(System.currentTimeMillis() / 1000)+"\"}";
+                    }else{
+                        dataStr = "{\"cmd\":\""+reset+"\", \"timestamp\":\""+(System.currentTimeMillis() / 1000)+"\"}";
+                    }
+                    if (data.indexOf("loginreq") >= 0){
+                        his = JsonUtil.toJSONObject(data).getString("sernelNo");
+                        his = callLogDAO.selectSernelNo("sernelNo",his);
+                        dataStr = "{\"cmd\":\"loginres\", \"error\":\"0\", \"timestamp\":\"" + (System.currentTimeMillis() / 1000) + "\"}";
+                    }
+                    System.out.println("redate>>"+dataStr+"his"+his);
+                    output.write(dataToBytes(dataStr));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("服务器EOFException异常");
+        } finally {
+            if (output != null) {
+                try {
+                    output.close();
+                } catch (Exception e) {
+                    output = null;
+                }
+            }
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (Exception e) {
+                    input = null;
+                }
+            }
+            if (sc != null) {
+                try {
+                    sc.close();
+                } catch (Exception e) {
+                    sc = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * 将发送内容转换为byte数组
+     * 需要注意：byte前面四位需要描述整个发送内容的长度（dataStr）
+     *
+     * @param dataStr
+     */
+    public byte[] dataToBytes(String dataStr) {
+        //将int转换为byte数组
+        byte[] lengthBytes = int2Bytes(dataStr.length());
+        //将string转换为byte数组
+        byte[] dataBytes = dataStr.getBytes();
+        //最终发送的byte数组，int byte数组长度和string byte数组长度相加得到最终长度
+        byte[] lengthAndDataBytes = new byte[(lengthBytes.length + dataBytes.length)];
+        //将int byte数组四位加入到新byte数组中
+        lengthAndDataBytes[0] = lengthBytes[0];
+        lengthAndDataBytes[1] = lengthBytes[1];
+        lengthAndDataBytes[2] = lengthBytes[2];
+        lengthAndDataBytes[3] = lengthBytes[3];
+        //将string byte数组四位加入到新byte数组中
+        for (int index = 4; index < lengthAndDataBytes.length; index++) {
+            lengthAndDataBytes[index] = dataBytes[index - 4];
+        }
+        return lengthAndDataBytes;
+
+    }
+
+    /**
+     * byte数组转换为int
+     *
+     * @param bytes
+     * @return
+     */
+    public static int bytes2Int(byte[] bytes) {
+        //如果不与0xff进行按位与操作，转换结果将出错，有兴趣的同学可以试一下。
+        int int1 = bytes[0] & 0xff;
+        int int2 = (bytes[1] & 0xff) << 8;
+        int int3 = (bytes[2] & 0xff) << 16;
+        int int4 = (bytes[3] & 0xff) << 24;
+        return int1 | int2 | int3 | int4;
+    }
+
+    /**
+     * int 转换为 byte数组
+     *
+     * @param integer
+     * @return
+     */
+    public static byte[] int2Bytes(int integer) {
+        byte[] bytes = new byte[4];
+        bytes[3] = (byte) ((byte) integer >> 24);
+        bytes[2] = (byte) ((byte) integer >> 16);
+        bytes[1] = (byte) ((byte) integer >> 8);
+        bytes[0] = (byte) integer;
+        return bytes;
+    }
+
+    /**
+     * 发送弹屏socket，将电话号码返回过去
+     * 201为通话中
+     * 202为振铃
+     *
+     */
+    public  void sendSocket(JSONObject jsonObject,String his) {
+        try {
+                putPhoneMap("phone_num_port",his);
+                if (jsonObject != null && jsonObject.containsKey("calldirection") && jsonObject.get("calldirection").toString().equals("1") || jsonObject.get("calldirection").toString() == "1") {
+                    if (jsonObject.containsKey("phonestate") && jsonObject.get("phonestate").toString().equals("3") || jsonObject.get("phonestate").toString() == "3") {
+                        if (jsonObject.containsKey("channel")&&jsonObject.get("channel").toString()!=null) {
+                            Map rMap = new HashMap();
+                            if (jsonObject.containsKey("dtmfa") && jsonObject.get("dtmfa").toString() != null && !jsonObject.optString("dtmfa").toString().equals("")){
+                                rMap.put("phone", jsonObject.opt("dtmfa"));
+                                rMap.put("status", 201);
+                            }else {
+                                rMap.put("phone","");
+                                rMap.put("status", 201);
+                            }
+                            ObjectMapper objectMapper = new ObjectMapper();
+                            String json = objectMapper.writeValueAsString(rMap);
+                            PhoneWebSocket.sendMessage(phoneMap.get(his+jsonObject.get("channel").toString()),json);
+                        }
+                    } else if (jsonObject.containsKey("phonestate") && jsonObject.get("phonestate").toString().equals("4") || jsonObject.get("phonestate").toString() == "4") {
+                        Map rMap = new HashMap();
+                        rMap.put("msg","来电话啦！" );
+                        rMap.put("status", 202);
+                        ObjectMapper objectMapper = new ObjectMapper();
+                        String json = objectMapper.writeValueAsString(rMap);
+                        if (jsonObject.containsKey("channel")&&jsonObject.get("channel").toString()!=null){
+                            PhoneWebSocket.sendMessage(phoneMap.get(his+jsonObject.get("channel").toString()),json);
+                        }
+                        CallLogEntity callLog = new CallLogEntity();
+                        callLog.setCallState(0);
+                    }
+                }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    private void handleCallLog(JSONObject jsonObject,String his){
+        if(jsonObject.get("phonestate").toString().equals("4")){
+            // 主叫号码不等于空字符串，并且不等于座机号（通道号获得），即可判断为来电号码
+            if(!jsonObject.get("dtmfa").toString().equals("") && !jsonObject.get("dtmfa").toString().equals(phoneMap.get(his+jsonObject.get("channel").toString()))){
+                phoneLog.put(his+jsonObject.get("channel").toString(),getCallLog(jsonObject));
+            }
+            //如果phonestate 为零则表示话机为空闲状态，则保存通话记录
+        }else if(jsonObject.get("phonestate").toString().equals("0")){
+            CallLogEntity callLog  = phoneLog.get(his+jsonObject.get("channel").toString());
+            if (callLog!=null){
+                if (jsonObject.containsKey("dtmfa")&& StringUtils.isNotEmpty(jsonObject.get("dtmfa").toString())&&!jsonObject.get("dtmfa").toString().equals("")&&!jsonObject.get("dtmfa").toString().equals(" ")){
+                    // 查询科室信息 并赋值
+                    callLog.setCallDept(getDeptByDTMFA(jsonObject.get("dtmfa").toString()));
+                }else {
+                    callLog.setCallDept("暂无");
+                }
+                callLog.setHosId(Integer.parseInt(his));
+                callLogDAO.save(callLog);
+            }
+        }else if(jsonObject.get("phonestate").toString().equals("1")){
+            phoneLog.put(his+jsonObject.get("channel").toString(),null);
+        }else if(jsonObject.get("phonestate").toString().equals("3")){
+            phoneLog.put(his+jsonObject.get("channel").toString(),null);
+        }
+    }
+
+    /**
+     * 将json转换为实体
+     * 默认 已接未接为 未接
+     * 默认 通话类型为 呼入
+     * 默认 时间为 当前时间。
+     * @param jsonObject
+     * @return
+     */
+    private CallLogEntity getCallLog(JSONObject jsonObject){
+        CallLogEntity callLog = new CallLogEntity();
+        if (jsonObject.containsKey("channel")){
+            callLog.setPhyIDA(jsonObject.get("channel").toString());
+        }
+        if (jsonObject.containsKey("dtmfa")) {
+            callLog.setdTMFA(jsonObject.get("dtmfa").toString());
+            callLog.setCallDept(getDeptByDTMFA(jsonObject.get("dtmfa").toString()));
+        }
+        if (jsonObject.containsKey("dtmfb")){
+            callLog.setdTMFB(jsonObject.get("dtmfb").toString());
+        }
+        callLog.setResponseTime(new Date());
+        callLog.setCallState(0);
+        callLog.setCallType(1);
+        return callLog;
+    }
+
+    public void putPhoneMap(String key,String his){
+//        List<DictionaryEntity> dictionaryEntityList = dictionaryDAO.selectDictionaryByKey(key);
+        List<HospitalConfig> hospitalConfigList =  hospitalConfigDAO.getHospitalConfigList(key,his);
+        if (hospitalConfigList!=null&&hospitalConfigList.size()>0){
+            for (HospitalConfig hospitalConfig:hospitalConfigList){
+                phoneMap.put(his+hospitalConfig.getValue2(),hospitalConfig.getValue());
+            }
+        }
+    }
+
+    /**
+     * 保存通话记录
+     * @param message
+     */
+    public void saveCallLog(String message,String his){
+        if (JsonUtil.toJSONObject(message).containsKey("recordList")) {
+            List list = JsonUtil.toJSONObject(message).optJSONArray("recordList");
+            if (list!=null&&list.size()>0){
+                JSONObject jsonObject = JsonUtil.toJSONObject(list.get(0).toString());
+                CallLogEntity callLog = new CallLogEntity();
+                if (jsonObject.containsKey("phyIDA")){
+                    callLog.setPhyIDA(jsonObject.get("phyIDA").toString());
+                }
+                if (jsonObject.containsKey("DTMFA")){
+                    callLog.setdTMFA(jsonObject.get("DTMFA").toString());
+                    callLog.setCallDept(getDeptByDTMFA(jsonObject.get("DTMFA").toString()));
+                }
+                if (jsonObject.containsKey("DTMFB")){
+                    callLog.setdTMFB(jsonObject.get("DTMFB").toString());
+                }
+                if (jsonObject.containsKey("rstime")){
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    try {
+                        callLog.setResponseTime(sdf.parse(jsonObject.get("rstime").toString()));
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                }
+                if (jsonObject.containsKey("longtime")){
+                    callLog.setLongTime(jsonObject.get("longtime").toString());
+                }
+                if (jsonObject.containsKey("path")){
+                    callLog.setPath(jsonObject.get("path").toString());
+                }
+
+                if(callLog.getPhyIDA() != null){
+                    // 判断为呼出（主叫号码等于分机号（通道号）为呼出）
+                    if(callLog.getdTMFA() != null &&phoneMap!=null&&phoneMap.size()>0&& phoneMap.get(his+callLog.getPhyIDA()).equals(callLog.getdTMFA())){
+                        callLog.setCallType(0);
+//                     callLog.setCallState(1);
+                        //  判断为呼入（被叫号码等于分机号（通道号）为呼入）
+                    }else if(callLog.getdTMFB()!= null &&phoneMap!=null&&phoneMap.size()>0&& phoneMap.get(his+callLog.getPhyIDA()).equals(callLog.getdTMFB())){
+                        callLog.setCallType(1);
+//                     callLog.setCallState(1);
+                    }else{//未知
+                        callLog.setCallType(2);
+                    }
+                    callLog.setCallState(1);
+                }
+                callLog.setHosId(Integer.parseInt(his));
+                callLogDAO.save(callLog);
+            }
+        }
+    }
+
+    private String getDeptByDTMFA(String phone){
+        try {
+            if (phone!=null){
+                phone = phone.trim();
+                if (phone.equals("")){
+                    return "暂无";
+                }
+                //给来电科室赋值
+                String deptName = departmentDAO.getDeptNameByPhone(phone);
+                if (deptName!=null&&!deptName.equals("")){
+                    return deptName;
+                }else {
+               /*     String deptName2 = departmentDAO.getDeptNameByWorkOrderPhone(phone);
+                    if (deptName2!=null&&!deptName2.equals("")){
+                        return deptName2;
+                    }else {
+                        return "暂无";
+                    }*/
+                    return "暂无";
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return "暂无";
+    }
+
+    public static void main(String[] args) {
+        System.out.println(System.currentTimeMillis() / 1000);
+    }
+}

src/main/java/com/dashitech/callcenter/webSocket/core/CacheHandlerAdapter.java

@@ -0,0 +1,33 @@
+package com.dashitech.callcenter.webSocket.core;
+
+import org.apache.commons.lang3.StringUtils;
+import org.atmosphere.cpr.AtmosphereResource;
+import org.atmosphere.websocket.WebSocketHandlerAdapter;
+
+import java.io.IOException;
+
+/**
+ * 带缓存的WebSocket类
+ */
+public class CacheHandlerAdapter extends WebSocketHandlerAdapter {
+    private SessionCache CACHE = new SessionCache();
+
+    public SessionCache getCACHE() {
+        return CACHE;
+    }
+
+    public void logout(AtmosphereResource resource) {
+        CACHE.removeByUUID(resource.uuid());
+    }
+
+    public SessionCache login(AtmosphereResource resource, String identity) throws IOException {
+        //缓存登录的浏览器，模板：{login:'123'}
+        if (StringUtils.isNotEmpty(identity)) {
+            if(CACHE.contains(identity)){
+                CACHE.removeByUUID(identity);
+            }
+                CACHE.put(identity,resource);
+        }
+        return CACHE;
+    }
+}

src/main/java/com/dashitech/callcenter/webSocket/core/SessionCache.java

@@ -0,0 +1,56 @@
+package com.dashitech.callcenter.webSocket.core;
+
+import org.atmosphere.cpr.AtmosphereResource;
+import org.jboss.netty.util.internal.ConcurrentHashMap;
+
+
+import java.util.Map;
+
+/**
+ * WebSocket缓存类
+ * Created by CX on 2018/8/9 0009.
+ */
+public class SessionCache {
+    /**
+     * 关键字缓存
+     */
+    private final ConcurrentHashMap<String, AtmosphereResource> indentityCache = new ConcurrentHashMap<String, AtmosphereResource>();
+
+    /**
+     * 所有浏览器的缓存，如果有需要可以扩展
+     */
+//    private final ConcurrentHashMap<String, AtmosphereResource> allCache = new ConcurrentHashMap<String, AtmosphereResource>();
+    public SessionCache() {
+    }
+
+    public ConcurrentHashMap<String, AtmosphereResource> getIndentityCache() {
+        return indentityCache;
+    }
+
+    public AtmosphereResource get(String identity) {
+        return this.indentityCache.get(identity);
+    }
+
+    public boolean contains(String identity) {
+        return this.indentityCache.containsKey(identity);
+    }
+
+    public void put(String identity, AtmosphereResource atmosphereResource) {
+        this.indentityCache.put(identity, atmosphereResource);
+    }
+
+    public AtmosphereResource remove(String identity) {
+        return indentityCache.remove(identity);
+    }
+
+    public AtmosphereResource removeByUUID(String uuid) {
+        for (Map.Entry<String, AtmosphereResource> entry : indentityCache.entrySet()) {
+            if (entry.getValue().uuid().equals(uuid)) {
+                return indentityCache.remove(entry.getKey());
+            }
+        }
+        return null;
+    }
+
+
+}

src/main/java/com/dashitech/callcenter/webSocket/core/WebSocketSender.java

@@ -0,0 +1,69 @@
+package com.dashitech.callcenter.webSocket.core;
+
+import org.atmosphere.cpr.AtmosphereResource;
+
+import java.util.Map;
+
+/**
+ * Websocket发送消息工具类
+ * Created by CX on 2018/8/9 0022.
+ */
+public class WebSocketSender {
+    private SessionCache cache;
+
+    public SessionCache getCache() {
+        return cache;
+    }
+
+    public void setCache(SessionCache cache) {
+        this.cache = cache;
+    }
+
+    /**
+     * 检查是否有浏览器连接进来，是否已经有缓存
+     *
+     * @return true有
+     */
+    public boolean isReady() {
+        if (this.cache != null) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 给指定浏览器发送消息
+     *
+     * @param identity 浏览器唯一标识
+     * @param message  消息
+     * @throws Exception
+     */
+    public void identityMessage(String identity, String message) throws Exception {
+        if (this.cache != null && this.cache.contains(identity)) {
+            AtmosphereResource atmosphereResource = this.cache.get(identity);
+            if(atmosphereResource!=null && !atmosphereResource.isCancelled()){
+                atmosphereResource.getResponse().getWriter().write(message);
+            }else {
+                cache.removeByUUID(identity);
+            }
+        }
+    }
+
+    /**
+     * 广播给所有缓存浏览器发送消息
+     *
+     * @param message 消息
+     * @throws Exception
+     */
+    public void identityBroadcastMessage(String message) throws Exception {
+        if (this.cache != null) {
+            for (Map.Entry<String, AtmosphereResource> entry : cache.getIndentityCache().entrySet()) {
+                if(!entry.getValue().isCancelled()){
+                    entry.getValue().getResponse().getWriter().write(message);
+                }else {
+                    cache.removeByUUID(entry.getKey());
+                }
+            }
+        }
+    }
+}

src/main/java/com/dashitech/callcenter/webSocket/service/PhoneWebSocket.java

@@ -0,0 +1,144 @@
+package com.dashitech.callcenter.webSocket.service;
+
+import com.dashitech.businessdata.dao.IDictionaryDAO;
+import com.dashitech.businessdata.entity.DictionaryEntity;
+import com.dashitech.callcenter.socket.HandlerThread;
+import com.dashitech.callcenter.webSocket.core.CacheHandlerAdapter;
+import com.dashitech.callcenter.webSocket.core.WebSocketSender;
+import com.dashitech.utils.JsonUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import net.sf.json.JSONObject;
+import org.atmosphere.cache.UUIDBroadcasterCache;
+import org.atmosphere.client.TrackMessageSizeInterceptor;
+import org.atmosphere.config.service.WebSocketHandlerService;
+import org.atmosphere.interceptor.HeartbeatInterceptor;
+import org.atmosphere.util.SimpleBroadcaster;
+import org.atmosphere.websocket.WebSocket;
+import org.atmosphere.websocket.WebSocketProcessor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Created by chi on 2020/8/6.
+ */
+
+/**
+ * 给前端推送消息
+ */
+//@WebServlet(name="phoneWebSocket",urlPatterns="/webSocket")
+@Service
+@WebSocketHandlerService(path = "/webSocket/message/phone", interceptors = {
+        TrackMessageSizeInterceptor.class,  //校验消息大小，验证数据完整性，需要前端参数配合
+        HeartbeatInterceptor.class},    //保持心跳，维持链接，需要前端参数配合
+        broadcaster = SimpleBroadcaster.class,  //简单广播
+        broadcasterCache = UUIDBroadcasterCache.class,//加入缓存，防止消息丢失
+        atmosphereConfig = {"org.atmosphere.websocket.WebSocketProtocol=org.atmosphere.websocket.protocol.StreamingHttpProtocol"})
+public class PhoneWebSocket extends CacheHandlerAdapter {
+    public final static WebSocketSender webSocketSender = new WebSocketSender();
+
+    private static IDictionaryDAO dictionaryDAO;
+    @Autowired
+    public void setDictionaryDAO(IDictionaryDAO dictionaryDAO) {
+        PhoneWebSocket.dictionaryDAO = dictionaryDAO;
+    }
+
+    private  static Map<String,String> phoneMap = new HashMap<>();
+    private List<String> phoneChannelList = new ArrayList<>();
+    private String likeName;
+
+    @Override
+    public void onByteMessage(WebSocket webSocket, byte[] data, int offset, int length) throws IOException {
+        super.onByteMessage(webSocket, data, offset, length);
+    }
+
+    @Override
+    public void onOpen(WebSocket webSocket) throws IOException {
+        super.onOpen(webSocket);
+    }
+
+    @Override
+    public void onClose(WebSocket webSocket) {
+        //连接关闭同时销毁绑定话机连接
+        System.out.println(likeName + "哥们被关闭了！！！");
+   /*     for (String phoneChannel : phoneChannelList){
+            phoneMap.remove(phoneChannel);
+        }*/
+        super.onClose(webSocket);
+    }
+
+    @Override
+    public void onError(WebSocket webSocket, WebSocketProcessor.WebSocketException t) {
+        System.out.println(likeName + "哥们报错了！！！");
+        super.onError(webSocket, t);
+    }
+
+    @Override
+    public void onTextMessage(WebSocket webSocket, String data) throws IOException {
+        //如果没有缓存，初始化缓存
+        synchronized (this) {
+            if (!webSocketSender.isReady()) {
+                webSocketSender.setCache(this.getCACHE());
+            }
+        }
+        JSONObject jsonObject = JsonUtil.toJSONObject(data);
+        String identity = jsonObject.optString("userCount");
+        String[] nameAndPhone = identity.split("\\|");
+        String[] loginPhones = nameAndPhone[1].split("_");
+//        System.out.println(loginPhones.length+":33333333333333333333333333");
+       // List<DictionaryEntity> list = getPhoneDictionaryList("phone_num_port");
+        for (String phone:loginPhones){
+//            System.out.println( "777777777777777 "+ nameAndPhone[1] + " " + phone);
+            //if(a[1].equals(dictionaryEntity.getName())) {
+                //保存通道号，后续根据key销毁Map中的值。
+            phoneChannelList.add(phone);
+            phoneMap.put(phone, identity);
+            //}
+        }
+        //通过userCount的方式确定缓存的人员
+        login(webSocket.resource(),identity);
+        likeName = identity;
+        Map rMap=new HashMap();
+        rMap.put("status",200);
+        rMap.put("phone",nameAndPhone[1]);
+        ObjectMapper objectMapper=new ObjectMapper();
+        String json = objectMapper.writeValueAsString(rMap);
+        webSocket.resource().getResponse().getWriter().write(json);
+    }
+
+    public static void sendMessage(String phone,String json) throws Exception {
+        String identity = getIdentity(phone);
+//        System.out.println("888888888888888888888888 " + phone + " " +  identity);
+        if (identity!=null&&!identity.equals("")){
+            PhoneWebSocket.webSocketSender.identityMessage(identity,json);
+        }else {
+//            System.out.println("这个电话没有被绑定"+new Date());
+        }
+    }
+
+    public static String getIdentity(String phone){
+        //System.out.println();
+        for(String key : phoneMap.keySet()){
+//            System.out.println("getIdentity --> phoneMap (" + key + " " + phoneMap.get(key));
+        }
+        if (phone!=null){
+            String identity = phoneMap.get(phone);
+            if(identity != null){
+                return identity;
+            }else{
+                //System.out.println(phone);
+                return null;
+            }
+        }
+       return null;
+    }
+
+    public List<DictionaryEntity> getPhoneDictionaryList(String key){
+        List<DictionaryEntity> dictionaryEntityList= dictionaryDAO.selectDictionaryByKey(key);
+        return dictionaryEntityList;
+    }
+
+
+}

src/main/java/com/dashitech/callcenter/webSocket/service/demo/Data.java

@@ -0,0 +1,46 @@
+package com.dashitech.callcenter.webSocket.service.demo;
+
+import java.util.Date;
+
+/**
+ * Created by CX on 2018/8/8 0008.
+ */
+public class Data {
+    private String message;
+    private String author;
+    private long time;
+
+    public Data() {
+        this("", "");
+    }
+
+    public Data(String author, String message) {
+        this.author = author;
+        this.message = message;
+        this.time = new Date().getTime();
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public long getTime() {
+        return time;
+    }
+
+    public void setTime(long time) {
+        this.time = time;
+    }
+}

src/main/java/com/dashitech/callcenter/webSocket/service/demo/WebSocketChat.java

@@ -0,0 +1,75 @@
+package com.dashitech.callcenter.webSocket.service.demo;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.atmosphere.cache.UUIDBroadcasterCache;
+import org.atmosphere.client.TrackMessageSizeInterceptor;
+import org.atmosphere.config.service.WebSocketHandlerService;
+import org.atmosphere.interceptor.HeartbeatInterceptor;
+import org.atmosphere.util.SimpleBroadcaster;
+import org.atmosphere.websocket.WebSocket;
+import org.atmosphere.websocket.WebSocketProcessor;
+import org.atmosphere.websocket.WebSocketStreamingHandlerAdapter;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+
+/**
+ * Websocket示例 <br/>
+ * <p>
+ * 事件优先级：会先触发onClose事件，在触发订阅的事件
+ */
+@WebSocketHandlerService(path = "/chat/A", interceptors = {
+        TrackMessageSizeInterceptor.class,  //校验消息大小，验证数据完整性，需要前端参数配合
+        HeartbeatInterceptor.class},    //保持心跳，维持链接，需要前端参数配合
+        broadcaster = SimpleBroadcaster.class,  //简单广播
+        broadcasterCache = UUIDBroadcasterCache.class,//加入缓存，防止消息丢失
+        atmosphereConfig = {"org.atmosphere.websocket.WebSocketProtocol=org.atmosphere.websocket.protocol.StreamingHttpProtocol"})
+public class WebSocketChat extends WebSocketStreamingHandlerAdapter {
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    @Override
+    public void onOpen(WebSocket webSocket) throws IOException {
+        System.out.println("A   onOpen   ");
+        //对当前会话进行事件注册
+//        webSocket.resource().addEventListener(new WebSocketEventListenerAdapter() {
+//            @Override
+//            public void onDisconnect(AtmosphereResourceEvent event) {
+//                if (event.isCancelled()) {
+//                    System.out.println("A   isCancelled    " + event.getResource().uuid());
+//                } else if (event.isClosedByClient()) {
+//                    System.out.println("A   isClosedByClient    " + event.getResource().uuid());
+//                }
+//            }
+//        });
+    }
+
+    @Override
+    public void onClose(WebSocket webSocket) {
+        System.out.println("A   onClose   "+ webSocket.resource().uuid());
+    }
+
+    @Override
+    public void onError(WebSocket webSocket, WebSocketProcessor.WebSocketException t) {
+        System.out.println("A   onError   " + t.toString());
+    }
+
+    @Override
+    public void onTextStream(WebSocket webSocket, Reader reader) throws IOException {
+        System.out.println("A   onTextStream   " + webSocket.resource().uuid());
+        webSocket.broadcast(mapper.writeValueAsString(mapper.readValue(new BufferedReader(reader).readLine(), Data.class)));
+
+        System.out.println("AAAAA " + webSocket.resource().getRequest().toString());
+        webSocket.resource().getResponse().getWriter().print("aaaaaaaaaaaaaa");
+
+        try {
+           //BossScreen.webSocketSender.identityBroadcastMessage(JsonUtil.toJSONObject(new Data("AAAA","11111")).toString());
+           // BossScreen.webSocketSender.identityMessage("123", JsonUtil.toJSONObject(new Data("BBBBBB","222222")).toString());
+           // BossScreen.webSocketSender.identityMessage("321", JsonUtil.toJSONObject(new Data("CCCCCCC","33333")).toString());
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+    }
+
+}

src/main/java/com/dashitech/callcenter/webSocket/service/demo/js/application2.js

@@ -0,0 +1,89 @@
+$(function () {
+    "use strict";
+
+    var detect = $('#detect');
+    var header = $('#header');
+    var content = $('#content');
+    var input = $('#input');
+    var status = $('#status');
+    var myName = false;
+    var author = null;
+    var logged = false;
+    var socket = atmosphere;
+
+	var subSocket;
+
+    // We are now ready to cut the request
+    var request = { url: 'ws://localhost:8080/webSocket/message/manage',
+        contentType : "application/json",
+		shared : true,	// 标签共享
+		trackMessageLength : true,	//校验数据完整性
+        transport : 'websocket'};
+
+    request.onOpen = function(response) {
+        content.html($('<p>', { text: 'Atmosphere connected using ' + response.transport }));
+        input.removeAttr('disabled').focus();
+        status.text('Choose name:');
+		subSocket.push(JSON.stringify({userCount:'fuwutai'}));
+    };
+
+    request.onMessage = function (response) {
+        var message = response.responseBody;
+        try {
+            var json = JSON.parse(message);
+            alert(message);
+        } catch (e) {
+            console.log('This doesn\'t look like a valid JSON: ', message);
+            return;
+        }
+
+        input.removeAttr('disabled').focus();
+        if (!logged && myName) {
+            status.text(myName + ': ').css('color', 'blue');
+            input.removeAttr('disabled').focus();
+            logged = true;
+        } else {
+            var me = json.author == author;
+            var date = typeof(json.time) == 'string' ? parseInt(json.time) : json.time;
+            addMessage(json.author, json.message, me ? 'blue' : 'black', new Date(date));
+        }
+    };
+
+    request.onClose = function(response) {
+        logged = false;
+    }
+
+    request.onError = function(response) {
+        content.html($('<p>', { text: 'Sorry, but there\'s some problem with your '
+            + 'socket or the server is down' }));
+    };
+
+    subSocket = socket.subscribe(request);
+
+    input.keydown(function(e) {
+        if (e.keyCode === 13) {
+            var msg = $(this).val();
+
+            // First message is always the author's name
+            if (author == null) {
+                author = msg;
+            }
+
+            subSocket.push(JSON.stringify({ author: author, message: msg }));
+            $(this).val('');
+
+            input.attr('disabled', 'disabled');
+            if (myName === false) {
+                myName = msg;
+            }
+        }
+    });
+
+    function addMessage(author, message, color, datetime) {
+        content.append('<p><span style="color:' + color + '">' + author + '</span> @ ' +
+            + (datetime.getHours() < 10 ? '0' + datetime.getHours() : datetime.getHours()) + ':'
+            + (datetime.getMinutes() < 10 ? '0' + datetime.getMinutes() : datetime.getMinutes())
+            + ': ' + message + '</p>');
+    }
+});
+

src/main/java/com/dashitech/callcenter/webSocket/service/demo/js/index.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Atmosphere WebSocket Chat</title>
+    <script type="text/javascript" src="./javascript/jquery-2.0.3.js"></script>
+    <script type="text/javascript" src="./javascript/atmosphere.js"></script>
+    <script type="text/javascript" src="./javascript/application.js"></script>
+    <style>
+    * {font-family: tahoma; font-size: 12px; padding: 0px; margin: 0px;}
+    p {line-height: 18px;}
+    div {width: 500px; margin-left: auto; margin-right: auto;}
+    #content {padding: 5px; background: #ddd; border-radius: 5px; border: 1px solid #CCC; margin-top: 10px;}
+    #header {padding: 5px; background: #f5deb3; border-radius: 5px; border: 1px solid #CCC; margin-top: 10px;}
+    #input {border-radius: 2px; border: 1px solid #ccc; margin-top: 10px; padding: 5px; width: 400px;}
+    #status {width: 88px; display: block; float: left; margin-top: 15px;}
+    </style>
+</head>
+<body>
+    <div id="header"><h3>Atmosphere WebSocket ONLY Chat</h3></div>
+    <div id="content"></div>
+    <div>
+        <span id="status">Connecting...</span>
+        <input type="text" id="input" disabled="disabled"/>
+    </div>
+</body>
+</html>

src/main/java/com/dashitech/callcenter/webSocket/service/demo/js/index2.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Atmosphere WebSocket Chat</title>
+    <script type="text/javascript" src="./javascript/jquery-2.0.3.js"></script>
+    <script type="text/javascript" src="./javascript/atmosphere.js"></script>
+    <script type="text/javascript" src="./application2.js"></script>
+    <style>
+    * {font-family: tahoma; font-size: 12px; padding: 0px; margin: 0px;}
+    p {line-height: 18px;}
+    div {width: 500px; margin-left: auto; margin-right: auto;}
+    #content {padding: 5px; background: #ddd; border-radius: 5px; border: 1px solid #CCC; margin-top: 10px;}
+    #header {padding: 5px; background: #f5deb3; border-radius: 5px; border: 1px solid #CCC; margin-top: 10px;}
+    #input {border-radius: 2px; border: 1px solid #ccc; margin-top: 10px; padding: 5px; width: 400px;}
+    #status {width: 88px; display: block; float: left; margin-top: 15px;}
+    </style>
+</head>
+<body>
+    <div id="header"><h3>Atmosphere WebSocket ONLY Chat</h3></div>
+    <div id="content"></div>
+    <div>
+        <span id="status">Connecting...</span>
+        <input type="text" id="input" disabled="disabled"/>
+    </div>
+</body>
+</html>

src/main/java/com/dashitech/callcenter/webSocket/service/demo/js/javascript/application.js

@@ -0,0 +1,90 @@
+$(function () {
+    "use strict";
+
+    var detect = $('#detect');
+    var header = $('#header');
+    var content = $('#content');
+    var input = $('#input');
+    var status = $('#status');
+    var myName = false;
+    var author = null;
+    var logged = false;
+    var socket = atmosphere;
+
+	var subSocket;
+
+    // We are now ready to cut the request
+    var request = { url: 'ws://localhost:8080/chat/A',
+        contentType : "application/json",
+		shared : true,	// 标签共享
+		trackMessageLength : true,	//校验数据完整性
+        transport : 'websocket'};
+
+    request.onOpen = function(response) {
+        content.html($('<p>', { text: 'Atmosphere connected using ' + response.transport }));
+        input.removeAttr('disabled').focus();
+        status.text('Choose name:');
+		subSocket.push(JSON.stringify({ author: 'author', message: 'msg' }));
+    };
+
+    request.onMessage = function (response) {
+        var message = response.responseBody;
+        try {
+            var json = JSON.parse(message);
+            alert(message);
+
+        } catch (e) {
+            console.log('This doesn\'t look like a valid JSON: ', message);
+            return;
+        }
+
+        input.removeAttr('disabled').focus();
+        if (!logged && myName) {
+            status.text(myName + ': ').css('color', 'blue');
+            input.removeAttr('disabled').focus();
+            logged = true;
+        } else {
+            var me = json.author == author;
+            var date = typeof(json.time) == 'string' ? parseInt(json.time) : json.time;
+            addMessage(json.author, json.message, me ? 'blue' : 'black', new Date(date));
+        }
+    };
+
+    request.onClose = function(response) {
+        logged = false;
+    }
+
+    request.onError = function(response) {
+        content.html($('<p>', { text: 'Sorry, but there\'s some problem with your '
+            + 'socket or the server is down' }));
+    };
+
+    subSocket = socket.subscribe(request);
+
+    input.keydown(function(e) {
+        if (e.keyCode === 13) {
+            var msg = $(this).val();
+
+            // First message is always the author's name
+            if (author == null) {
+                author = msg;
+            }
+
+            subSocket.push(JSON.stringify({ author: author, message: msg }));
+            $(this).val('');
+
+            input.attr('disabled', 'disabled');
+            if (myName === false) {
+                myName = msg;
+            }
+        }
+    });
+
+    function addMessage(author, message, color, datetime) {
+        content.append('<p><span style="color:' + color + '">' + author + '</span> @ ' +
+            + (datetime.getHours() < 10 ? '0' + datetime.getHours() : datetime.getHours()) + ':'
+            + (datetime.getMinutes() < 10 ? '0' + datetime.getMinutes() : datetime.getMinutes())
+            + ': ' + message + '</p>');
+    }
+});
+

src/main/java/com/dashitech/config/ApiFilterConfig.java

@@ -0,0 +1,58 @@
+package com.dashitech.config;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * API-rest服务拦截器 <br/>
+ * 对请求进行ip校验,出错返回拒绝信息
+ */
+public class ApiFilterConfig extends HandlerInterceptorAdapter {
+    private static Log log = LogFactory.getLog(ApiFilterConfig.class);
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+        super.postHandle(request, response, handler, modelAndView);
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        super.afterCompletion(request, response, handler, ex);
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        response.setCharacterEncoding("UTF-8");
+
+//        HandlerMethod hm = (HandlerMethod) handler;
+//        String visitMethod = hm.getMethod().getName();
+
+        //校验
+        boolean flag = check(request.getRemoteHost());
+
+        //验证失败，拒绝请求
+  /*      if (!flag) {
+            MessageResult result = new MessageResult();
+            result.setSuccess(false);
+            result.setMsg("403 forbidden");
+            response.getWriter().print(JsonUtil.toJsonString(result));
+        }else {
+            log.error("ApiFilter Check Error："+ request.getRequestURL().toString() + "  IP："+ request.getRemoteAddr());
+        }*/
+
+        return flag;
+    }
+
+    private boolean check(String ip) {
+//        if (StringUtils.isNotEmpty(ip) && (ip.equals("127.0.0.1") || ip.equals("localhost") || ip.equals("0:0:0:0:0:0:0:1"))) {
+//            return true;
+//        }
+//        return false;
+        return true;
+    }
+}

src/main/java/com/dashitech/config/ApiWeblogFilterConfig.java

@@ -0,0 +1,48 @@
+package com.dashitech.config;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 路径拦截器
+ */
+@Aspect
+@Order(2)
+@Component
+public class ApiWeblogFilterConfig {
+    private static Log log = LogFactory.getLog(ApiWeblogFilterConfig.class);
+
+    ThreadLocal<Long> startTime = new ThreadLocal<Long>();
+
+    @Pointcut("execution(public * com.dashitech.api..*.*(..))")
+    public void webLog() {
+        log.info("show()");
+    }
+
+    @Before("webLog()")
+    public void doBefore(JoinPoint joinPoint) throws Throwable {
+        startTime.set(System.currentTimeMillis());
+        // 接收到请求，记录请求内容
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        // 记录下请求内容
+        log.info(Thread.currentThread().getName() + "   ApiLog-URL : " + request.getRequestURL().toString() + "   IP : " + request.getRemoteAddr());
+//        log.info(Thread.currentThread().getName() + "   ApiLog-ARGS : " + Arrays.toString(joinPoint.getArgs()));
+    }
+
+    @AfterReturning(returning = "ret", pointcut = "webLog()")
+    public void doAfterReturning(Object ret) throws Throwable {
+        log.info(Thread.currentThread().getName() + "   ApiLog-AVG/MS : " + (System.currentTimeMillis() - startTime.get()) + "/ms ");
+    }
+}

src/main/java/com/dashitech/config/DataSourceConfig.java

@@ -0,0 +1,32 @@
+
+package com.dashitech.config;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+
+/**
+ * Created by chi on 2019/9/20.
+ */
+
+@Configuration
+public class DataSourceConfig {
+
+    /**
+     *  数据源2
+     */
+
+    @Bean(name = "mysql2DataSource")
+    @Qualifier(value = "mysql2DataSource")
+    @ConfigurationProperties(prefix = "mysql2.spring.datasource")
+    public DataSource mysql2DataSource(){
+        return DataSourceBuilder.create().build();
+    }
+}
+

src/main/java/com/dashitech/config/DruidConfig.java

@@ -0,0 +1,16 @@
+package com.dashitech.config;
+
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(urlPatterns = "/druid/*", 
+    initParams={
+            @WebInitParam(name="allow",value="127.0.0.1"),// IP白名单 (没有配置或者为空，则允许所有访问)
+            @WebInitParam(name="deny",value="192.168.16.111"),// IP黑名单 (存在共同时，deny优先于allow)
+            @WebInitParam(name="loginUsername",value="itsm"),// 用户名
+            @WebInitParam(name="loginPassword",value="100100"),// 密码
+            @WebInitParam(name="resetEnable",value="false")// 禁用HTML页面上的“Reset All”功能
+    })
+public class DruidConfig {
+
+}

src/main/java/com/dashitech/config/DruidFilter.java

@@ -0,0 +1,14 @@
+package com.dashitech.config;
+
+import com.alibaba.druid.support.http.WebStatFilter;
+
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.annotation.WebInitParam;
+
+@WebFilter(filterName="druidWebStatFilter",urlPatterns="/*",
+	    initParams={
+	        @WebInitParam(name="exclusions",value="*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*")// 忽略资源
+	})
+public class DruidFilter extends WebStatFilter{
+
+}

src/main/java/com/dashitech/config/TomcatConfig.java

@@ -0,0 +1,30 @@
+package com.dashitech.config;
+
+import org.apache.catalina.connector.Connector;
+import org.apache.coyote.http11.Http11NioProtocol;
+import org.springframework.boot.context.embedded.EmbeddedServletContainer;
+//import org.springframework.boot.context.embedded.ServletContextInitializer;
+import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.Charset;
+
+@Component
+public class TomcatConfig extends TomcatEmbeddedServletContainerFactory {
+	public EmbeddedServletContainer getEmbeddedServletContainer(ServletContextInitializer... initializers) {
+		return super.getEmbeddedServletContainer(initializers);
+	}
+
+	protected void customizeConnector(Connector connector) {
+		super.customizeConnector(connector);
+		setUriEncoding(Charset.forName("UTF-8"));
+		Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler();
+		// 设置最大连接数
+		protocol.setMaxConnections(1000);
+		// 设置最大线程数
+		protocol.setMaxThreads(1000);
+		protocol.setConnectionTimeout(30000);
+	}
+
+}

src/main/java/com/dashitech/config/datasource/MySQL2DataSourceConfig.java

@@ -0,0 +1,108 @@
+package com.dashitech.config.datasource;
+
+/**
+ * Created by chi on 2019/10/17.
+ */
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.Database;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by chi on 2019/9/20.
+ */
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactoryMysql2",   //EntityManagerFactory引用
+        transactionManagerRef = "transactionManagerMysql2",      //transactionManager引用
+        basePackages = {"com.dashitech.businessdata"})         //设置 基因网orderDiscountDataSource应用到的包
+
+public class MySQL2DataSourceConfig {
+    /**
+     * 注入 基因网订单折扣数据源
+     */
+    @Autowired()
+    @Qualifier("mysql2DataSource")
+    private DataSource mysql2DataSource;
+
+    /**
+     * 注入JPA配置实体
+     */
+    @Autowired
+    private JpaProperties jpaProperties;
+
+    /**
+     * 通过调用JPA配置实体中的解析方法，解析datasource中各属性的值
+     * @param dataSource    数据源
+     * @return     本数据源中各参数
+     * Map中设值分别为：
+     *      hibernate-dialect   方言
+     *      hibernate.hbm2ddl.auto  DDL执行策略
+     *      hibernate.physical_naming_strategy  命名策略
+     *
+     *这些和不同类型数据库密切相关的属性设置，不能设置在application.properties中，所以需要再不同的数据源中具体设置，赋值给JpaProperties
+     */
+    private Map<String,String> getVendorProperties(DataSource dataSource){
+        jpaProperties.setDatabase(Database.MYSQL);
+        Map<String,String> map = new HashMap<>();
+        map.put("hibernate.dialect","org.hibernate.dialect.MySQL5Dialect");
+        map.put("hibernate.hbm2ddl.auto","update");
+        map.put("hibernate.physical_naming_strategy","org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl");
+        jpaProperties.setProperties(map);
+        return  jpaProperties.getHibernateProperties(dataSource);
+    }
+
+    /**
+     * 配置EntityManagerFactory实体
+     * @param builder
+     * @return      实体管理工厂
+     * packages     扫描@Entity注释的软件包名称
+     * persistenceUnit  持久性单元的名称。 如果只建立一个EntityManagerFactory，你可以省略这个，但是如果在同一个应用程序中有多个，你应该给它们不同的名字
+     * properties       标准JPA或供应商特定配置的通用属性。 这些属性覆盖构造函数中提供的任何值。
+     *
+     */
+    @Bean(name = "entityManagerFactoryMysql2")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryMysql2(EntityManagerFactoryBuilder builder){
+        return builder
+                .dataSource(mysql2DataSource)
+                .properties(getVendorProperties(mysql2DataSource))
+                .packages(new String[]{"com.dashitech.businessdata"})
+                .persistenceUnit("mysql2PersistenceUnit")
+                .build();
+    }
+
+    /**
+     * 配置EntityManager实体
+     * @param builder
+     * @return      实体管理器
+     */
+    @Bean(name = "entityManagerMysql2")
+    public EntityManager entityManager(EntityManagerFactoryBuilder builder){
+        return entityManagerFactoryMysql2(builder).getObject().createEntityManager();
+    }
+
+
+    /**
+     * 配置事务transactionManager
+     * @param builder
+     * @return      事务管理器
+     */
+    @Bean(name = "transactionManagerMysql2")
+    public PlatformTransactionManager transactionManagerOrderDiscount(EntityManagerFactoryBuilder builder){
+        return  new JpaTransactionManager(entityManagerFactoryMysql2(builder).getObject());
+    }
+
+}

src/main/java/com/dashitech/redis/core/JedisPoolFactory.java

@@ -0,0 +1,71 @@
+package com.dashitech.redis.core;
+
+import com.dashitech.utils.PropertiesUtil;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+/**
+ * Redis抽象工厂实例类，务必在Spring的数据库配置加载完成后在调用此类！否则会报错
+ * Created by CX on 2018/8/20 0020.
+ */
+public abstract class JedisPoolFactory {
+    private static JedisPool pool;
+
+
+    private synchronized static JedisPool getJedisPool() {
+        if (pool == null) {
+            String host = PropertiesUtil.getProperty("spring.redis.host");
+            Integer port = PropertiesUtil.getInteger("spring.redis.port");
+            String password = PropertiesUtil.getProperty("spring.redis.password");
+            JedisPoolConfig config = new JedisPoolConfig();
+            config.setMaxTotal(PropertiesUtil.getInteger("spring.redis.pool.max-total"));
+            config.setMaxIdle(PropertiesUtil.getInteger("spring.redis.pool.max-idle"));
+            config.setMaxWaitMillis(PropertiesUtil.getInteger("spring.redis.pool.max-wait-millis"));
+            config.setTestOnBorrow(true);
+            pool = new JedisPool(config, host, port,5000,password);
+        }
+        return pool;
+    }
+
+
+    private synchronized static JedisPool getDefaultJedisPool() {
+        if (pool == null) {
+            String host = "127.0.0.1";
+            Integer port = 6379;
+            JedisPoolConfig config = new JedisPoolConfig();
+            config.setMaxTotal(100);
+            config.setMaxIdle(20);
+            config.setMaxWaitMillis(10000);
+            config.setTestOnBorrow(true);
+            pool = new JedisPool(config, host, port);
+        }
+        return pool;
+    }
+
+    /**
+     * 使用默认127.0.0.1和默认6379端口
+     *
+     * @return
+     */
+    public synchronized static Jedis getDefaultJedis() {
+        if (pool == null) {
+            return getDefaultJedisPool().getResource();
+        } else {
+            return pool.getResource();
+        }
+    }
+
+
+    /**
+     * 读数据库userRedisIp和userRedisPort，如果没有读取到报错
+     */
+    public synchronized static Jedis getJedis() {
+        if (pool == null) {
+            return getJedisPool().getResource();
+        } else {
+            return pool.getResource();
+        }
+    }
+
+}

src/main/java/com/dashitech/redis/core/RedisHashCmd.java

@@ -0,0 +1,162 @@
+package com.dashitech.redis.core;
+
+import redis.clients.jedis.Jedis;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Redis键值队列，元素key不可重复，注意并发问题
+ * Created by CX on 2018/8/20 0020.
+ */
+public class RedisHashCmd {
+
+    public static void main(String[] args) {
+        Map<String, String> map = new HashMap<>();
+        map.put("A", "1");
+        map.put("B", "2");
+
+        JedisPoolFactory.getDefaultJedis();
+        RedisHashCmd redisMap = new RedisHashCmd();
+        redisMap.putAll("MapA", map);
+
+
+        redisMap.put("MapA", "C", "3");
+        redisMap.put("MapA", "C", "4");
+
+        System.out.println(redisMap.containsKey("MapA", "C"));
+        System.out.println(redisMap.get("MapA", "C"));
+        System.out.println(redisMap.values("MapA"));
+        redisMap.remove("MapA", "A");
+
+        redisMap.drop("MapA");
+    }
+
+    /**
+     * 新增，如果队列不存在，新建这个队列，如果存在直接覆盖键和值
+     *
+     * @param name  队列名称
+     * @param key   主键
+     * @param value 值
+     */
+    public static void put(String name, String key, String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.hset(name, key, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 批量新增，如果队列不存在，新建这个队列，如果存在直接覆盖键和值
+     */
+    public static void putAll(String name, Map<String, String> map) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.hmset(name, map);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 删除key和对应值
+     */
+    public static void remove(String name, String key) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.hdel(name, key);
+        }catch (Exception ex) {
+            ex.printStackTrace();
+        }finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 直接删除队列本身
+     */
+    public static void drop(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.del(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 获取key对应值
+     */
+    public static String get(String name, String key) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.hget(name, key);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * key集合
+     */
+    public static Set<String> keySet(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.hkeys(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * value集合
+     */
+    public static List<String> values(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.hvals(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    public static Map<String, String> getAll(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.hgetAll(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 是否存在这个key
+     */
+    public static boolean containsKey(String name, String key) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.hexists(name, key);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 队列大小
+     */
+    public static Long size(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.hlen(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+}

src/main/java/com/dashitech/redis/core/RedisKeys.java

@@ -0,0 +1,33 @@
+package com.dashitech.redis.core;
+
+/**
+ * Created by chi on 2020/6/12.
+ */
+public class RedisKeys {
+
+    /**
+     * 自动建单订阅
+     */
+    public static final String ITSM_ORDER_CREATE_PUBSUB = "itsm_order_create_pubsub";
+
+    /**
+     * 任务类型
+     */
+    public static final String ITSM_TASKTYPE_HASH = "itsm_taskType_hash";
+
+    /**
+     * 自动建单，消息队列
+     */
+    public static final String ITSM_CREATE_ORDER_LIST = "itsm_create_order_list";
+
+    /**
+     * 数据同步，消息队列
+     */
+    public static final String ITSM_SYS_DATA_LIST = "itsm_sys_data_list";
+
+    /**
+     * 标本收取状态变更,是否需要闭环上报队列
+     */
+    public static final String ITSM_SPECIMEN_STATUS_LIST = "itsm_specimen_status_list";
+
+}

src/main/java/com/dashitech/redis/core/RedisListCmd.java

@@ -0,0 +1,182 @@
+package com.dashitech.redis.core;
+
+import redis.clients.jedis.Jedis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Redis队列，元素可重复，注意并发问题
+ * Created by CX on 2018/8/20 0020.
+ */
+public class RedisListCmd {
+
+    public static void main(String[] args) {
+        JedisPoolFactory.getDefaultJedis();
+        RedisListCmd redisList = new RedisListCmd();
+
+        redisList.add("AAAAAAAAA", "A");
+        redisList.add("AAAAAAAAA", "B");
+        redisList.add("AAAAAAAAA", 0, "C");
+        redisList.add("AAAAAAAAA", "A");
+
+        List<String> list = new ArrayList<>();
+        list.add("1111");
+        list.add("2222");
+        redisList.addAll("AAAAAAAAA", list);
+
+        System.out.println(redisList.indexOf("AAAAAAAAA", "A"));
+        System.out.println(redisList.contains("AAAAAAAAA", "B"));
+        System.out.println(redisList.get("AAAAAAAAA", 1));
+        System.out.println(redisList.get("AAAAAAAAA"));
+        System.out.println(redisList.size("AAAAAAAAA"));
+
+        redisList.remove("AAAAAAAAA", "B");
+
+        redisList.drop("AAAAAAAAA");
+
+    }
+
+    /**
+     * 新增，如果队列不存在，新建这个队列，如果存在插入值到队列最后面
+     *
+     * @param name  队列名称
+     * @param value 值
+     */
+    public static void add(String name, String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.rpush(name, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 在指定下标插入值，注意！原下标值会被当前值覆盖！如果下标出错，会报错
+     */
+    public static void add(String name, int index, String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.lset(name, index, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 批量新增，如果队列不存在，新建这个队列，如果存在插入值到队列最后面
+     */
+    public static void addAll(String name, List<String> list) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            if (list != null && list.size() > 0) {
+                String[] values = new String[list.size()];
+                for (int i = 0; i < list.size(); i++) {
+                    values[i] = list.get(i);
+                }
+                jedis.rpush(name, values);
+            }
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 删除所有和value值相等的对象
+     */
+    public static void remove(String name, String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.lrem(name, 0, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 直接删除队列本身
+     */
+    public static void drop(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.del(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 根据下标获取值
+     */
+    public static String get(String name, int index) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.lindex(name, index);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 获取所有值
+     */
+    public static List<String> get(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.lrange(name, 0, -1);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 直接比对返回下标
+     */
+    public static int indexOf(String name, String value) {
+        List<String> list = get(name);
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                String _value = list.get(i);
+                if (_value.equals(value)) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * 获取并移除列表第一个值，如果队列空了，返回null
+     */
+    public static String pop(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.lpop(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+
+    /**
+     * 直接返回是否包含
+     */
+    public static boolean contains(String name, String value) {
+        int index = indexOf(name, value);
+        return index > -1;
+    }
+
+    /**
+     * 队列大小
+     */
+    public static Long size(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.llen(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+}

src/main/java/com/dashitech/redis/core/RedisPubSubCmd.java

@@ -0,0 +1,46 @@
+package com.dashitech.redis.core;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPubSub;
+
+/**
+ * Redis发布和订阅
+ * Created by CX on 2018/8/20 0020.
+ */
+public class RedisPubSubCmd {
+    private static Log log = LogFactory.getLog(RedisPubSubCmd.class);
+
+    public static void main(String[] args) {
+        JedisPoolFactory.getDefaultJedis();
+
+    }
+
+    public static boolean subscribe(JedisPubSub jedisPubSub, String topic) {
+        final Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.subscribe(jedisPubSub, topic);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return false;
+        } finally {
+            jedis.close();
+        }
+        return true;
+    }
+
+
+    public static void publish(String topic, String message) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.publish(topic, message);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            jedis.close();
+        }
+    }
+
+
+}

src/main/java/com/dashitech/redis/core/RedisStringCmd.java

@@ -0,0 +1,149 @@
+package com.dashitech.redis.core;
+
+import redis.clients.jedis.Jedis;
+
+/**
+ * Redis字符串，注意并发问题
+ * Created by CX on 2018/8/20 0020.
+ */
+public class RedisStringCmd {
+
+    public static void main(String[] args) {
+        JedisPoolFactory.getDefaultJedis();
+
+        RedisStringCmd.drop("testString");
+        RedisStringCmd.set("testString","ABC");
+        System.out.println(RedisStringCmd.getset("testString", "CBA"));
+        System.out.println(RedisStringCmd.getset("testString111", "CBA"));
+        RedisStringCmd.append("testString","DEF");
+        System.out.println(RedisStringCmd.get("testString"));
+    }
+
+    /**
+     * 新增，如果已存在，覆盖当前值
+     * @param name  名称
+     * @param value 值
+     */
+    public static void set(String name, String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.set(name, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    public static void set(byte[] name, byte[] value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.set(name, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 有生命周期的新增，如果已存在，覆盖当前值和时间
+     * @param seconds  时间秒数
+     */
+    public static void setex(String name, String value,int seconds) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.setex(name, seconds,value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    public static void setex(byte[] name, byte[] value,int seconds) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.setex(name, seconds, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     *  key不存在时才成功
+     * @return 成功1 失败 0
+     */
+    public static Long setnx(String name,String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.setnx(name, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 设置值，并返回旧值，旧值不存在时返回null
+     */
+    public static String getset(String name,String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+           return jedis.getSet(name, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 追加值到末尾，如果不存在key，新增
+     */
+    public static void append(String name,String value) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.append(name, value);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 直接删除key
+     */
+    public static void drop(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            jedis.del(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 获取值
+     */
+    public static String get(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.get(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    public static byte[] get(byte[] name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.get(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+    /**
+     * 值大小
+     */
+    public static Long size(String name) {
+        Jedis jedis = JedisPoolFactory.getJedis();
+        try {
+            return jedis.strlen(name);
+        } finally {
+            jedis.close();
+        }
+    }
+
+}

src/main/java/com/dashitech/redis/core/init/RedisInit.java

@@ -0,0 +1,54 @@
+//package com.dashitech.redis.core.init;
+//
+//import com.dashitech.job.SpecimenStatusJob;
+//import com.dashitech.redis.core.RedisKeys;
+//import com.dashitech.redis.core.RedisListCmd;
+//import com.dashitech.utils.ThreadPoolFactory;
+//import org.apache.commons.lang.StringUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.ApplicationArguments;
+//import org.springframework.boot.ApplicationRunner;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.concurrent.TimeUnit;
+//
+///**
+// * Redis订阅服务，启动类
+// * Created by CX on 2022/2/14.
+// */
+//@Service
+//@Order(10)
+//public class RedisInit implements ApplicationRunner {
+//
+//    @Autowired
+//    SpecimenStatusJob specimenStatusJob;
+//
+//    @Override
+//    public void run(ApplicationArguments applicationArguments) throws Exception {
+//        System.out.println("标本状态，闭环上报消息订阅：" + RedisKeys.ITSM_SPECIMEN_STATUS_LIST);
+//        //标本状态，闭环上报
+//        //使用scheduleWithFixedDelay，任务结束才开始算间隔
+//        ThreadPoolFactory.getScheduledPool().scheduleWithFixedDelay(new Runnable() {
+//            @Override
+//            public void run() {
+//                try {
+//                    onMessage();
+//                } catch (Exception ex) {
+//                    ex.printStackTrace();
+//                }
+//            }
+//        }, 0, 5, TimeUnit.SECONDS);
+//    }
+//
+//    /**
+//     * 获取消息队列信息，循环自动建单，直到没有消息停止
+//     */
+//    public void onMessage() {
+//        String message = RedisListCmd.pop(RedisKeys.ITSM_SPECIMEN_STATUS_LIST);
+//        while (StringUtils.isNotEmpty(message)) {
+//            specimenStatusJob.onMessage(message);
+//            message = RedisListCmd.pop(RedisKeys.ITSM_SPECIMEN_STATUS_LIST);
+//        }
+//    }
+//}

src/main/java/com/dashitech/utils/CaptchaUtil.java

@@ -0,0 +1,107 @@
+package com.dashitech.utils;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Random;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+
+public class CaptchaUtil {
+	
+	private String code = "";
+	private BufferedImage image;
+	
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public BufferedImage getImage() {
+		return image;
+	}
+	public void setImage(BufferedImage image) {
+		this.image = image;
+	}
+	
+	public CaptchaUtil() {
+		init();
+	}
+
+	private Color getRandColor(int fc, int bc) {// 给定范围获得随机颜色
+		Random random = new Random();
+		if (fc > 255)
+			fc = 255;
+		if (bc > 255)
+			bc = 255;
+		int r = fc + random.nextInt(bc - fc);
+		int g = fc + random.nextInt(bc - fc);
+		int b = fc + random.nextInt(bc - fc);
+		return new Color(r, g, b);
+	}
+
+	private void init() {
+		// 在内存中创建图象
+		int width=60, height=20;
+		image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+		
+		// 获取图形上下文
+		Graphics g = image.getGraphics();
+		
+		//生成随机类
+		Random random = new Random();
+		
+		// 设定背景色
+		g.setColor(getRandColor(200,250));
+		g.fillRect(0, 0, width, height);
+		
+		//设定字体
+		g.setFont(new Font("Times New Roman",Font.PLAIN,18));
+		
+		//画边框
+		//g.setColor(new Color());
+		//g.drawRect(0,0,width-1,height-1);
+		
+		// 随机产生155条干扰线，使图象中的认证码不易被其它程序探测到
+		g.setColor(getRandColor(160,200));
+		for (int i=0;i<155;i++)
+		{
+		 int x = random.nextInt(width);
+		 int y = random.nextInt(height);
+		        int xl = random.nextInt(12);
+		        int yl = random.nextInt(12);
+		 g.drawLine(x,y,x+xl,y+yl);
+		}
+		
+		// 取随机产生的认证码(4位数字)
+		for (int i=0;i<4;i++){
+		    String rand=String.valueOf(random.nextInt(10));
+		    code+=rand;
+		    // 将认证码显示到图象中
+		    g.setColor(new Color(20+random.nextInt(110),20+random.nextInt(110),20+random.nextInt(110)));
+		//调用函数出来的颜色相同，可能是因为种子太接近，所以只能直接生成
+		    g.drawString(rand,13*i+6,16);
+		}
+		
+		// 图象生效
+		g.dispose();
+		
+	}
+	
+	public static void writeCaptcha(HttpServletResponse resp,CaptchaUtil captcha) {
+		resp.setHeader("Pragma","No-cache");
+		resp.setHeader("Cache-Control","no-cache");
+		resp.setDateHeader("Expires", 0);
+		BufferedImage image = captcha.getImage();
+		// 输出图象到页面
+		try {
+			ImageIO.write(image, "JPEG", resp.getOutputStream());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+}

src/main/java/com/dashitech/utils/CaptchaUtil2.java

@@ -0,0 +1,228 @@
+package com.dashitech.utils;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+public class CaptchaUtil2 {
+
+	/**
+	 * 验证码类型为仅数字,即0~9
+	 */
+	public static final int TYPE_NUM_ONLY = 0;
+
+	/**
+	 * 验证码类型为仅字母,即大小写字母混合
+	 */
+	public static final int TYPE_LETTER_ONLY = 1;
+
+	/**
+	 * 验证码类型为数字和大小写字母混合
+	 */
+	public static final int TYPE_ALL_MIXED = 2;
+
+	/**
+	 * 验证码类型为数字和大写字母混合
+	 */
+	public static final int TYPE_NUM_UPPER = 3;
+
+	/**
+	 * 验证码类型为数字和小写字母混合
+	 */
+	public static final int TYPE_NUM_LOWER = 4;
+
+	/**
+	 * 验证码类型为仅大写字母
+	 */
+	public static final int TYPE_UPPER_ONLY = 5;
+
+	/**
+	 * 验证码类型为仅小写字母
+	 */
+	public static final int TYPE_LOWER_ONLY = 6;
+
+	/**
+	 * 生成随机颜色
+	 */
+	private static Color generateRandomColor() {
+		Random random = new Random();
+		return new Color(random.nextInt(255), random.nextInt(255), random.nextInt(255));
+	}
+
+	/**
+	 * 生成图片验证码
+	 * 
+	 * @param type
+	 *            验证码类型,参见本类的静态属性
+	 * @param length
+	 *            验证码字符长度,要求大于0的整数
+	 * @param excludeString
+	 *            需排除的特殊字符
+	 * @param width
+	 *            图片宽度(注意此宽度若过小,容易造成验证码文本显示不全,如4个字符的文本可使用85到90的宽度)
+	 * @param height
+	 *            图片高度
+	 * @param interLine
+	 *            图片中干扰线的条数
+	 * @param randomLocation
+	 *            每个字符的高低位置是否随机
+	 * @param backColor
+	 *            图片颜色,若为null则表示采用随机颜色
+	 * @param foreColor
+	 *            字体颜色,若为null则表示采用随机颜色
+	 * @param lineColor
+	 *            干扰线颜色,若为null则表示采用随机颜色
+	 * @return 图片缓存对象
+	 */
+	public static BufferedImage generateImageCode(int type, int length, String excludeString, int width, int height, int interLine, boolean randomLocation, Color backColor, Color foreColor, Color lineColor) {
+		String textCode = generateTextCode(type, length, excludeString);
+		return generateImageCode(textCode, width, height, interLine, randomLocation, backColor, foreColor, lineColor);
+	}
+
+	/**
+	 * 生成验证码字符串
+	 * 
+	 * @param type
+	 *            验证码类型,参见本类的静态属性
+	 * @param length
+	 *            验证码长度,要求大于0的整数
+	 * @param excludeString
+	 *            需排除的特殊字符（无需排除则为null）
+	 * @return 验证码字符串
+	 */
+	public static String generateTextCode(int type, int length, String excludeString) {
+		if (length <= 0) {
+			return "";
+		}
+		StringBuffer verifyCode = new StringBuffer();
+		int i = 0;
+		Random random = new Random();
+		switch (type) {
+		case TYPE_NUM_ONLY:
+			while (i < length) {
+				int t = random.nextInt(10);
+				// 排除特殊字符
+				if (null == excludeString || excludeString.indexOf(t + "") < 0) {
+					verifyCode.append(t);
+					i++;
+				}
+			}
+			break;
+		case TYPE_LETTER_ONLY:
+			while (i < length) {
+				int t = random.nextInt(123);
+				if ((t >= 97 || (t >= 65 && t <= 90)) && (null == excludeString || excludeString.indexOf((char) t) < 0)) {
+					verifyCode.append((char) t);
+					i++;
+				}
+			}
+			break;
+		case TYPE_ALL_MIXED:
+			while (i < length) {
+				int t = random.nextInt(123);
+				if ((t >= 97 || (t >= 65 && t <= 90) || (t >= 48 && t <= 57)) && (null == excludeString || excludeString.indexOf((char) t) < 0)) {
+					verifyCode.append((char) t);
+					i++;
+				}
+			}
+			break;
+		case TYPE_NUM_UPPER:
+			while (i < length) {
+				int t = random.nextInt(91);
+				if ((t >= 65 || (t >= 48 && t <= 57)) && (null == excludeString || excludeString.indexOf((char) t) < 0)) {
+					verifyCode.append((char) t);
+					i++;
+				}
+			}
+			break;
+		case TYPE_NUM_LOWER:
+			while (i < length) {
+				int t = random.nextInt(123);
+				if ((t >= 97 || (t >= 48 && t <= 57)) && (null == excludeString || excludeString.indexOf((char) t) < 0)) {
+					verifyCode.append((char) t);
+					i++;
+				}
+			}
+			break;
+		case TYPE_UPPER_ONLY:
+			while (i < length) {
+				int t = random.nextInt(91);
+				if ((t >= 65) && (null == excludeString || excludeString.indexOf((char) t) < 0)) {
+					verifyCode.append((char) t);
+					i++;
+				}
+			}
+			break;
+		case TYPE_LOWER_ONLY:
+			while (i < length) {
+				int t = random.nextInt(123);
+				if ((t >= 97) && (null == excludeString || excludeString.indexOf((char) t) < 0)) {
+					verifyCode.append((char) t);
+					i++;
+				}
+			}
+			break;
+		}
+		return verifyCode.toString();
+	}
+
+	/**
+	 * 已有验证码,生成验证码图片
+	 * 
+	 * @param textCode
+	 *            文本验证码
+	 * @param width
+	 *            图片宽度(注意此宽度若过小,容易造成验证码文本显示不全,如4个字符的文本可使用85到90的宽度)
+	 * @param height
+	 *            图片高度
+	 * @param interLine
+	 *            图片中干扰线的条数
+	 * @param randomLocation
+	 *            每个字符的高低位置是否随机
+	 * @param backColor
+	 *            图片颜色,若为null则表示采用随机颜色
+	 * @param foreColor
+	 *            字体颜色,若为null则表示采用随机颜色
+	 * @param lineColor
+	 *            干扰线颜色,若为null则表示采用随机颜色
+	 * @return 图片缓存对象
+	 */
+	public static BufferedImage generateImageCode(String textCode, int width, int height, int interLine, boolean randomLocation, Color backColor, Color foreColor, Color lineColor) {
+		// 创建内存图像
+		BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+		// 获取图形上下文
+		Graphics graphics = bufferedImage.getGraphics();
+		// 画背景图
+		graphics.setColor(null == backColor ? generateRandomColor() : backColor);
+		graphics.fillRect(0, 0, width, height);
+		// 画干扰线
+		Random random = new Random();
+		if (interLine > 0) {
+			int x = 0, y = 0, x1 = width, y1 = 0;
+			for (int i = 0; i < interLine; i++) {
+				graphics.setColor(null == lineColor ? generateRandomColor() : lineColor);
+				y = random.nextInt(height);
+				y1 = random.nextInt(height);
+				graphics.drawLine(x, y, x1, y1);
+			}
+		}
+		// 字体大小为图片高度的80%
+		int fsize = (int) (height * 0.8);
+		int fx = height - fsize;
+		int fy = fsize;
+		// 设定字体
+		graphics.setFont(new Font("Default", Font.PLAIN, fsize));
+		// 写验证码字符
+		for (int i = 0; i < textCode.length(); i++) {
+			fy = randomLocation ? (int) ((Math.random() * 0.3 + 0.6) * height) : fy;
+			graphics.setColor(null == foreColor ? generateRandomColor() : foreColor);
+			// 将验证码字符显示到图象中
+			graphics.drawString(textCode.charAt(i) + "", fx, fy);
+			fx += fsize * 0.9;
+		}
+		graphics.dispose();
+		return bufferedImage;
+	}
+}

src/main/java/com/dashitech/utils/CommonUtil.java

@@ -0,0 +1,250 @@
+package com.dashitech.utils;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.*;
+
+/**
+ * 混杂工具类
+ * Created by CX on 2017/3/31 0031.
+ */
+public class CommonUtil {
+    private static final Logger LOG = LoggerFactory.getLogger(CommonUtil.class);
+
+    private CommonUtil(){}
+
+    public static <T> List<?> transList(List<?> list) {
+        return list;
+    }
+
+    /**
+     * 把新地址加入到classpath中
+     * @param path 新地址,绝对路劲
+     * @return  是否成功
+     */
+    public static boolean addJavaClassPath(String path) {
+        try {
+            File programRootDir = new File(path);
+            URLClassLoader classLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
+            Method add = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class});
+            add.setAccessible(true);
+            add.invoke(classLoader, programRootDir.toURI().toURL());
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 在source的下标 start和end中间插入newStr
+     */
+    public static String cutInsertString(String source, int start, int end, String newStr) {
+        String startStr = source.substring(0, start);
+        String endStr = source.substring(end, source.length());
+        String result = startStr + newStr + endStr;
+        return result;
+    }
+
+    /**
+     * 获取中文类型长度，中文长度2，其他1
+     */
+    public static int getChineseLength(String source) {
+        int valueLength = 0;
+        String chinese = "[\u0391-\uFFE5]";
+		/* 获取字段值的长度，如果含中文字符，则每个中文字符长度为2，否则为1 */
+        for (int i = 0; i < source.length(); i++) {
+			/* 获取一个字符 */
+            String temp = source.substring(i, i + 1);
+			/* 判断是否为中文字符 */
+            if (temp.matches(chinese)) {
+				/* 中文字符长度为2 */
+                valueLength += 2;
+            } else {
+				/* 其他字符长度为1 */
+                valueLength += 1;
+            }
+        }
+        return valueLength;
+    }
+
+    /**
+     * 获取翻页数
+     *
+     * @param itemTotal
+     *            总条数
+     * @param PageCount
+     *            一页数
+     * @return 翻页数
+     */
+    public static int getPageTotal(Integer itemTotal, int PageCount) {
+        // 设置总页数
+        int total = 0;
+        if (itemTotal % PageCount == 0) {
+            total = itemTotal / PageCount;
+        } else {
+            total = (itemTotal / PageCount) + 1;
+        }
+        return total;
+    }
+
+    /**
+     * 自己写sql分页必须处理pageIndex
+     */
+    public static int getPageIndex(int pageIndex,int showCount) {
+        int result = 0;
+        if(pageIndex <= 1) {
+            result = 0;
+        }else if(pageIndex > 1) {
+            result = ((pageIndex * showCount) - showCount);
+        }
+        return result;
+    }
+
+    /**
+     * url中文编码
+     */
+    public static String urlEncode(String url) {
+        String s = url;
+        try {
+            s = URLEncoder.encode(url, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return s;
+    }
+
+    /**
+     * url中文解码
+     */
+    public static String urlDecode(String url) {
+        String s = url;
+        try {
+            s = URLDecoder.decode(url, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return s;
+    }
+
+    /**
+     * 排序
+     * @param list
+     * @param field 字段名称，必须有get方法
+     * @param fieldType 字段类型
+     */
+    public static void sort(List<?> list,final String field,final String fieldType) {
+        Collections.sort(list, new Comparator<Object>() {
+            public int compare(Object o1, Object o2) {
+                Method m = null;
+                try {
+                    String getKey = "get" + field.toUpperCase().charAt(0) + field.substring(1, field.length());
+                    m = o1.getClass().getMethod(getKey);
+                    Object o1Value = m.invoke(o1);
+
+                    m = o2.getClass().getMethod(getKey);
+                    Object o2Value = m.invoke(o2);
+
+                    if(o1Value == null && o2Value == null) {
+                        return 0;
+                    }else if(o1Value == null && o2Value != null) {
+                        return -1;
+                    }else if(o1Value != null && o2Value == null) {
+                        return 1;
+                    }
+
+                    if("Integer".equals(fieldType.toString())) {
+                        Integer _o1 = (Integer)o1Value;
+                        Integer _o2 = (Integer)o2Value;
+                        return _o1.compareTo(_o2);
+                    }else if("String".equals(fieldType.toString())) {
+                        String _o1 = (String)o1Value;
+                        String _o2 = (String)o2Value;
+                        return _o1.compareTo(_o2);
+                    }else if("StringNumber".equals(fieldType.toString())) {
+                        try{
+                            Double _o1 = Double.valueOf(o1Value.toString());
+                            Double _o2 = Double.valueOf(o2Value.toString());
+                            return _o1.compareTo(_o2);
+                        }catch (NumberFormatException ex) {
+                            ex.printStackTrace();
+                        }
+                    }
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return 0;
+            }
+        });
+    }
+
+    /**
+     * 逻辑分页
+     *
+     * @param src
+     *            源数据
+     * @param start
+     *            分页页数，1起始
+     * @param size
+     *            分页limit
+     * @return 新的分页后的List
+     * @throws Exception
+     */
+    public static <T> List<T> paginateList(List<T> src, int start, int size) {
+        if(src == null) {
+            return Collections.emptyList();
+        }
+
+        List<T> list = null;
+        if(start <= 1) {
+            start = 0;
+        }else {
+            start = (start-1) * size;
+        }
+
+        size = size + start;
+        if (size > src.size()) {
+            size = src.size();
+        }
+
+        try {
+            list = src.subList(start, size);
+        } catch (Exception e) {
+            System.out.println("list.size:"+src.size()+"start:" + start + " , size" + size);
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+
+    /**
+     * map.toString之后，转回map
+     */
+    public static Map<String,String> string2Map(String mapString) {
+        Map<String,String> map = new LinkedHashMap<String,String>();
+        try {
+            if(StringUtils.isNotEmpty(mapString)) {
+                String args = mapString.substring(1,mapString.length()-1);
+                String[] argArr = args.split(", ");
+                for (String entry : argArr) {
+                    int index = entry.indexOf("=");
+                    String key = entry.substring(0,index);
+                    String value = entry.substring(index+1);
+                    map.put(key, value);
+                }
+            }
+        }catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return map;
+    }
+}

src/main/java/com/dashitech/utils/DateUtil.java

@@ -0,0 +1,318 @@
+package com.dashitech.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+public class DateUtil {
+    private static final int FIRST_DAY = Calendar.MONDAY;
+    public final static SimpleDateFormat SDF_DATE = new SimpleDateFormat("yyyy-MM-dd");
+    public final static SimpleDateFormat SDF_DATETIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    
+    
+	private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	
+	public static String formatTimestamp(Date date){
+		String formattedDate = dateFormat.format(date);
+		return formattedDate;
+	}
+	
+	public static Date parseTimestamp(String text){
+		try {
+			return dateFormat.parse(text);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+    private static void setToFirstDay(Calendar calendar) {
+        while (calendar.get(Calendar.DAY_OF_WEEK) != FIRST_DAY) {
+            calendar.add(Calendar.DATE, -1);
+        }
+    }
+    
+    public static String formatDateTime (Date date) {
+    	return SDF_DATETIME.format(date);
+    }
+    
+    public static String formatDate (Date date) {
+    	return SDF_DATE.format(date);
+    }
+
+	public static Date parseUTCDateTime(String date){
+		Date d = null;
+		try {
+			date = date.replace("Z", " UTC");//注意是空格+UTC
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");//注意格式化的表达式
+			d = format.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return d;
+	}
+    
+    public static Date parseDateTime(String date){
+    	Date d = null;
+    	try {
+			d = SDF_DATETIME.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return d;
+    }
+    
+    public static Date parseDate(String date){
+    	Date d = null;
+    	try {
+			d = SDF_DATE.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return d;
+    }
+
+    /**
+     * 从周一开始7天
+     */
+    public static List<String> getWeekdays(Date date) {
+        List<String> list = new ArrayList<String>();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        
+        setToFirstDay(calendar);
+        
+        for (int i = 0; i < 7; i++) {
+            list.add(SDF_DATE.format(calendar.getTime()));
+            calendar.add(Calendar.DATE, 1);
+        }
+        return list;
+    }
+    
+    /**
+     * 从周一开始7天
+     */
+    public static List<String> getWeekdaysAndColor(Date date) {
+        List<String> list = new ArrayList<String>();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        
+        setToFirstDay(calendar);
+        
+        for (int i = 0; i < 7; i++) {
+        	if(i == 6 || i == 5)
+                list.add("<font class='weekColor'>" + SDF_DATE.format(calendar.getTime()) + "</font>");
+        	else
+        		list.add(SDF_DATE.format(calendar.getTime()));
+            calendar.add(Calendar.DATE, 1);
+        }
+        return list;
+    }
+    public static String getMonday(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        setToFirstDay(calendar);
+        return SDF_DATE.format(calendar.getTime());
+    }
+    
+    public static String getSunday(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        setToFirstDay(calendar);
+        calendar.add(Calendar.DATE, 6);
+        return SDF_DATE.format(calendar.getTime());
+    }
+    
+    /**
+     * 当前日期  + 7
+     * @param date
+     * @return
+     */
+    public static Date getAfterWeekByDay(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, 7);
+        return calendar.getTime();
+    }
+    
+    /**
+     * 当前日期  - 7
+     * @param date
+     * @return
+     */
+    public static Date getBeforeWeekByDay(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, -7);
+        return calendar.getTime();
+    }
+
+    /**
+	 * 获取星期一
+	 * 
+	 * @param date 传入的日期
+	 * @return
+	 */
+	public static Date getMOnday(Date date) {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+		// 判断要计算的日期是否是周日，如果是则减一天计算周六的，否则会出问题，计算到下一周去了
+		int dayWeek = cal.get(Calendar.DAY_OF_WEEK);// 获得当前日期是一个星期的第几天
+		if (1 == dayWeek) {
+			cal.add(Calendar.DAY_OF_MONTH, -1);
+		}
+		cal.setFirstDayOfWeek(Calendar.MONDAY);// 设置一个星期的第一天，按中国的习惯一个星期的第一天是星期一
+		int day = cal.get(Calendar.DAY_OF_WEEK);// 获得当前日期是一个星期的第几天
+		cal.add(Calendar.DATE, cal.getFirstDayOfWeek() - day);// 根据日历的规则，给当前日期减去星期几与一个星期第一天的差值
+		return cal.getTime();
+	}
+
+	/**
+	 * 判断传入的日期的周数是否大于当前日期的周数
+	 * @param dutyDate 传入的日期
+	 * @return
+	 */
+	public static boolean isBeforeThisWeek(Date dutyDate){ 
+		return getMOnday(new Date()).getTime() < getMOnday(dutyDate).getTime();
+	}
+	
+	public static boolean equals(Date d1,Date d2,SimpleDateFormat sdf) {
+	    String a = sdf.format(d1);
+	    String b = sdf.format(d2);
+	    if(a != null && b != null) {
+	        return a.equals(b);
+	    }
+	    return false;
+	}
+
+	public static String ignoreFrmat(String source,SimpleDateFormat sdf) {
+	    List<String> list = Arrays.asList("yyyy-M-d","yyyy-MM-dd","yyyy-M","yyyy-MM","yyyy/M/d","yyyy/MM/dd","yyyy/M","yyyy/MM");
+	    String result = "";
+	    for(int i = 0;i<list.size();i++) {
+	        try {
+                Date d = new SimpleDateFormat(list.get(i)).parse(source);
+                result = sdf.format(d);
+                return result;
+            } catch (Exception e) {
+                
+            }
+	    }
+	    try {
+            Date d = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy",Locale.US).parse(source);
+            result = sdf.format(d);
+        } catch (Exception e) {
+        }
+	    return result;
+	}
+	
+	public static Date ignoreFrmat_Date(String source,SimpleDateFormat sdf) {
+	    String result = ignoreFrmat(source,sdf);
+	    Date d = null;
+        try {
+            d = sdf.parse(result);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+	    return d;
+	}
+	
+	/**
+	 * 两个时间相差天数
+	 * date1  开始时间
+	 * date2  结束时间
+	 * 
+	 * */
+	public static int getMonthSpace(String staticTime, String endTime) throws ParseException {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		long startT=sdf.parse(staticTime).getTime(); //定义开始时间
+		long endT=sdf.parse(endTime).getTime();  //定义结束时间
+		long overDay=(endT-startT) /(1000 * 60 * 60 * 24);
+		int day = Integer.parseInt(String.valueOf(overDay));
+		return day;
+	}
+	
+	/**
+	 * 获取年份
+	 * */
+	private static int getYear(String date1) throws ParseException { 
+	    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 
+	    Calendar cal = Calendar.getInstance(); 
+	    Date dt = null; 
+	    try { 
+	      dt = sdf.parse(date1); 
+	      cal.setTime(dt); 
+	    } catch (ParseException e) { 
+	      // TODO Auto-generated catch block 
+	      e.printStackTrace(); 
+	    } 
+	    int year = cal.get(Calendar.YEAR); 
+	    int month = cal.get(Calendar.MONTH) + 1; 
+	    int day = cal.get(Calendar.DAY_OF_MONTH); 
+	    int hour = cal.get(Calendar.HOUR_OF_DAY); 
+	    int minute = cal.get(Calendar.MINUTE); 
+	    int second = cal.get(Calendar.SECOND); 
+	    return year;
+	  }
+
+	public static boolean isInDates(Date date, Date startDate, Date endDate) {
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date myDate = null;
+		Date dateBegin = null;
+		Date dateEnd = null;
+		String strDate = sd.format(date);
+		String strDateBegin = sd.format(startDate);
+		String strDateEnd = sd.format(endDate);
+		try {
+			myDate = sd.parse(strDate);
+			dateBegin = sd.parse(strDateBegin);
+			dateEnd = sd.parse(strDateEnd);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		strDate = String.valueOf(myDate);
+		strDateBegin = String.valueOf(dateBegin);
+		strDateEnd = String.valueOf(dateEnd);
+
+		int strDateH = Integer.parseInt(strDate.substring(11, 13));
+		int strDateM = Integer.parseInt(strDate.substring(14, 16));
+		int strDateS = Integer.parseInt(strDate.substring(17, 19));
+
+		int strDateBeginH = Integer.parseInt(strDateBegin.substring(11, 13));
+		int strDateBeginM = Integer.parseInt(strDateBegin.substring(14, 16));
+		//int strDateBeginS = Integer.parseInt(strDateBegin.substring(17,19));
+
+		int strDateEndH = Integer.parseInt(strDateEnd.substring(11, 13));
+		int strDateEndM = Integer.parseInt(strDateEnd.substring(14, 16));
+		//int strDateEndS = Integer.parseInt(strDateEnd.substring(17,19));
+
+		if ((strDateH >= strDateBeginH && strDateH <= strDateEndH)) {
+			if (strDateH > strDateBeginH && strDateH < strDateEndH) {
+				return true;
+			} else if (strDateH == strDateBeginH && strDateM > strDateBeginM && strDateH < strDateEndH) {
+				return true;
+			} else if (strDateH == strDateBeginH && strDateM == strDateBeginM && strDateH < strDateEndH) {
+				return true;
+			} else if (strDateH == strDateBeginH && strDateM == strDateBeginM && strDateH < strDateEndH) {
+				return true;
+			} else if (strDateH > strDateBeginH && strDateH == strDateEndH && strDateM < strDateEndM) {
+				return true;
+			} else if (strDateH > strDateBeginH && strDateH == strDateEndH && strDateM == strDateEndM) {
+				return true;
+			} else if (strDateH > strDateBeginH && strDateH == strDateEndH && strDateM == strDateEndM) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+	
+}	

src/main/java/com/dashitech/utils/DateUtil2.java

@@ -0,0 +1,670 @@
+package com.dashitech.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+
+public class DateUtil2 {
+
+    public static final String FORMAT_DATE = "yyyy-MM-dd";
+
+    public static final String FORMAT_TIME = "HH:mm:ss";
+
+    public static final String FORMAT_DATE_TIME = "yyyy-MM-dd HH:mm:ss";
+
+    public static final SimpleDateFormat SDFD = new SimpleDateFormat(FORMAT_DATE);
+
+    public static final SimpleDateFormat SDFT = new SimpleDateFormat(FORMAT_TIME);
+
+    public static final SimpleDateFormat SDFDT = new SimpleDateFormat(FORMAT_DATE_TIME);
+
+    /**
+     * 得到以yyyy-MM-dd格式表示的当前日期字符串
+     */
+    public static String getCurrentDate() {
+        // return sdfd.format(new Date());
+        GregorianCalendar tGCalendar = new GregorianCalendar();
+        StringBuffer tStringBuffer = new StringBuffer(10);
+        int sYears = tGCalendar.get(Calendar.YEAR);
+        tStringBuffer.append(sYears);
+        tStringBuffer.append('-');
+        int sMonths = tGCalendar.get(Calendar.MONTH) + 1;
+        if (sMonths < 10) {
+            tStringBuffer.append('0');
+        }
+        tStringBuffer.append(sMonths);
+        tStringBuffer.append('-');
+        int sDays = tGCalendar.get(Calendar.DAY_OF_MONTH);
+        if (sDays < 10) {
+            tStringBuffer.append('0');
+        }
+        tStringBuffer.append(sDays);
+        String tString = tStringBuffer.toString();
+        return tString;
+    }
+
+    /**
+     * 得到以format格式表示的当前日期字符串
+     */
+    public static String getCurrentDate(String format) {
+        SimpleDateFormat t = new SimpleDateFormat(format);
+        return t.format(new Date());
+    }
+
+    /**
+     * 得到以HH:mm:ss表示的当前时间字符串
+     */
+    public static String getCurrentTime() {
+        // return sdft.format(new Date());
+        GregorianCalendar tGCalendar = new GregorianCalendar();
+        StringBuffer tStringBuffer = new StringBuffer(8);
+        int sHOUR = tGCalendar.get(Calendar.HOUR_OF_DAY);
+        if (sHOUR < 10) {
+            tStringBuffer.append('0');
+        }
+        tStringBuffer.append(sHOUR);
+        tStringBuffer.append(':');
+        int sMINUTE = tGCalendar.get(Calendar.MINUTE);
+        if (sMINUTE < 10) {
+            tStringBuffer.append('0');
+        }
+        tStringBuffer.append(sMINUTE);
+        tStringBuffer.append(':');
+        int sSECOND = tGCalendar.get(Calendar.SECOND);
+        if (sSECOND < 10) {
+            tStringBuffer.append('0');
+        }
+        tStringBuffer.append(sSECOND);
+        String tString = tStringBuffer.toString();
+        return tString;
+    }
+
+    /**
+     * 得到以format格式表示的当前时间字符串
+     */
+    public static String getCurrentTime(String format) {
+        SimpleDateFormat t = new SimpleDateFormat(format);
+        return t.format(new Date());
+    }
+
+    /**
+     * 得到以yyyy-MM-dd HH:mm:ss表示的当前时间字符串
+     */
+    public static String getCurrentDateTime() {
+        String format = FORMAT_DATE + " " + FORMAT_TIME;
+        return getCurrentDateTime(format);
+    }
+
+    public static int getDayOfWeek() {
+        Calendar cal = Calendar.getInstance();
+        return cal.get(Calendar.DAY_OF_WEEK);
+    }
+
+    public static int getDayOfWeek(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.DAY_OF_WEEK);
+    }
+
+    public static int getDayOfMonth() {
+        Calendar cal = Calendar.getInstance();
+        return cal.get(Calendar.DAY_OF_MONTH);
+    }
+
+    public static int getDayOfMonth(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.DAY_OF_MONTH);
+    }
+
+    // 获取某一个月的天数
+    public static int getMaxDayOfMonth(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.getActualMaximum(Calendar.DATE);
+    }
+
+    // 获取某月的第一天
+    public static String getFirstDayOfMonth(String date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(parse(date));
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        return SDFD.format(cal.getTime());
+    }
+
+    public static int getDayOfYear() {
+        Calendar cal = Calendar.getInstance();
+        return cal.get(Calendar.DAY_OF_YEAR);
+    }
+
+    public static int getDayOfYear(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.DAY_OF_YEAR);
+    }
+
+    public static int getDayOfWeek(String date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(parse(date));
+        return cal.get(Calendar.DAY_OF_WEEK);
+    }
+
+    public static int getDayOfMonth(String date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(parse(date));
+        return cal.get(Calendar.DAY_OF_MONTH);
+    }
+
+    public static int getDayOfYear(String date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(parse(date));
+        return cal.get(Calendar.DAY_OF_YEAR);
+    }
+
+    public static String getCurrentDateTime(String format) {
+        SimpleDateFormat t = new SimpleDateFormat(format);
+        return t.format(new Date());
+    }
+
+    /**
+     * 输出只带日期的字符串
+     */
+    public static String toString(Date date) {
+        if (date == null) {
+            return "";
+        }
+        return SDFD.format(date);
+    }
+
+    /**
+     * 输出带有日期和时间的字符串
+     */
+    public static String toDateTimeString(Date date) {
+        if (date == null) {
+            return "";
+        }
+        return SDFDT.format(date);
+    }
+
+    /**
+     * 按指定的format输出日期字符串
+     */
+    public static String toString(Date date, String format) {
+        SimpleDateFormat t = new SimpleDateFormat(format);
+        return t.format(date);
+    }
+
+    /**
+     * 输出只带时间的字符串
+     */
+    public static String toTimeString(Date date) {
+        if (date == null) {
+            return "";
+        }
+        return SDFDT.format(date);
+    }
+
+    public static int compare(String date1, String date2) {
+        return compare(date1, date2, FORMAT_DATE);
+    }
+
+    public static int compareTime(String time1, String time2) {
+        return compareTime(time1, time2, FORMAT_TIME);
+    }
+
+    public static int compare(String date1, String date2, String format) {
+        Date d1 = parse(date1, format);
+        Date d2 = parse(date2, format);
+        return d1.compareTo(d2);
+    }
+
+    public static int compareTime(String time1, String time2, String format) {
+        String[] arr1 = time1.split(":");
+        String[] arr2 = time2.split(":");
+        if (arr1.length < 2) {
+            throw new RuntimeException("错误的时间值:" + time1);
+        }
+        if (arr2.length < 2) {
+            throw new RuntimeException("错误的时间值:" + time2);
+        }
+        int h1 = Integer.parseInt(arr1[0]);
+        int m1 = Integer.parseInt(arr1[1]);
+        int h2 = Integer.parseInt(arr2[0]);
+        int m2 = Integer.parseInt(arr2[1]);
+        int s1 = 0, s2 = 0;
+        if (arr1.length == 3) {
+            s1 = Integer.parseInt(arr1[2]);
+        }
+        if (arr2.length == 3) {
+            s2 = Integer.parseInt(arr2[2]);
+        }
+        if (h1 < 0 || h1 > 23 || m1 < 0 || m1 > 59 || s1 < 0 || s1 > 59) {
+            throw new RuntimeException("错误的时间值:" + time1);
+        }
+        if (h2 < 0 || h2 > 23 || m2 < 0 || m2 > 59 || s2 < 0 || s2 > 59) {
+            throw new RuntimeException("错误的时间值:" + time2);
+        }
+        if (h1 != h2) {
+            return h1 > h2 ? 1 : -1;
+        } else {
+            if (m1 == m2) {
+                if (s1 == s2) {
+                    return 0;
+                } else {
+                    return s1 > s2 ? 1 : -1;
+                }
+            } else {
+                return m1 > m2 ? 1 : -1;
+            }
+        }
+    }
+
+    public static boolean isTime(String time) {
+        String[] arr = time.split(":");
+        if (arr.length < 2) {
+            return false;
+        }
+        try {
+            int h = Integer.parseInt(arr[0]);
+            int m = Integer.parseInt(arr[1]);
+            int s = 0;
+            if (arr.length == 3) {
+                s = Integer.parseInt(arr[2]);
+            }
+            if (h < 0 || h > 23 || m < 0 || m > 59 || s < 0 || s > 59) {
+                return false;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isDate(String date) {
+        String[] arr = date.split("-");
+        if (arr.length < 3) {
+            return false;
+        }
+        try {
+            int y = Integer.parseInt(arr[0]);
+            int m = Integer.parseInt(arr[1]);
+            int d = Integer.parseInt(arr[2]);
+            if (y < 0 || m > 12 || m < 0 || d < 0 || d > 31) {
+                return false;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isWeekend(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int t = cal.get(Calendar.DAY_OF_WEEK);
+        if (t == Calendar.SATURDAY || t == Calendar.SUNDAY) {
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean isWeekend(String str) {
+        return isWeekend(parse(str));
+    }
+
+    public static Date parse(String str) {
+        if (StringUtils.isEmpty(str)) {
+            return null;
+        }
+        try {
+            return SDFD.parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static Date parse(String str, String format) {
+        if (StringUtils.isEmpty(str)) {
+            return null;
+        }
+        try {
+            SimpleDateFormat t = new SimpleDateFormat(format);
+            return t.parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static Date parseDateTime(String str) {
+        if (StringUtils.isEmpty(str)) {
+            return null;
+        }
+        if (str.length() == 10) {
+            return parse(str);
+        }
+        try {
+            return SDFDT.parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static Date parseDateTime(String str, String format) {
+        if (StringUtils.isEmpty(str)) {
+            return null;
+        }
+        try {
+            SimpleDateFormat t = new SimpleDateFormat(format);
+            return t.parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 格式化时间，按照yyyy-MM-dd HH:mm:ss格式
+     * 
+     * @param date
+     *            时间
+     * 
+     * @return String
+     */
+    public static String formatDateTime(Date date) {
+        return SDFDT.format(date);
+    }
+
+    /**
+     * 格式化时间，按照yyyy-MM-dd格式
+     * 
+     * @param date
+     *            时间
+     * 
+     * @return String
+     */
+    public static String formatDate(Date date) {
+        return SDFD.format(date);
+    }
+
+    /**
+     * 日期date上加count分钟，count为负表示减
+     */
+    public static Date addMinute(Date date, int count) {
+        return new Date(date.getTime() + 60000L * count);
+    }
+
+    /**
+     * 日期date上加count妙，count为负表示减
+     */
+    public static Date addSeconds(Date date, int count) {
+        return new Date(date.getTime() + 1000L * count);
+    }
+
+    /**
+     * 日期date上加count小时，count为负表示减
+     */
+    public static Date addHour(Date date, int count) {
+        return new Date(date.getTime() + 3600000L * count);
+    }
+
+    /**
+     * 日期date上加count天，count为负表示减
+     */
+    public static Date addDay(Date date, int count) {
+        return new Date(date.getTime() + 86400000L * count);
+    }
+
+    /**
+     * 日期date上加count星期，count为负表示减
+     */
+    public static Date addWeek(Date date, int count) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        c.add(Calendar.WEEK_OF_YEAR, count);
+        return c.getTime();
+    }
+
+    /**
+     * 日期date上加count月，count为负表示减
+     */
+    public static Date addMonth(Date date, int count) {
+        /* ${_ZVING_LICENSE_CODE_} */
+
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        c.add(Calendar.MONTH, count);
+        return c.getTime();
+    }
+
+    /**
+     * 日期date上加count年，count为负表示减
+     */
+    public static Date addYear(Date date, int count) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        c.add(Calendar.YEAR, count);
+        return c.getTime();
+    }
+
+    /**
+     * 根据一个日期，返回是星期几的字符串
+     * 
+     * @param date
+     * @return
+     */
+    public static String getWeek(String date) {
+        String[] weeks = { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" };
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(parse(date));
+        int week_index = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (week_index < 0) {
+            week_index = 0;
+        }
+        return weeks[week_index];
+    }
+
+    /**
+     * 获取一周列表
+     * 
+     * @return List
+     * 
+     */
+    public static List<Map<String, String>> getWeekdayList() {
+        String[] weekday = { "周一", "周二", "周三", "周四", "周五", "周六", "周日" };
+        List<Map<String, String>> weekdayList = new ArrayList<Map<String, String>>();
+        for (int i = 0; i < weekday.length; i++) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("name", weekday[i]);
+            map.put("value", String.valueOf(i + 1));
+            map.put("checked", "");
+            weekdayList.add(map);
+        }
+        return weekdayList;
+    }
+
+    /**
+     * 日期返回星期几
+     * 
+     * @param date
+     * 
+     * @return int
+     */
+    public static int dayOfWeek(String date) {
+        try {
+            Calendar c = Calendar.getInstance();
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            c.setTime(dateFormat.parse(date));
+            int dayOfWeek = c.get(Calendar.DAY_OF_WEEK) - 1;
+            return dayOfWeek == 0 ? 7 : dayOfWeek;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 取得当前日期是多少周
+     * 
+     * @param date
+     * @return
+     */
+    public static int getWeekOfYear(Date date) {
+        Calendar c = new GregorianCalendar();
+        c.setFirstDayOfWeek(Calendar.MONDAY);
+        c.setMinimalDaysInFirstWeek(7);
+        c.setTime(date);
+
+        return c.get(Calendar.WEEK_OF_YEAR);
+    }
+
+    /**
+     * 得到某年某周的第一天
+     * 
+     * @param year
+     * @param week
+     * @return
+     */
+    public static String getFirstDayOfWeek(int year, int week) {
+        Calendar c = new GregorianCalendar();
+        c.set(Calendar.YEAR, year);
+        c.set(Calendar.MONTH, Calendar.JANUARY);
+        c.set(Calendar.DATE, 1);
+
+        Calendar cal = (GregorianCalendar) c.clone();
+        cal.add(Calendar.DATE, week * 7);
+
+        return formatDate(getFirstDayOfWeek(cal.getTime()));
+    }
+
+    /**
+     * 得到某年某周的最后一天
+     * 
+     * @param year
+     * @param week
+     * @return
+     */
+    public static String getLastDayOfWeek(int year, int week) {
+        Calendar c = new GregorianCalendar();
+        c.set(Calendar.YEAR, year);
+        c.set(Calendar.MONTH, Calendar.JANUARY);
+        c.set(Calendar.DATE, 1);
+
+        Calendar cal = (GregorianCalendar) c.clone();
+        cal.add(Calendar.DATE, week * 7);
+
+        return formatDate(getLastDayOfWeek(cal.getTime()));
+    }
+
+    /**
+     * 取得当前日期所在周的第一天
+     * 
+     * @param date
+     * @return
+     */
+    public static Date getFirstDayOfWeek(Date date) {
+        Calendar c = new GregorianCalendar();
+        c.setFirstDayOfWeek(Calendar.MONDAY);
+        c.setTime(date);
+        c.set(Calendar.DAY_OF_WEEK, c.getFirstDayOfWeek()); // Monday
+        return c.getTime();
+    }
+
+    /**
+     * 取得当前日期所在周的最后一天
+     * 
+     * @param date
+     * @return
+     */
+    public static Date getLastDayOfWeek(Date date) {
+        Calendar c = new GregorianCalendar();
+        c.setFirstDayOfWeek(Calendar.MONDAY);
+        c.setTime(date);
+        c.set(Calendar.DAY_OF_WEEK, c.getFirstDayOfWeek() + 6); // Sunday
+        return c.getTime();
+    }
+
+    /**
+     * 取得当前月份的第一天
+     * 
+     * @param date
+     * @return
+     */
+    public static String getFirstDayOfMonth(Date date) {
+        Calendar c = new GregorianCalendar();
+        c.setTime(date);
+        c.set(Calendar.DAY_OF_MONTH, 1);
+        return formatDate(c.getTime());
+    }
+
+    /**
+     * 获取N天前的日期
+     * 
+     * @param date
+     *            当前日期 num 几天前
+     * @return
+     * */
+    public static Date getBeginData(Date date, int num) {
+        Calendar c = new GregorianCalendar();
+        c.setTime(date);
+        c.add(Calendar.DATE, -num);
+        return c.getTime();
+    }
+
+    public static int getBetweenDays(Date d1, Date nextD) {
+        Calendar c1 = new GregorianCalendar();
+        c1.setTime(d1);
+        Calendar c2 = new GregorianCalendar();
+        c2.setTime(nextD);
+        return c1.get(Calendar.DAY_OF_YEAR) - c2.get(Calendar.DAY_OF_YEAR);
+    }
+
+    public static int getBetweenMinutes(Date max, Date min) {
+        Calendar c1 = new GregorianCalendar();
+        c1.setTime(max);
+        Calendar c2 = new GregorianCalendar();
+        c2.setTime(min);
+        return (int) ((c1.getTimeInMillis() - c2.getTimeInMillis()) / (1000 * 60));
+    }
+
+    /**
+     * 获取当前年
+     * 
+     * @return
+     */
+    public static int getCurrentYear() {
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        return year;
+    }
+
+    /**
+     * 获取当前月
+     * 
+     * @return
+     */
+    public static int getCurrentMonth() {
+        Calendar cal = Calendar.getInstance();
+        int month = cal.get(Calendar.MONTH) + 1;
+        return month;
+    }
+    
+    /**
+     * 把年月日变数字
+     * */
+    public static int getDate(String date){
+    	String [] date1 = date.split("-");
+    	int date2 = Integer.parseInt(date1[0]+date1[1]+date1[2]);
+    	return date2;
+    }
+}

src/main/java/com/dashitech/utils/DecimalUtil.java

@@ -0,0 +1,49 @@
+package com.dashitech.utils;
+
+import java.math.BigDecimal;
+
+
+
+/**
+ * 价格计算工具类
+ */
+public class DecimalUtil {
+	private static final int DIV_SCALE = 50;
+ 
+	/**
+	 * 相加
+	 */
+	public static BigDecimal sum(Object first,Object second) {
+		BigDecimal _first = new BigDecimal(first.toString());
+		BigDecimal _second = new BigDecimal(second.toString());
+		return _first.add(_second);
+	}
+	
+	/**
+	 * 相减
+	 */
+	public static BigDecimal sub(Object first,Object second) {
+		BigDecimal _first = new BigDecimal(first.toString());
+		BigDecimal _second = new BigDecimal(second.toString());
+		return _first.subtract(_second);
+	}
+	
+	/**
+	 * 相乘
+	 */
+	public static BigDecimal ride(Object first,Object second) {
+		BigDecimal _first = new BigDecimal(first.toString());
+		BigDecimal _second = new BigDecimal(second.toString());
+		return _first.multiply(_second);
+    }
+	
+	/**
+	 * 相除
+	 */
+	public static BigDecimal div(Object first,Object second) {
+		BigDecimal _first = new BigDecimal(first.toString());
+		BigDecimal _second = new BigDecimal(second.toString());
+		 return _first.divide(_second,DIV_SCALE,BigDecimal.ROUND_HALF_DOWN);
+	}
+
+}

src/main/java/com/dashitech/utils/FileUtil.java

@@ -0,0 +1,675 @@
+package com.dashitech.utils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+
+public class FileUtil {
+	private static Log log = LogFactory.getLog(FileUtil.class);
+	
+	/**
+	 * 根据日期给文件排序，
+	 * @param list
+	 * @param desc true为倒序(最新日期在前面)，false正序
+	 */
+	public static void sortByDate(List<File> list,final boolean desc) {
+		Collections.sort(list, new Comparator<File>() {
+			public int compare(File o1, File o2) {
+				Long a = o1.lastModified();
+				Long b = o2.lastModified();
+				int sort = 0;
+				if(desc) {
+					sort = b.compareTo(a);
+				}else {
+					sort = a.compareTo(b);
+				}
+				return sort;
+			}
+		});
+	}
+
+	/**
+	 * 写文件
+	 * 
+	 * @param f
+	 * @param content
+	 */
+	public static void writeFile(File f, String content) {
+		writeFile(f, content, "utf-8");
+	}
+
+	/**
+	 * 写文件
+	 * 
+	 * @param f
+	 * @param content
+	 */
+	public static void writeFile(File f, String content, String encode) {
+		try {
+			// 如果目录不存在，创建目录
+			File parent = new File(f.getParent());
+			parent.mkdirs();
+
+			if (!f.exists()) {
+				f.createNewFile();
+			}
+			OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(f), encode);
+			BufferedWriter utput = new BufferedWriter(osw);
+			FileOutputStream fo = null;
+			try {
+				fo = new FileOutputStream(f);
+				osw = new OutputStreamWriter(fo, encode);
+				utput = new BufferedWriter(osw);
+				utput.write(content);
+				utput.flush();
+			} catch (IOException ioException) {
+				ioException.printStackTrace();
+			} finally {
+				try {
+					if (fo != null) {
+						fo.close();
+					}
+					if (utput != null) {
+						utput.close();
+					}
+					if (osw != null) {
+						osw.close();
+					}
+				} catch (IOException e) {
+					log.error(e.getMessage(), e);
+				}
+			}
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * 写出url内容为文件
+	 * @param file 写出的文件
+	 * @param url 写出的内容
+	 */
+	public static void writeFileByUrl(String file, String url) {
+		byte[] bytes = null;
+		InputStream in = null;
+		ByteArrayOutputStream bos = null;
+		
+		try {
+			URL resourceUrl = new URL(url);
+			in = (InputStream) resourceUrl.getContent();
+			
+			bos = new ByteArrayOutputStream();
+			byte[] b = new byte[1024];
+			int n;
+			while ((n = in.read(b)) != -1) {
+				bos.write(b, 0, n);
+			}
+			
+			bytes = bos.toByteArray();
+			
+			File f = new File(file);
+			
+			writeFile(f, bytes);
+			
+		} catch (IOException e) {
+			log.error(file+"   "+url);
+			log.error(e.getMessage(),e);
+		} finally {
+			try {
+				if (in != null) {
+					in.close();
+				}
+				if (bos != null) {
+					bos.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getMessage(), e);
+			}
+		}
+	}
+
+	/**
+	 * 写文件
+	 * 
+	 * @param f
+	 * @param bytes
+	 */
+	public static void writeFile(File f, byte[] bytes) {
+		try {
+			// 如果目录不存在，创建目录
+			File parent = new File(f.getParent());
+			parent.mkdirs();
+
+			if (!f.exists()) {
+				f.createNewFile();
+			}
+
+			BufferedOutputStream bos = null;
+			FileOutputStream fo = null;
+			try {
+				fo = new FileOutputStream(f);
+				bos = new BufferedOutputStream(fo);
+				bos.write(bytes);
+				bos.flush();
+			} catch (IOException ioException) {
+				ioException.printStackTrace();
+			} finally {
+				try {
+					if (fo != null) {
+						fo.close();
+					}
+					if (bos != null) {
+						bos.close();
+					}
+				} catch (IOException e) {
+					log.error(e.getMessage(), e);
+				}
+			}
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * 写文件
+	 * 
+	 * @param path
+	 * @param content
+	 */
+	public static void writeFile(String path, String content, String encode) {
+		File f = new File(path);
+		writeFile(f, content, encode);
+	}
+
+	/**
+	 * 写文件
+	 * 
+	 * @param path
+	 * @param content
+	 */
+	public static void writeFile(String path, String content) {
+		File f = new File(path);
+		writeFile(f, content, "utf-8");
+	}
+
+	/**
+	 * 读取文件
+	 * 
+	 * @param file
+	 * @return
+	 */
+	public static String readFile(File file) {
+		return readFile(file, "UTF-8");
+	}
+
+	/**
+	 * 读取文件
+	 * 
+	 * @param file
+	 * @return
+	 */
+	public static String readFile(File file, String encode) {
+		String output = "";
+		InputStreamReader isr = null;
+		BufferedReader input = null;
+
+		if (file.exists()) {
+			if (file.isFile()) {
+				try {
+					isr = new InputStreamReader(new FileInputStream(file), encode);
+					input = new BufferedReader(isr);
+					StringBuffer buffer = new StringBuffer();
+					String text;
+					while ((text = input.readLine()) != null)
+						buffer.append(text + "\n");
+					output = buffer.toString();
+
+				} catch (IOException ioException) {
+					ioException.printStackTrace();
+				} finally {
+					try {
+						if (input != null) {
+							input.close();
+						}
+						if (isr != null) {
+							isr.close();
+						}
+					} catch (IOException e) {
+						log.error(e.getMessage(), e);
+					}
+				}
+			} else if (file.isDirectory()) {
+				throw new RuntimeException(file.getPath() + " isDirectory！");
+			}
+
+		} else {
+			throw new RuntimeException(file.getPath() + " Does not exist！");
+		}
+
+		return output;
+	}
+
+	public static byte[] readFileBytes(File file) {
+		byte[] bytes = null;
+		FileInputStream fis = null;
+		ByteArrayOutputStream bos = null;
+		if (file.exists()) {
+			if (file.isFile()) {
+				try {
+					fis = new FileInputStream(file);
+					bos = new ByteArrayOutputStream();
+					byte[] b = new byte[1024];
+					int n;
+					while ((n = fis.read(b)) != -1) {
+						bos.write(b, 0, n);
+					}
+					fis.close();
+					bos.close();
+					bytes = bos.toByteArray();
+				} catch (IOException ioException) {
+					ioException.printStackTrace();
+				} finally {
+					try {
+						if (fis != null) {
+							fis.close();
+						}
+						if (bos != null) {
+							bos.close();
+						}
+					} catch (IOException e) {
+						log.error(e.getMessage(), e);
+					}
+				}
+			} else if (file.isDirectory()) {
+				throw new RuntimeException(file.getPath() + " isDirectory！");
+			}
+
+		} else {
+			throw new RuntimeException(file.getPath() + " Does not exist！");
+		}
+
+		return bytes;
+	}
+
+	/**
+	 * 读取文件
+	 * 
+	 * @param fileName
+	 * @return
+	 */
+	public static String readFile(String fileName, String encode) {
+		File file = new File(fileName);
+		return readFile(file, encode);
+	}
+
+	/**
+	 * 读取文件
+	 * 
+	 * @param fileName
+	 * @return
+	 */
+	public static String readFile(String fileName) {
+		return readFile(fileName, "utf-8");
+	}
+
+	/**
+	 * 获取目录下所有文件，一级
+	 * 
+	 * @param folder
+	 * @return
+	 */
+	public static List<File> getFiles(String folder) {
+		return getFiles(folder, null);
+	}
+
+	/**
+	 * 获取目录下所有文件，一级，后缀区分
+	 * 
+	 * @param folder
+	 * @return
+	 */
+	public static List<File> getFiles(String folder, String suffix) {
+		File file = new File(folder);
+		List<File> list = new ArrayList<File>();
+		if (file.exists() && file.isDirectory()) {
+			File[] files = file.listFiles();
+			for (File f : files) {
+				String fileName = f.getName();
+				if (suffix == null) {
+					list.add(f);
+				} else if (fileName.endsWith(suffix)) {
+					list.add(f);
+				}
+			}
+		}
+		return list;
+	}
+
+	/**
+	 * 遍历所有文件夹，取出文件
+	 */
+	public static List<File> getFileDeeps(String folder, String suffix) {
+		File file = new File(folder);
+		List<File> list = new ArrayList<File>();
+		if (file.exists() && file.isDirectory()) {
+			File[] files = file.listFiles();
+
+			for (File f : files) {
+				if (f.isFile()) {
+					String fileName = f.getName();
+					if (suffix == null) {
+						list.add(f);
+					} else if (fileName.endsWith(suffix)) {
+						list.add(f);
+					}
+				} else if (f.isDirectory()) {
+					list.addAll(getFileDeeps(f.getAbsolutePath(), suffix));
+				}
+			}
+		}
+		return list;
+	}
+
+	/**
+	 * 遍历所有文件夹，取出文件
+	 */
+	public static List<File> getFileDeeps(String folder, List<String> suffixs) {
+		File file = new File(folder);
+		List<File> list = new ArrayList<File>();
+		if (file.exists() && file.isDirectory()) {
+			File[] files = file.listFiles();
+
+			for (File f : files) {
+				if (f.isFile()) {
+					String fileName = f.getName();
+					for (String suffix : suffixs) {
+						if (suffix == null) {
+							list.add(f);
+						} else if (fileName.toLowerCase().endsWith(suffix)) {
+							list.add(f);
+						}
+					}
+				} else if (f.isDirectory()) {
+					list.addAll(getFileDeeps(f.getAbsolutePath(), suffixs));
+				}
+			}
+		}
+		return list;
+	}
+
+	/**
+	 * 获取目录下所有文件夹，一级
+	 * 
+	 * @param folder
+	 * @return
+	 */
+	public static List<File> getFolders(String folder) {
+		File file = new File(folder);
+		List<File> files = new ArrayList<File>();
+		if (file.exists()) {
+			File[] sonFiles = file.listFiles();
+			if (sonFiles != null && sonFiles.length > 0) {
+				for (int i = 0; i < sonFiles.length; i++) {
+					if (sonFiles[i].isDirectory()) {
+						files.add(sonFiles[i]);
+					}
+				}
+			}
+		}
+		return files;
+	}
+
+	/**
+	 * 判断是否有子目录
+	 * 
+	 * @param folder
+	 * @return
+	 */
+	public static boolean hasSonFolder(String folder) {
+		File file = new File(folder);
+		return hasSonFolder(file);
+	}
+
+	/**
+	 * 判断是否有子目录
+	 * 
+	 * @param file
+	 * @return
+	 */
+	public static boolean hasSonFolder(File file) {
+		if (file.exists()) {
+			File[] sonFiles = file.listFiles();
+			if (sonFiles != null && sonFiles.length > 0) {
+				for (int i = 0; i < sonFiles.length; i++) {
+					if (sonFiles[i].isDirectory()) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * 创建目录
+	 * 
+	 * @param folder
+	 */
+	public static void mkdirs(String folder) {
+		File file = new File(folder);
+		if (!file.exists()) {
+			file.mkdirs();
+		}
+	}
+
+	/**
+	 * 复制文件
+	 * 
+	 * @param src
+	 * @param dst
+	 */
+	public static void copy(File src, File dst) {
+		try {
+			// 如果是文件夹，并且已存在则什么都不做
+			if (dst.isDirectory() && dst.exists()) {
+				return;
+			}
+			if (!dst.getParentFile().exists()) {
+				dst.getParentFile().mkdirs();
+			}
+
+			int BUFFER_SIZE = 32 * 1024;
+			InputStream in = null;
+			OutputStream out = null;
+			try {
+				in = new FileInputStream(src);
+				out = new FileOutputStream(dst);
+				byte[] buffer = new byte[BUFFER_SIZE];
+				int count;
+				while ((count = in.read(buffer)) != -1) {
+					out.write(buffer, 0, count);
+				}
+				out.flush();
+			} catch (Exception e) {
+				log.error(src.getAbsolutePath() + "," + dst.getAbsolutePath() + ";" + e.getMessage(), e);
+			} finally {
+				if (null != in) {
+					in.close();
+				}
+				if (null != out) {
+					out.close();
+				}
+			}
+		} catch (Exception e2) {
+			log.error(e2.getMessage(), e2);
+		}
+	}
+
+	/**
+	 * 复制文件夹，包含内容，如果已有覆盖已有文件
+	 * 
+	 * @param overwrite
+	 *            是否覆盖文件
+	 */
+	public static void copyDirectiory(String sourceDir, String targetDir, boolean overwrite) throws IOException {
+		if (new File(sourceDir).exists()) {
+			// 新建目标目录
+			File targetFolder = new File(targetDir);
+			if (!targetFolder.exists()) {
+				targetFolder.mkdirs();
+			}
+			// 获取源文件夹当前下的文件或目录
+			File[] file = (new File(sourceDir)).listFiles();
+			for (int i = 0; i < file.length; i++) {
+
+				try {
+					if (file[i].isFile()) {
+						// 源文件
+						File sourceFile = file[i];
+						// 目标文件
+						File targetFile = new File(new File(targetDir).getAbsolutePath() + File.separator + file[i].getName());
+
+						// 如果重写为true，直接覆盖现有文件
+						if (overwrite) {
+							copy(sourceFile, targetFile);
+						} else if (!targetFile.exists()) {
+							// 如果文件不存在才写文件
+							copy(sourceFile, targetFile);
+						}
+
+					}
+					if (file[i].isDirectory()) {
+						// 准备复制的源文件夹
+						String dir1 = sourceDir + "/" + file[i].getName();
+						// 准备复制的目标文件夹
+						String dir2 = targetDir + "/" + file[i].getName();
+						File fileDir2 = new File(targetDir);
+						if (!fileDir2.exists()) {
+							fileDir2.mkdirs();
+						}
+						copyDirectiory(dir1, dir2, overwrite);
+					}
+				} catch (Exception e) {
+					log.error(e.getMessage(), e);
+				}
+
+			}
+		}
+	}
+
+	/**
+	 * 获取扩展名 .jpg
+	 */
+	public static String getExt(File src) {
+		if (src != null) {
+			String name = src.getName();
+			return name.substring(name.lastIndexOf("."), name.length());
+		}
+		return "";
+	}
+
+	/**
+	 * 获取扩展名 .jpg
+	 */
+	public static String getExt(String src) {
+		if (src != null) {
+			return src.substring(src.lastIndexOf("."), src.length());
+		}
+		return "";
+	}
+
+	/**
+	 * 删除指定文件
+	 * 
+	 * @param path
+	 */
+	public static void del(String path) {
+		File file = new File(path);
+		deleteFile(file);
+	}
+
+	/**
+	 * 递归删除文件夹下所有文件
+	 * 
+	 * @param file
+	 */
+	public static void deleteFile(File file) {
+		if (file.exists() && file.canRead()) { // 判断文件是否存在
+			try {
+				if (file.isFile()) { // 判断是否是文件
+					file.delete(); // delete()方法 你应该知道 是删除的意思;
+				} else if (file.isDirectory()) { // 否则如果它是一个目录
+					File files[] = file.listFiles(); // 声明目录下所有的文件 files[];
+					for (int i = 0; i < files.length; i++) { // 遍历目录下所有的文件
+						deleteFile(files[i]); // 把每个文件 用这个方法进行迭代
+					}
+				}
+				file.delete();
+			} catch (Exception e) {
+				log.error(e.getMessage(), e);
+			}
+		}
+	}
+
+	public static void deleteFile(List<File> files) {
+		for (File f : files) {
+			deleteFile(f);
+		}
+	}
+
+
+
+	/**
+	 * 解压缩
+	 * 
+	 * @param sZipPathFile
+	 *            要解压的文件
+	 * @param sDestPath
+	 *            解压到某文件夹
+	 * @return
+	 */
+	public static List<String> unzip(String sZipPathFile, String sDestPath) {
+		List<String> allFileName = new ArrayList<String>();
+		try {
+			// 先指定压缩档的位置和档名，建立FileInputStream对象
+			FileInputStream fins = new FileInputStream(sZipPathFile);
+			// 将fins传入ZipInputStream中
+			ZipInputStream zins = new ZipInputStream(fins);
+			java.util.zip.ZipEntry ze = null;
+			byte[] ch = new byte[256];
+			while ((ze = zins.getNextEntry()) != null) {
+				File zfile = new File(sDestPath + ze.getName());
+				File fpath = new File(zfile.getParentFile().getPath());
+				if (ze.isDirectory()) {
+					if (!zfile.exists())
+						zfile.mkdirs();
+					zins.closeEntry();
+				} else {
+					if (!fpath.exists())
+						fpath.mkdirs();
+					FileOutputStream fouts = new FileOutputStream(zfile);
+					int i;
+					allFileName.add(zfile.getAbsolutePath());
+					while ((i = zins.read(ch)) != -1)
+						fouts.write(ch, 0, i);
+					zins.closeEntry();
+					fouts.close();
+				}
+			}
+			fins.close();
+			zins.close();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return allFileName;
+	}
+
+
+}

src/main/java/com/dashitech/utils/HttpUtil.java

@@ -0,0 +1,372 @@
+package com.dashitech.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class HttpUtil {
+
+    public static CloseableHttpClient getHttpClient() {
+    	 RequestConfig config = RequestConfig.custom().setConnectTimeout(60000).setSocketTimeout(15000).build();
+    	 CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
+         return httpClient;
+    }
+
+    /**
+     * HTTP Get 获取内容
+     * @param url  请求的url地址 ?之前的地址
+     * @param params	请求的参数
+     * @param charset	编码格式
+     * @return	页面内容
+     */
+    public static String doGet(String url,Map<String,String> params,String charset){
+    	if(StringUtils.isBlank(url)){
+    		return null;
+    	}
+    	try {
+    		if(params != null && !params.isEmpty()){
+    			List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
+    			for(Map.Entry<String,String> entry : params.entrySet()){
+    				String value = entry.getValue();
+    				if(value != null){
+    					pairs.add(new BasicNameValuePair(entry.getKey(),value));
+    				}
+    			}
+    			url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs, charset));
+    		}
+    		HttpGet httpGet = new HttpGet(url);
+    		CloseableHttpResponse response = getHttpClient().execute(httpGet);
+    		int statusCode = response.getStatusLine().getStatusCode();
+    		if (statusCode != 200) {
+    			httpGet.abort();
+    			throw new RuntimeException("HttpClient,error status code :" + statusCode);
+    		}
+    		HttpEntity entity = response.getEntity();
+    		String result = null;
+    		if (entity != null){
+    			result = EntityUtils.toString(entity, charset);
+    		}
+    		EntityUtils.consume(entity);
+    		response.close();
+    		return result;
+    	} catch (Exception e) {
+    		e.printStackTrace();
+    	}
+    	return null;
+    }
+    
+    /**
+     * HTTP Post 获取内容
+     * @param url  请求的url地址 ?之前的地址
+     * @param params	请求的参数
+     * @param charset	编码格式
+     * @return	页面内容
+     */
+    public static String doPost(String url,Map<String,String> params,String charset){
+    	if(StringUtils.isBlank(url)){
+    		return null;
+    	}
+    	try {
+    		List<NameValuePair> pairs = null;
+    		if(params != null && !params.isEmpty()){
+    			pairs = new ArrayList<NameValuePair>(params.size());
+    			for(Map.Entry<String,String> entry : params.entrySet()){
+    				String value = entry.getValue();
+    				if(value != null){
+    					pairs.add(new BasicNameValuePair(entry.getKey(),value));
+    				}
+    			}
+    		}
+    		HttpPost httpPost = new HttpPost(url);
+    		if(pairs != null && pairs.size() > 0){
+    			httpPost.setEntity(new UrlEncodedFormEntity(pairs,charset));
+    		}
+    		CloseableHttpResponse response = getHttpClient().execute(httpPost);
+    		int statusCode = response.getStatusLine().getStatusCode();
+    		if (statusCode != 200) {
+    			httpPost.abort();
+    			throw new RuntimeException("HttpClient,error status code :" + statusCode);
+    		}
+    		HttpEntity entity = response.getEntity();
+    		String result = null;
+    		if (entity != null){
+    			result = EntityUtils.toString(entity, charset);
+    		}
+    		EntityUtils.consume(entity);
+    		response.close();
+    		return result;
+    	} catch (Exception e) {
+    		e.printStackTrace();
+    	}
+    	return null;
+    }
+
+	public static void outPrint(HttpServletResponse response, String content, String charset) {
+		response.setCharacterEncoding(charset);
+		response.setContentType(new StringBuilder().append("text/html;charset=").append(charset).toString());
+		PrintWriter out = null;
+		try {
+			out = response.getWriter();
+			out.println(content);
+			out.flush();
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			out.close();
+		}
+	}
+	
+	public static String readResponse(String requestUrl, Map<String, String> params, String method, String charset) {
+		StringBuffer sb = new StringBuffer();
+		String paramsStr = "";
+		if ((params != null) && (params.size() > 0)) {
+			for (Map.Entry e : params.entrySet()) {
+				sb.append((String) e.getKey());
+				sb.append("=");
+				sb.append((String) e.getValue());
+				sb.append("&");
+			}
+			paramsStr = sb.substring(0, sb.length() - 1);
+		}
+		return readResponse(requestUrl, paramsStr, method, charset);
+	}
+	
+	public static String readPostResponse(String requestUrl, String json, String contentType) {
+		HttpURLConnection conn = null;
+		OutputStreamWriter out = null;
+		BufferedReader in = null;
+		String line = null;
+		try {
+			URL url = new URL(requestUrl);
+			conn = (HttpURLConnection) url.openConnection();
+			conn.setRequestMethod("POST");
+			conn.setRequestProperty("Content-Type", contentType);
+			conn.setRequestProperty("Accept-Charset", "UTF-8");
+			conn.setRequestProperty("Content-Length", new StringBuilder().append("").append(json.length()).toString());
+			conn.setUseCaches(false);
+			conn.setDoOutput(true);
+			out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+			out.write(json);
+			out.flush();
+			out.close();
+
+			if (conn.getResponseCode() != 200) {
+				System.err.println("connect failed!" + conn.getResponseCode());
+				String str1 = "";
+				return str1;
+			}
+			String result = "";
+			in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
+			while ((line = in.readLine()) != null) {
+				result = new StringBuilder().append(result).append(line).append("\n").toString();
+			}
+			String str2 = result;
+			return str2;
+		} catch (SocketException se) {
+			se.printStackTrace();
+			line = null;
+			return line;
+		} catch (Exception e) {
+			e.printStackTrace();
+			line = null;
+			return line;
+		} finally {
+			if (out != null) {
+				try {
+					out.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (in != null) {
+				try {
+					in.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (conn != null)
+				conn.disconnect();
+		}
+	}
+	
+	public static String readResponse(String requestUrl, String requestData, String method, String charset) {
+		HttpURLConnection conn = null;
+		OutputStreamWriter out = null;
+		BufferedReader in = null;
+		String line = null;
+		try {
+			URL url = new URL(requestUrl);
+			conn = (HttpURLConnection) url.openConnection();
+			conn.setRequestMethod(method);
+			conn.setRequestProperty("Content-Type", "text/html");
+			conn.setRequestProperty("Accept-Charset", charset);
+			conn.setUseCaches(false);
+			conn.setDoOutput(true);
+			conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+			conn.setRequestProperty("Content-Length", new StringBuilder().append("").append(requestData.length()).toString());
+			out = new OutputStreamWriter(conn.getOutputStream(), charset);
+			out.write(requestData);
+			out.flush();
+			out.close();
+
+			if (conn.getResponseCode() != 200) {
+				System.err.println("connect failed!" + conn.getResponseCode());
+				String str1 = "";
+				return str1;
+			}
+			String result = "";
+			in = new BufferedReader(new InputStreamReader(conn.getInputStream(), charset));
+			while ((line = in.readLine()) != null) {
+				result = new StringBuilder().append(result).append(line).append("\n").toString();
+			}
+			String str2 = result;
+			return str2;
+		} catch (SocketException se) {
+			se.printStackTrace();
+			line = null;
+			return line;
+		} catch (Exception e) {
+			e.printStackTrace();
+			line = null;
+			return line;
+		} finally {
+			if (out != null) {
+				try {
+					out.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (in != null) {
+				try {
+					in.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (conn != null)
+				conn.disconnect();
+		}
+	}
+
+	public static String getString(byte[] b, int offset, int len, String encoding) {
+		try {
+			return new String(b, offset, len, encoding);
+		} catch (UnsupportedEncodingException e) {
+		}
+		return new String(b, offset, len);
+	}
+
+
+	public static String doPost(String httpUrl,Object param) {
+
+		HttpURLConnection connection = null;
+		InputStream is = null;
+		OutputStream out = null;
+		BufferedReader br = null;
+		String result = null;
+		try {
+			URL url = new URL(httpUrl);
+			// 通过远程url连接对象打开连接
+			connection = (HttpURLConnection) url.openConnection();
+			// 设置连接请求方式
+			connection.setRequestMethod("POST");
+			// 设置连接主机服务器超时时间：15000毫秒
+			connection.setConnectTimeout(60000);
+			// 设置读取主机服务器返回数据超时时间：60000毫秒
+			connection.setReadTimeout(60000);
+
+			// 默认值为：false，当向远程服务器传送数据/写数据时，需要设置为true
+			connection.setDoOutput(true);
+			// 默认值为：true，当前向远程服务读取数据时，设置为true，该参数可有可无
+			connection.setDoInput(true);
+			// 设置传入参数的格式:请求参数应该是 name1=value1&name2=value2 的形式。
+			connection.setRequestProperty("Content-Type", "application/json");
+			// 设置鉴权信息：Authorization: Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0
+			//connection.setRequestProperty("Authorization", "Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0");
+			// 通过连接对象获取一个输出流
+			out = connection.getOutputStream();
+			// 通过输出流对象将参数写出去/传输出去,它是通过字节数组写出的
+			//os.write(param.getBytes());
+			//JSONObject obj = new JSONObject();
+			// java.net.URLEncoder.encode 编码之后会有%多余%的问题，在传输的过程中无法被解析
+			// String json = java.net.URLEncoder.encode(obj.toString(), "utf-8");
+			Object o = JSONObject.toJSON(param);
+			Object jsonObject = JSONObject.parse(o.toString());
+			out.write(jsonObject.toString().getBytes());
+
+
+			// 通过连接对象获取一个输入流，向远程读取
+			if (connection.getResponseCode() == 200) {
+
+				is = connection.getInputStream();
+				// 对输入流对象进行包装:charset根据工作项目组的要求来设置
+				br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+				StringBuffer sbf = new StringBuffer();
+				String temp = null;
+				// 循环遍历一行一行读取数据
+				while ((temp = br.readLine()) != null) {
+					sbf.append(temp);
+					sbf.append("\r\n");
+				}
+				result = sbf.toString();
+			}
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			// 关闭资源
+			if (null != br) {
+				try {
+					br.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (null != out) {
+				try {
+					out.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (null != is) {
+				try {
+					is.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			// 断开与远程地址url的连接
+			connection.disconnect();
+		}
+		return result;
+	}
+	public static void main(String[] args) {
+		String re=readResponse("www.baidu.com","","get","UTF-8");
+		System.out.println(re);
+	}
+}

src/main/java/com/dashitech/utils/I18n.java

@@ -0,0 +1,20 @@
+package com.dashitech.utils;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+/**
+ * Created by chi on 2019/9/10.
+ * 实体说明注解
+ */
+
+
+@Target(FIELD)
+@Retention(RUNTIME)
+@Documented
+public @interface I18n {
+    String value();
+}

src/main/java/com/dashitech/utils/JsonParam.java

@@ -0,0 +1,120 @@
+package com.dashitech.utils;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+public class JsonParam implements Serializable {
+
+	private static final long serialVersionUID = -4882852696761401880L;
+
+	private Integer total;
+
+	private Integer pageIndex = 1;
+
+	private Integer pageSize = 20;
+
+	private Integer totalPage = 0;
+
+	/**
+	 * 实体bean
+	 */
+	private Map<String, Object> model;
+	/**
+	 * 实体bean列表
+	 */
+	private List<Map<String,Object>> list;
+	/**
+	 * 其他参数
+	 */
+	private Map<String, Object> param;
+	
+	
+	
+	public Integer getTotal() {
+		return total;
+	}
+
+	public void setTotal(Integer total) {
+		this.total = total;
+	}
+
+	public Integer getPageIndex() {
+		return pageIndex;
+	}
+
+	public void setPageIndex(Integer pageIndex) {
+		this.pageIndex = pageIndex;
+	}
+
+	public Integer getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public Integer getTotalPage() {
+		return totalPage;
+	}
+
+	public void setTotalPage(Integer totalPage) {
+		this.totalPage = totalPage;
+	}
+
+	public Map<String, Object> getModel() {
+		return model;
+	}
+
+	public void setModel(Map<String, Object> model) {
+		this.model = model;
+	}
+
+	public Map<String, Object> getParam() {
+		return param;
+	}
+
+	public void setParam(Map<String, Object> param) {
+		this.param = param;
+	}
+	
+	public List<Map<String, Object>> getList() {
+		return list;
+	}
+
+	public void setList(List<Map<String, Object>> list) {
+		this.list = list;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public <T> T getModelBean(Class clazz) {
+		JSONObject jsonObj = JsonUtil.toJSONObject(getModel());
+		Object temp = JsonUtil.toObject(jsonObj.toString(), clazz);
+		if(temp != null) {
+			return (T)temp;
+		}
+		return null;
+	}
+	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public <T> List<T> getModelListBean(Class clazz) {
+		JSONArray jsonArr = JsonUtil.toJSONArray(getList());
+		List<T> temp = JsonUtil.toList2(jsonArr.toString(), clazz);
+		if(temp != null) {
+			return temp;
+		}
+		return new ArrayList<T>();
+	}
+
+	@Override
+	public String toString() {
+		return "JsonParamBean [total=" + total + ", pageIndex=" + pageIndex + ", pageSize=" + pageSize + ", totalPage=" + totalPage + ", model=" + model + ", list=" + list + ", param=" + param + "]";
+	}
+
+}

src/main/java/com/dashitech/utils/JsonResponse.java

@@ -0,0 +1,100 @@
+package com.dashitech.utils;
+
+import java.io.Serializable;
+
+
+import net.sf.json.JSONObject;
+
+public class JsonResponse implements Serializable{
+	private static final long serialVersionUID = 2275655193720587417L;
+	
+	/**
+	 * 消息
+	 */
+	private String msg;
+	/**
+	 * 状态
+	 */
+	private Integer status;
+	/**
+	 * 数据
+	 */
+	private Object data;
+	
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Object getData() {
+		return data;
+	}
+
+	public void setData(Object data) {
+		this.data = data;
+	}
+
+	public JsonResponse() {
+		
+	}
+	
+	public JsonResponse(String msg, Integer status, Object data) {
+		super();
+		this.msg = msg;
+		this.status = status;
+		this.data = data;
+	}
+	
+	public static JsonResponse success(Object data) {
+		JsonResponse bean = new JsonResponse();
+		bean.setData(data);
+		bean.setMsg("成功！");
+		bean.setStatus(200);
+		return bean;
+	}
+	
+	public static JsonResponse error(String msg) {
+		JsonResponse bean = new JsonResponse();
+		bean.setMsg("服务出错！");
+		bean.setStatus(500);
+		return bean;
+	}
+	
+	public static JsonResponse forbidden() {
+		JsonResponse bean = new JsonResponse();
+		bean.setMsg("没有权限！");
+		bean.setStatus(403);
+		return bean;
+	}
+	
+	public static JsonResponse forbidden(String msg) {
+		JsonResponse bean = new JsonResponse();
+		bean.setMsg(msg);
+		bean.setStatus(403);
+		return bean;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			JSONObject json = JsonUtil.toJSONObject(this);
+			return json.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return error("json转换错误！").toString();
+	}
+	
+	
+}

src/main/java/com/dashitech/utils/JsonUtil.java

@@ -0,0 +1,163 @@
+package com.dashitech.utils;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
+import net.sf.json.processors.JsonValueProcessor;
+import net.sf.json.util.CycleDetectionStrategy;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+public class JsonUtil {
+
+    public static JSONObject toJSONObject(Object obj) {
+        return JSONObject.fromObject(obj, getJsonConfig());
+    }
+
+    public static String toJsonString(Object obj) {
+        com.fasterxml.jackson.databind.ObjectMapper mapper = new com.fasterxml.jackson.databind.ObjectMapper();
+        mapper.setDateFormat(DateUtil.SDF_DATETIME);
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+        try {
+            return mapper.writeValueAsString(obj);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    public static JSONArray toJSONArray(Object obj) {
+        return JSONArray.fromObject(obj, getJsonConfig());
+    }
+
+    public static <T> List<T> toList(Object obj, Class<T> clazz) {
+        JSONArray arr = toJSONArray(obj);
+        @SuppressWarnings({"unchecked", "deprecation"}) List<T> list = JSONArray.toList(arr, clazz);
+        return list;
+    }
+
+    public static <T> List<T> toList(Object obj, Class<T> clazz, Map classMap) {
+        JSONArray arr = toJSONArray(obj);
+        @SuppressWarnings({"unchecked", "deprecation"}) List<T> list = JSONArray.toList(arr, clazz, classMap);
+        return list;
+    }
+
+    /**
+     * 会格式化日期为yyyy-MM-dd HH:mm:ss
+     */
+    @SuppressWarnings({"deprecation"})
+    public static <T> List<T> toList2(String json, Class<T> clazz) {
+        try {
+            com.fasterxml.jackson.databind.ObjectMapper mapper = new com.fasterxml.jackson.databind.ObjectMapper();
+            mapper.setDateFormat(DateUtil.SDF_DATETIME);
+            mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+            JavaType javaType = mapper.getTypeFactory().constructParametricType(ArrayList.class, clazz);
+            List<T> result = mapper.readValue(json, javaType);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 2016-03-01 00:00:00 替换为 2016-03-01 <br/>
+     * 如果报错返回原始数据
+     */
+    public static JSONObject replaceDateTime(JSONObject source) {
+        JSONObject result = source;
+        try {
+            String ss = source.toString();
+            String formatJson = ss.replaceAll(" \\d{2}:\\d{2}:\\d{2}", "");
+            result = JSONObject.fromObject(formatJson);
+        } catch (Exception e) {
+        }
+        return result;
+    }
+
+
+    public static <T> T toObject(String json, Class<T> valueType) {
+        com.fasterxml.jackson.databind.ObjectMapper mapper = new com.fasterxml.jackson.databind.ObjectMapper();
+        mapper.setDateFormat(DateUtil.SDF_DATETIME);
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+
+        try {
+            return mapper.readValue(json, valueType);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static <T> List<T> toListObject(String json, Class<T> valueType) {
+        com.fasterxml.jackson.databind.ObjectMapper mapper = new com.fasterxml.jackson.databind.ObjectMapper();
+        mapper.setDateFormat(DateUtil.SDF_DATETIME);
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+
+        try {
+            List<T> result = new ArrayList<>();
+            List<Map> list = mapper.readValue(json, ArrayList.class);
+            for (Map map : list) {
+                T t = toObject(toJSONObject(map).toString(), valueType);
+                result.add(t);
+            }
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static JsonConfig getJsonConfig() {
+        JsonConfig config = new JsonConfig();
+        //去掉class
+        config.setIgnoreDefaultExcludes(false);
+        //禁止自包含
+        config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
+        //处理日期转换
+        config.registerJsonValueProcessor(Date.class, new Date_JsonValueProcessor());
+        return config;
+    }
+
+}
+
+class Date_JsonValueProcessor implements JsonValueProcessor {
+
+    public Object processArrayValue(Object value, JsonConfig config) {
+        return process(value, config);
+    }
+
+    public Object processObjectValue(String key, Object value, JsonConfig config) {
+        return process(value, config);
+    }
+
+    ;
+
+    private Object process(Object value, JsonConfig config) {
+        if (value == null) {
+            return "";
+        }
+        if (value instanceof Date) {
+            String date = DateUtil.SDF_DATETIME.format((Date) value);
+            return date;
+        } else {
+            return value == null ? null : value.toString();
+        }
+    }
+
+}

src/main/java/com/dashitech/utils/MyObjectMapper.java

@@ -0,0 +1,17 @@
+package com.dashitech.utils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+
+
+public class MyObjectMapper extends ObjectMapper{
+	
+	private static final long serialVersionUID = 1L;
+
+	public MyObjectMapper() {
+		this.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+		this.setDateFormat(new MyObjectMapperDateFormat());
+	}
+
+}

src/main/java/com/dashitech/utils/MyObjectMapperDateFormat.java

@@ -0,0 +1,119 @@
+package com.dashitech.utils;
+
+import java.text.FieldPosition;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.commons.lang.StringUtils;
+
+public class MyObjectMapperDateFormat extends SimpleDateFormat{
+	private static final long serialVersionUID = 1L;
+	public static final String Y_M_D = "yyyy-MM-dd";  
+    public static final String Y_M_D_HM = "yyyy-MM-dd HH:mm";  
+    public static final String Y_M_D_HMS = "yyyy-MM-dd HH:mm:ss";  
+    public static final String YMD = "yyyyMMdd";  
+    public static final String YMDHM = "yyyyMMddHHmm";  
+    public static final String YMDHMS = "yyyyMMddHHmmss";  
+    public static final String ymd = "yyyy/MM/dd";  
+    public static final String ymd_HM = "yyyy/MM/dd HH:mm";  
+    public static final String ymd_HMS = "yyyy/MM/dd HH:mm:ss";  
+	
+	@Override  
+    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition pos) {  
+        return new StringBuffer(smartFormat(date));  
+    }  
+  
+    @Override  
+    public Date parse(String text) throws ParseException {  
+        return smartFormat(text);  
+    }  
+    
+    public static String smartFormat(Date date) {  
+        String dateStr = null;  
+        if (date == null) {  
+            dateStr = "";  
+        } else {  
+            try {  
+                dateStr = formatDate(date, Y_M_D_HMS);  
+                //时分秒  
+                if (dateStr.endsWith(" 00:00:00")) {  
+                    dateStr = dateStr.substring(0, 10);  
+                }  
+                //时分  
+                else if (dateStr.endsWith("00:00")) {  
+                    dateStr = dateStr.substring(0, 16);  
+                }  
+                //秒  
+                else if (dateStr.endsWith(":00")) {  
+                    dateStr = dateStr.substring(0, 16);  
+                }  
+            } catch (Exception ex) {  
+                throw new IllegalArgumentException("转换日期失败: " + ex.getMessage(), ex);  
+            }  
+        }  
+        return dateStr;  
+    }  
+  
+    /** 
+     * 智能转换日期 
+     * 
+     * @param text 
+     * @return 
+     */  
+    public static Date smartFormat(String text) {  
+        Date date = null;  
+        try {  
+            if (text == null || text.length() == 0) {  
+                date = null;  
+            } else if (text.length() == 10) {  
+                date = formatStringToDate(text, Y_M_D);  
+            } else if (text.length() == 13) {  
+                date = new Date(Long.parseLong(text));  
+            } else if (text.length() == 16) {  
+                date = formatStringToDate(text, Y_M_D_HM);  
+            } else if (text.length() == 19) {  
+                date = formatStringToDate(text, Y_M_D_HMS);  
+            } else {  
+                throw new IllegalArgumentException("日期长度不符合要求!");  
+            }  
+        } catch (Exception e) {  
+            throw new IllegalArgumentException("日期转换失败!");  
+        }  
+        return date;  
+    }  
+    
+    public static String formatDate(Date argDate, String argFormat) throws Exception {  
+        if (argDate == null) {  
+            throw new Exception("参数[日期]不能为空!");  
+        }  
+        if (StringUtils.isEmpty(argFormat)) {  
+            argFormat = Y_M_D;  
+        }  
+        SimpleDateFormat sdfFrom = new SimpleDateFormat(argFormat);  
+        return sdfFrom.format(argDate).toString();  
+    }  
+  
+    public static Date formatStringToDate(String argDateStr, String argFormat) throws Exception {  
+        if (argDateStr == null || argDateStr.trim().length() < 1) {  
+            throw new Exception("参数[日期]不能为空!");  
+        }  
+        String strFormat = argFormat;  
+        if (StringUtils.isEmpty(strFormat)) {  
+            strFormat = Y_M_D;  
+            if (argDateStr.length() > 16) {  
+                strFormat = Y_M_D_HMS;  
+            } else if (argDateStr.length() > 10) {  
+                strFormat = Y_M_D_HM;  
+            }  
+        }  
+        SimpleDateFormat sdfFormat = new SimpleDateFormat(strFormat);  
+        //严格模式  
+        sdfFormat.setLenient(false);  
+        try {  
+            return sdfFormat.parse(argDateStr);  
+        } catch (ParseException e) {  
+            throw new Exception(e);  
+        }  
+    } 
+}

src/main/java/com/dashitech/utils/MyX509TrustManager.java

@@ -0,0 +1,18 @@
+package com.dashitech.utils;
+
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class MyX509TrustManager implements X509TrustManager {
+	  
+    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    }  
+  
+    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    }  
+  
+    public X509Certificate[] getAcceptedIssuers() {
+        return null;  
+    }  
+}  

src/main/java/com/dashitech/utils/PropertiesHelper.java

@@ -0,0 +1,506 @@
+package com.dashitech.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.InvalidPropertiesFormatException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Map.Entry;
+
+/**
+ * Properties的操作的工具类,为Properties提供一个代理增加相关工具方法如
+ * getRequiredString(),getInt(),getBoolean()等方法
+ * 并可以通过systemPropertiesMode属性指定是否搜索System.getProperty()及System.getenv()来查找值.
+ * 默认不搜索系统属性
+ * 
+ * <pre>
+ * 使用1:
+ * public class ConnectionUtils {
+ *     static Properties properties = new Properties(); 
+ *     // ... do load properties 
+ *     
+ *     // delegate to properties
+ * 	   static PropertiesHelper props = new PropertiesHelper(properties);
+ *     public static Connection getConnection() {
+ *     		// use getRequiredProperty() 
+ *     		DriverManager.getConnection(props.getRequiredString("jdbc.url"));
+ *     }
+ * }
+ * 指定是否搜索系统属性:
+ * new PropertiesHelper(properties,PropertiesHelper.SYSTEM_PROPERTIES_MODE_OVERRIDE)
+ * </pre>
+ * 
+ * @author badqiu
+ */
+public class PropertiesHelper {
+	/**
+	 * 不使用系统属性,这个是默认值
+	 **/
+	public static final int SYSTEM_PROPERTIES_MODE_NEVER = 0;
+
+	/**
+	 * 如果在properties中没有找到属性值,则查找系统属性
+	 */
+	public static final int SYSTEM_PROPERTIES_MODE_FALLBACK = 1;
+
+	/**
+	 * 首先查找系统属性,如果没有找到值,再查找properties,这可以用于系统属性覆盖properties中的值
+	 */
+	public static final int SYSTEM_PROPERTIES_MODE_OVERRIDE = 2;
+
+	private int systemPropertiesMode = SYSTEM_PROPERTIES_MODE_NEVER;
+
+	private Properties p;
+
+	public PropertiesHelper(Properties p) {
+		setProperties(p);
+	}
+
+	public PropertiesHelper(Properties p, int systemPropertiesMode) {
+		setProperties(p);
+		if (systemPropertiesMode != SYSTEM_PROPERTIES_MODE_NEVER && systemPropertiesMode != SYSTEM_PROPERTIES_MODE_FALLBACK
+				&& systemPropertiesMode != SYSTEM_PROPERTIES_MODE_OVERRIDE) {
+			throw new IllegalArgumentException("error systemPropertiesMode mode:" + systemPropertiesMode);
+		}
+		this.systemPropertiesMode = systemPropertiesMode;
+	}
+
+	public Properties getProperties() {
+		return p;
+	}
+
+	public void setProperties(Properties props) {
+		if (props == null)
+			throw new IllegalArgumentException("properties must be not null");
+		this.p = props;
+	}
+
+	/**
+	 * 必须存在这个key的值,不然抛 IllegalStateException异常
+	 **/
+	public String getRequiredProperty(String key) throws IllegalStateException {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			throw new IllegalStateException("required property is blank by key=" + key);
+		}
+		return value;
+	}
+
+	/**
+	 * 返回null,如果查值的属性值是blank
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public String getNullIfBlank(String key) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return null;
+		}
+		return value;
+	}
+
+	/**
+	 * 返回null,如果查值的属性值是empty
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public String getNullIfEmpty(String key) {
+		String value = getProperty(key);
+		if (value == null || "".equals(value)) {
+			return null;
+		}
+		return value;
+	}
+
+	/**
+	 * 尝试从System.getProperty(key)及System.getenv(key)得到值
+	 * 
+	 * @return
+	 */
+	public String getAndTryFromSystem(String key) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			value = getSystemProperty(key);
+		}
+		return value;
+	}
+
+	private String getSystemProperty(String key) {
+		String value;
+		value = System.getProperty(key);
+		if (isBlankString(value)) {
+			value = System.getenv(key);
+		}
+		return value;
+	}
+
+	public Integer getInteger(String key) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return null;
+		}
+		return Integer.parseInt(value);
+	}
+
+	public int getInt(String key, int defaultValue) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return defaultValue;
+		}
+		return Integer.parseInt(value);
+	}
+
+	/**
+	 * 必须存在这个key的值,不然抛 IllegalStateException异常
+	 **/
+	public int getRequiredInt(String key) throws IllegalStateException {
+		return Integer.parseInt(getRequiredProperty(key));
+	}
+
+	public Long getLong(String key) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return null;
+		}
+		return Long.parseLong(value);
+	}
+
+	public long getLong(String key, long defaultValue) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return defaultValue;
+		}
+		return Long.parseLong(value);
+	}
+
+	/**
+	 * 必须存在这个key的值,不然抛 IllegalStateException异常
+	 **/
+	public long getRequiredLong(String key) throws IllegalStateException {
+		return Long.parseLong(getRequiredProperty(key));
+	}
+
+	public Boolean getBoolean(String key) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return null;
+		}
+		return Boolean.parseBoolean(value);
+	}
+
+	public boolean getBoolean(String key, boolean defaultValue) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return defaultValue;
+		}
+		return Boolean.parseBoolean(value);
+	}
+
+	/**
+	 * 必须存在这个key的值,不然抛 IllegalStateException异常
+	 **/
+	public boolean getRequiredBoolean(String key) throws IllegalStateException {
+		return Boolean.parseBoolean(getRequiredProperty(key));
+	}
+
+	public Float getFloat(String key) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return null;
+		}
+		return Float.parseFloat(value);
+	}
+
+	public float getFloat(String key, float defaultValue) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return defaultValue;
+		}
+		return Float.parseFloat(value);
+	}
+
+	/**
+	 * 必须存在这个key的值,不然抛 IllegalStateException异常
+	 **/
+	public float getRequiredFloat(String key) throws IllegalStateException {
+		return Float.parseFloat(getRequiredProperty(key));
+	}
+
+	public Double getDouble(String key) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return null;
+		}
+		return Double.parseDouble(value);
+	}
+
+	public double getDouble(String key, double defaultValue) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return defaultValue;
+		}
+		return Double.parseDouble(value);
+	}
+
+	/**
+	 * 必须存在这个key的值,不然抛 IllegalStateException异常
+	 **/
+	public double getRequiredDouble(String key) throws IllegalStateException {
+		return Double.parseDouble(getRequiredProperty(key));
+	}
+
+	public URL getURL(String key) throws IllegalArgumentException {
+		try {
+			return new URL(getProperty(key));
+		} catch (MalformedURLException e) {
+			throw new IllegalArgumentException("Property " + key + " must be a valid URL (" + getProperty(key) + ")");
+		}
+	}
+
+	public Object getClassInstance(String key) throws IllegalArgumentException {
+		String s = (String) getProperty(key);
+		if (s == null || "".equals(s.trim())) {
+			throw new IllegalArgumentException("Property " + key + " must be a valid classname  : " + key);
+		}
+		try {
+			return Class.forName(s).newInstance();
+		} catch (ClassNotFoundException nfe) {
+			throw new IllegalArgumentException(s + ": invalid class name for key " + key, nfe);
+		} catch (InstantiationException e) {
+			throw new IllegalArgumentException(s + ": class could not be reflected " + s, e);
+		} catch (IllegalAccessException e) {
+			throw new IllegalArgumentException(s + ": class could not be reflected " + s, e);
+		}
+	}
+
+	public Object getClassInstance(String key, Object defaultinstance) throws IllegalArgumentException {
+		return (containsKey(key) ? getClassInstance(key) : defaultinstance);
+	}
+
+	/**
+	 * 将一个property按"逗号,空格,换行符"分隔,并返回一个String[]数组
+	 **/
+	public String[] getStringArray(String key) {
+		String v = getProperty(key);
+		if (v == null) {
+			return new String[0];
+		} else {
+			return org.springframework.util.StringUtils.tokenizeToStringArray(v, ", \t\n\r\f");
+		}
+	}
+
+	/**
+	 * 将一个property按"逗号,空格,换行符"分隔,并返回一个int[]数组
+	 **/
+	public int[] getIntArray(String key) {
+		return toIntArray(getStringArray(key));
+	}
+
+	/**
+	 * 得到以某个前缀开始的所有属性,返回的属性值为移除前缀后的属性值.
+	 * 
+	 * @param prefix
+	 * @return
+	 */
+	public Properties getStartsWithProperties(String prefix) {
+		if (prefix == null)
+			throw new IllegalArgumentException("'prefix' must be not null");
+
+		Properties props = getProperties();
+
+		Properties result = new Properties();
+		for (Entry<Object, Object> entry : props.entrySet()) {
+			String key = (String) entry.getKey();
+			if (key != null && key.startsWith(prefix)) {
+				result.put(key.substring(prefix.length()), entry.getValue());
+			}
+		}
+		return result;
+	}
+
+	/** setProperty(String key,int value) ... start */
+
+	public Object setProperty(String key, int value) {
+		return setProperty(key, String.valueOf(value));
+	}
+
+	public Object setProperty(String key, long value) {
+		return setProperty(key, String.valueOf(value));
+	}
+
+	public Object setProperty(String key, float value) {
+		return setProperty(key, String.valueOf(value));
+	}
+
+	public Object setProperty(String key, double value) {
+		return setProperty(key, String.valueOf(value));
+	}
+
+	public Object setProperty(String key, boolean value) {
+		return setProperty(key, String.valueOf(value));
+	}
+
+	/** delegate method start */
+
+	public String getProperty(String key, String defaultValue) {
+		String value = getProperty(key);
+		if (isBlankString(value)) {
+			return defaultValue;
+		}
+		return value;
+	}
+
+	public String getProperty(String key) {
+		String propVal = null;
+		if (systemPropertiesMode == SYSTEM_PROPERTIES_MODE_OVERRIDE) {
+			propVal = getSystemProperty(key);
+		}
+		if (propVal == null) {
+			propVal = p.getProperty(key);
+		}
+		if (propVal == null && systemPropertiesMode == SYSTEM_PROPERTIES_MODE_FALLBACK) {
+			propVal = getSystemProperty(key);
+		}
+		return propVal == null ? null : propVal.trim();
+	}
+
+	public Object setProperty(String key, String value) {
+		return p.setProperty(key, value);
+	}
+
+	public void clear() {
+		p.clear();
+	}
+
+	public Set<Entry<Object, Object>> entrySet() {
+		return p.entrySet();
+	}
+
+	public Enumeration<?> propertyNames() {
+		return p.propertyNames();
+	}
+
+	public boolean contains(Object value) {
+		return p.contains(value);
+	}
+
+	public boolean containsKey(Object key) {
+		return p.containsKey(key);
+	}
+
+	public boolean containsValue(Object value) {
+		return p.containsValue(value);
+	}
+
+	public Enumeration<Object> elements() {
+		return p.elements();
+	}
+
+	public Object get(Object key) {
+		return p.get(key);
+	}
+
+	public boolean isEmpty() {
+		return p.isEmpty();
+	}
+
+	public Enumeration<Object> keys() {
+		return p.keys();
+	}
+
+	public Set<Object> keySet() {
+		return p.keySet();
+	}
+
+	public void list(PrintStream out) {
+		p.list(out);
+	}
+
+	public void list(PrintWriter out) {
+		p.list(out);
+	}
+
+	public void load(InputStream inStream) throws IOException {
+		p.load(inStream);
+	}
+
+	public void loadFromXML(InputStream in) throws IOException, InvalidPropertiesFormatException {
+		p.loadFromXML(in);
+	}
+
+	public Object put(Object key, Object value) {
+		return p.put(key, value);
+	}
+
+	public void putAll(Map<? extends Object, ? extends Object> t) {
+		p.putAll(t);
+	}
+
+	public Object remove(Object key) {
+		return p.remove(key);
+	}
+
+	/** @deprecated */
+	public void save(OutputStream out, String comments) {
+		p.save(out, comments);
+	}
+
+	public int size() {
+		return p.size();
+	}
+
+	public void store(OutputStream out, String comments) throws IOException {
+		p.store(out, comments);
+	}
+
+	public void storeToXML(OutputStream os, String comment, String encoding) throws IOException {
+		p.storeToXML(os, comment, encoding);
+	}
+
+	public void storeToXML(OutputStream os, String comment) throws IOException {
+		p.storeToXML(os, comment);
+	}
+
+	public Collection<Object> values() {
+		return p.values();
+	}
+
+	public String toString() {
+		return p.toString();
+	}
+
+	public static Properties restoreFromString(String str) {
+		if (str == null)
+			return new Properties();
+		Properties p = new Properties();
+		try {
+			p.load(new ByteArrayInputStream(str.getBytes()));
+		} catch (IOException e) {
+			throw new IllegalStateException("restore properties from String occer error. str:" + str, e);
+		}
+		return p;
+	}
+
+	private static boolean isBlankString(String value) {
+		return value == null || "".equals(value.trim());
+	}
+
+	private static int[] toIntArray(String[] array) {
+		int[] result = new int[array.length];
+		for (int i = 0; i < array.length; i++) {
+			result[i] = Integer.parseInt(array[i]);
+		}
+		return result;
+	}
+}

src/main/java/com/dashitech/utils/PropertiesUtil.java

@@ -0,0 +1,179 @@
+package com.dashitech.utils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 用于持有Properties,将Propereis变成静态方法使用.
+ */
+public class PropertiesUtil implements InitializingBean {
+	private static Log log = LogFactory.getLog(PropertiesUtil.class);
+
+	public static PropertiesHelper properies = null;
+
+	public void setProperties(Properties properies) {
+		Assert.isNull(PropertiesUtil.properies, "PropertiesUtil alreade hold properties");
+		PropertiesUtil.properies = new PropertiesHelper(properies);
+	}
+
+	// /**
+	// * 重新设置properties
+	// * @param properties
+	// */
+	// public void resetProperties(Properties properties) {
+	// clearHolder();
+	// new PropertiesUtil().setProperties(properties);
+	// }
+
+	/**
+	 * 清空 holder,只有清空Holder才可以重新设置 Properties
+	 */
+	public static void clearHolder() {
+		properies = null;
+	}
+
+	public static void setProperty(String key, String value) {
+		getRequiredHelper().setProperty(key, value);
+	}
+
+	/**
+	 * get readonly Properties
+	 **/
+	public static Properties getProperies() {
+		return (Properties) getRequiredHelper().getProperties().clone();
+	}
+
+	public static boolean getBoolean(String key, boolean defaultValue) {
+		return getRequiredHelper().getBoolean(key, defaultValue);
+	}
+
+	public static Boolean getBoolean(String key) {
+		return getRequiredHelper().getBoolean(key);
+	}
+
+	public static Object getClassInstance(String key, Object defaultinstance) throws IllegalArgumentException {
+		return getRequiredHelper().getClassInstance(key, defaultinstance);
+	}
+
+	public static Object getClassInstance(String key) throws IllegalArgumentException {
+		return getRequiredHelper().getClassInstance(key);
+	}
+
+	public static double getDouble(String key, double defaultValue) {
+		return getRequiredHelper().getDouble(key, defaultValue);
+	}
+
+	public static Double getDouble(String key) {
+		return getRequiredHelper().getDouble(key);
+	}
+
+	public static float getFloat(String key, float defaultValue) {
+		return getRequiredHelper().getFloat(key, defaultValue);
+	}
+
+	public static Float getFloat(String key) {
+		return getRequiredHelper().getFloat(key);
+	}
+
+	public static int getInt(String key, int defaultValue) {
+		return getRequiredHelper().getInt(key, defaultValue);
+	}
+
+	public static int[] getIntArray(String key) {
+		return getRequiredHelper().getIntArray(key);
+	}
+
+	public static Integer getInteger(String key) {
+		return getRequiredHelper().getInteger(key);
+	}
+
+	public static long getLong(String key, long defaultValue) {
+		return getRequiredHelper().getLong(key, defaultValue);
+	}
+
+	public static Long getLong(String key) {
+		return getRequiredHelper().getLong(key);
+	}
+
+	public static String getNullIfBlank(String key) {
+		return getRequiredHelper().getNullIfBlank(key);
+	}
+
+	public static String getNullIfEmpty(String key) {
+		return getRequiredHelper().getNullIfEmpty(key);
+	}
+
+	public static String getProperty(String key, String defaultValue) {
+		return getRequiredHelper().getProperty(key, defaultValue);
+	}
+
+	public static String getProperty(String key) {
+		return getRequiredHelper().getProperty(key);
+	}
+
+	public static boolean getRequiredBoolean(String key) throws IllegalStateException {
+		return getRequiredHelper().getRequiredBoolean(key);
+	}
+
+	public static double getRequiredDouble(String key) throws IllegalStateException {
+		return getRequiredHelper().getRequiredDouble(key);
+	}
+
+	public static float getRequiredFloat(String key) throws IllegalStateException {
+		return getRequiredHelper().getRequiredFloat(key);
+	}
+
+	public static int getRequiredInt(String key) throws IllegalStateException {
+		return getRequiredHelper().getRequiredInt(key);
+	}
+
+	public static long getRequiredLong(String key) throws IllegalStateException {
+		return getRequiredHelper().getRequiredLong(key);
+	}
+
+	public static String getRequiredProperty(String key) throws IllegalStateException {
+		return getRequiredHelper().getRequiredProperty(key);
+	}
+
+	public static Properties getStartsWithProperties(String prefix) {
+		return getRequiredHelper().getStartsWithProperties(prefix);
+	}
+
+	public static String[] getStringArray(String key) {
+		return getRequiredHelper().getStringArray(key);
+	}
+
+	public static URL getURL(String key) throws IllegalArgumentException {
+		return getRequiredHelper().getURL(key);
+	}
+
+	private static PropertiesHelper getRequiredHelper() {
+		assertHolderInited();
+		return properies;
+	}
+
+	private static void assertHolderInited() {
+		if (properies == null)
+			throw new IllegalStateException("PropertiesUtil.properties must be not null, PropertiesUtil not yet init.");
+	}
+
+	public void afterPropertiesSet() throws Exception {
+		assertHolderInited();
+		log.info("PropertiesUtil holded properties:" + getProperies());
+	}
+	
+	public static Map<String,String> getAsMap() {
+		Map<String,String> configs = new HashMap<String, String>();
+		for( Map.Entry<Object,Object> entry : properies.entrySet()) {
+			configs.put(entry.getKey().toString(), entry.getValue().toString());
+		}
+		return configs;
+	}
+}

src/main/java/com/dashitech/utils/Sha1Util.java

@@ -0,0 +1,69 @@
+package com.dashitech.utils;
+
+
+import java.security.MessageDigest;
+import java.util.Formatter;
+import java.util.UUID;
+
+public class Sha1Util {
+
+    public static String getNonce() {
+        String uuid = UUID.randomUUID().toString();
+        return uuid;
+    }
+
+    public static String getTimestamp() {
+        return String.valueOf(System.currentTimeMillis() / 1000);
+    }
+
+
+    private static String byteToHex(final byte[] hash) {
+        Formatter formatter = new Formatter();
+        for (byte b : hash) {
+            formatter.format("%02x", b);
+        }
+        String result = formatter.toString();
+        formatter.close();
+        return result;
+    }
+
+    //SHA1
+    public static String sha1(String str) {
+        if (str == null || str.length() == 0) {
+            return null;
+        }
+        char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+        try {
+            MessageDigest mdTemp = MessageDigest.getInstance("SHA1");
+            mdTemp.update(str.getBytes("UTF-8"));
+
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char buf[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                buf[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                buf[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(buf);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    //SHA-1
+    public static String sha_1(String str) {
+        try {
+            MessageDigest crypt = MessageDigest.getInstance("SHA-1");
+            crypt.reset();
+            crypt.update(str.getBytes("UTF-8"));
+            String signature = byteToHex(crypt.digest());
+            return signature;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+}

src/main/java/com/dashitech/utils/SpringContextHolder.java

@@ -0,0 +1,70 @@
+package com.dashitech.utils;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 以静态变量保存Spring ApplicationContext, 可在任何地方getBean
+ */
+@Component
+public class SpringContextHolder implements ApplicationContextAware {
+    private static ApplicationContext applicationContext;
+
+    /**
+     * 实现ApplicationContextAware接口的context注入函数, 将其存入静态变量.
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) {
+        SpringContextHolder.applicationContext = applicationContext; // NOSONAR
+    }
+
+    /**
+     * 取得存储在静态变量中的ApplicationContext.
+     */
+    public static ApplicationContext getApplicationContext() {
+        checkApplicationContext();
+        return applicationContext;
+    }
+
+    public static <T> T getBean(String name) {
+        return (T) getApplicationContext().getBean(name);
+    }
+
+    public static <T> T getBean(Class<T> clazz) {
+        return (T) getApplicationContext().getBeansOfType(clazz);
+    }
+
+    public static <T> T getBean(Class<T> beanType, Class<? extends Annotation> annotationType) {
+        if (annotationType == null) {
+            return getBean(beanType);
+        }
+        Map<String, T> results = getApplicationContext().getBeansOfType(beanType);
+        List<T> resultsWithAnnotation = new ArrayList<T>();
+        for (Map.Entry<String, T> entry : results.entrySet()) {
+            if (getApplicationContext().findAnnotationOnBean(entry.getKey(), annotationType) != null) {
+                resultsWithAnnotation.add(entry.getValue());
+            }
+        }
+        if (resultsWithAnnotation.isEmpty()) {
+            return null;
+        }
+        if (resultsWithAnnotation.size() == 1) {
+            return resultsWithAnnotation.get(0);
+        }
+        throw new IllegalStateException("参数错误！未获取到对应Bean");
+    }
+
+
+    private static void checkApplicationContext() {
+        if (applicationContext == null) {
+            throw new IllegalStateException("applicaitonContext未注入,请在applicationContext.xml中定义SpringContextHolder");
+        }
+    }
+
+}

src/main/java/com/dashitech/utils/SystemCmdExecutor.java

@@ -0,0 +1,274 @@
+package com.dashitech.utils;
+
+import java.io.*;
+import java.util.Locale;
+import java.util.UUID;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * 执行系统命令，并返回完成信息
+ */
+public class SystemCmdExecutor {
+	private static Log log = LogFactory.getLog(SystemCmdExecutor.class);
+
+	
+
+	/**
+	 * 根据传来的命令执行，返回命令执行完后的信息
+	 * 
+	 * @param command
+	 *            命令
+	 * @param fileRoot
+	 *            命令所在目录
+	 * @param charset
+	 *            返回流字符编码
+	 * @return 完成信息，根据结果处理报错
+	 * @throws IOException
+	 *             如果执行报错，需要抓取错误自主处理
+	 */
+	public static String execute(String command, String fileRoot, String charset) {
+		class ProcessStream extends Thread {
+			private InputStream is;
+			private String type;
+			private String charset;
+			private String info;
+			private String error;
+			ProcessStream(InputStream is, String type,String charset) {
+				this.is = is;
+				this.type = type;
+				this.charset = charset;
+			}
+			public void run() {
+				try {
+					InputStreamReader isr = new InputStreamReader(is, charset);
+					BufferedReader br = new BufferedReader(isr);
+					String line = null;
+					while ((line = br.readLine()) != null) {
+						if (type.equals("ERROR")) {
+							error += line;
+							log.error(line);
+						}else if (type.equals("INFO")) {
+							info += line;
+							log.info(line);
+						}
+					}
+					is.close();
+					isr.close();
+					br.close();
+				} catch (IOException ioe) {
+					ioe.printStackTrace();
+				}
+			}
+			public String getInfo() {
+				return info;
+			}
+			public String getError() {
+				return error;
+			}
+		}
+		
+		String result = "";
+		Runtime rt = Runtime.getRuntime();
+		Process p = null;
+		try {
+			if (fileRoot == null) {
+				p = rt.exec(command);
+			} else {
+				p = rt.exec(command, null, new File(fileRoot));
+			}
+			
+			
+
+			ProcessStream errorStream = new ProcessStream(p.getErrorStream(), "ERROR",charset);
+			ProcessStream infoStream = new ProcessStream(p.getInputStream(), "INFO",charset);
+			errorStream.start();
+			infoStream.start();
+
+			int code = p.waitFor();
+			//0 正常，其他错误
+			if(code == 0) {
+				result = infoStream.getInfo();
+			}else {
+				result = errorStream.getError();
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException("执行系统命令错误！" + command + ";" + e.getMessage());
+		} finally {
+			try {
+				if (p != null) {
+					p.getOutputStream().close();
+					p.destroy();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * 返回字符使用GBK，使用命令路径
+	 * 
+	 * @throws IOException
+	 */
+	public static String execute(String command, String fileRoot) {
+		return execute(command, fileRoot, "GBK");
+	}
+
+	/**
+	 * 返回字符使用GBK，使用系统命令不需要命令目录
+	 * 
+	 * @throws IOException
+	 */
+	public static String execute(String command) {
+		return execute(command, null, "GBK");
+	}
+
+	public static void main(String[] args) throws IOException {
+		String cmd = "D:/G/workbench/myeclipse9_workplace/11cms/src/";
+		String cmd2 = "nginnxReload.bat";
+		// String cmd = "D:/E/software/environment/nginx-1.8.0/";
+		// String cmd2 = "nginx.exe -s reload";
+		// String cmd =
+		// "D:/G/workbench/myeclipse9_workplace/11cms/src/nginnxReload.bat";
+		// String cmd2 = "";
+		// System.out.println(SystemCmdExecutor.execute(cmd + cmd2));
+		System.out.println(SystemCmdExecutor.execute(cmd + cmd2, cmd));
+
+	}
+
+	public static String executeLinuxCmd(String cmd) {
+		System.out.println("执行命令[ " + cmd + "]");
+		Runtime run = Runtime.getRuntime();
+		try {
+			Process process = run.exec(cmd);
+			String line;
+			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+			StringBuffer out = new StringBuffer();
+			while ((line = stdoutReader.readLine()) != null ) {
+				out.append(line);
+			}
+			try {
+				process.waitFor();
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			process.destroy();
+			return out.toString();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * 修改系统时间
+	 * yyyy-MM-dd HH:mm:ss
+	 * @param dataStr_   2017-11-11   yyyy-MM-dd
+	 * @param timeStr_   11:11:11     HH:mm:ss
+	 */
+	public static void updateSysDateTime(String dataStr_,String timeStr_){
+		try {
+			String osName = System.getProperty("os.name");
+			// Window 系统
+			if (osName.matches("^(?i)Windows.*$")) {
+				String cmd;
+				// 格式：yyyy-MM-dd
+				cmd = " cmd /c date " + dataStr_;
+				Runtime.getRuntime().exec(cmd);
+				// 格式 HH:mm:ss
+				cmd = " cmd /c time " + timeStr_;
+				String res = runAndResult(cmd);
+				System.out.println("windows 时间修改" + res);
+			} else if (osName.matches("^(?i)Linux.*$")) {
+				// Linux 系统 格式：yyyy-MM-dd HH:mm:ss   date -s "2017-11-11 11:11:11"
+				String datash = PropertiesUtil.getProperty("date.sh");
+				FileWriter excutefw = new FileWriter(datash+"updateSysTime.sh");
+				BufferedWriter excutebw=new BufferedWriter(excutefw);
+				excutebw.write("date -s \"" + dataStr_ +" "+ timeStr_ +"\"\r\n");
+				excutebw.close();
+				excutefw.close();
+				String cmd_date ="sh "+datash+"updateSysTime.sh";
+				String res = runAndResult(cmd_date);
+				System.out.println("cmd :" + cmd_date + " date :" + dataStr_ +" time :" + timeStr_);
+				System.out.println("linux 时间修改" + res);
+			} else {
+				System.out.println("操作系统无法识别");
+			}
+		} catch (Exception e) {
+			e.getMessage();
+		}
+	}
+
+	/**
+	 * 执行 脚本命令  关心结果
+	 * @param cmd
+	 * @return
+	 */
+	public static String runAndResult(String cmd) throws Exception{
+		StringBuilder sb = new StringBuilder();
+		BufferedReader br = null;
+		boolean execFlag = true;
+
+		String uuid = UUID.randomUUID().toString().replace("-","");
+		String tempFileName = "./temp" + uuid +".sh";
+		try {
+			String osName = System.getProperty("os.name").toUpperCase(Locale.ENGLISH);
+
+			if (osName.matches("^(?i)LINUX.*$") || osName.contains("MAC")) {
+				FileWriter excutefw = new FileWriter(tempFileName);
+				BufferedWriter excutebw=new BufferedWriter(excutefw);
+				excutebw.write(cmd + "\n");
+				excutebw.close();
+				excutefw.close();
+				String command ="bash " + tempFileName;
+
+				Process p = Runtime.getRuntime().exec(command);
+				p.waitFor();
+
+				br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+				String line;
+				while ((line = br.readLine()) != null) {
+					//sb.append("<br/>");
+					sb.append(System.lineSeparator());
+					sb.append(line);
+				}
+				br.close();
+
+				br = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+				while ((line = br.readLine()) != null) {
+					//sb.append("<br/>");
+					sb.append(System.lineSeparator());
+					sb.append(line);
+					if (line.length() > 0){
+						execFlag = false;
+					}
+				}
+				br.close();
+
+				if (execFlag){
+					System.out.println("exec [ {"+cmd+"} ]  OK , result : [ {"+sb.toString()+"} ]");
+				}else {
+					throw new RuntimeException(sb.toString());
+				}
+			}else {
+				throw new RuntimeException("不支持的操作系统类型");
+			}
+		} catch (Exception e) {
+			System.out.println("exec [ {"+cmd+"} ]  fail : {"+e.getMessage()+"}");
+			throw e;
+		}finally {
+			if (br != null){
+				br.close();
+			}
+			File excutefw = new File(tempFileName);
+			excutefw.delete();
+		}
+		return sb.toString();
+	}
+
+}

src/main/java/com/dashitech/utils/ThreadPoolFactory.java

@@ -0,0 +1,31 @@
+package com.dashitech.utils;
+
+import java.util.concurrent.*;
+
+/**
+ * Created by chi on 2020/8/25.
+ */
+
+public abstract class ThreadPoolFactory {
+   // private static final Logger LOG = LoggerFactory.getLogger(ThreadPoolFactory.class);
+    private static ThreadPoolExecutor pool;
+    private static ScheduledThreadPoolExecutor scheduler;
+
+    public synchronized static ExecutorService getCachedPool() {
+        if (pool == null) {
+            pool = (ThreadPoolExecutor) Executors.newCachedThreadPool();
+         //   LOG.info("缓存线程池启动完成！初始化线程池大小：" + pool.getPoolSize());
+        }
+        return pool;
+    }
+
+    public synchronized static ScheduledExecutorService getScheduledPool() {
+        if (scheduler == null) {
+            scheduler = (ScheduledThreadPoolExecutor) Executors.newScheduledThreadPool(5);
+           // LOG.info("定时线程池启动完成！初始化线程池大小：" + scheduler.getPoolSize());
+        }
+        return scheduler;
+    }
+
+}
+

src/main/java/com/dashitech/utils/XmlToMap.java

@@ -0,0 +1,83 @@
+package com.dashitech.utils;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+import java.util.*;
+
+/**
+ * Created by xuweihua on 2021/3/29.
+ */
+public class XmlToMap {
+    public static Map<String, Object> Dom2Map(String xmlStr){
+        Map<String, Object> map = new HashMap<String, Object>();
+        try{
+            Document doc= DocumentHelper.parseText(xmlStr);
+            if(doc == null)
+                return null;
+            Element root = doc.getRootElement();
+            for (Iterator iterator = root.elementIterator(); iterator.hasNext();) {
+                Element e = (Element) iterator.next();
+                //System.out.println(e.getName());
+                List list = e.elements();
+                if(list.size() > 0){
+                    map.put(e.getName(), Dom2Map(e));
+                }else
+                    map.put(e.getName(), e.getText());
+            }
+            return map;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static Map Dom2Map(Element e){
+        Map map = new HashMap();
+        List list = e.elements();
+        if(list.size() > 0){
+            for (int i = 0;i < list.size(); i++) {
+                Element iter = (Element) list.get(i);
+                List mapList = new ArrayList();
+
+                if(iter.elements().size() > 0){
+                    Map m = Dom2Map(iter);
+                    if(map.get(iter.getName()) != null){
+                        Object obj = map.get(iter.getName());
+                        if(!obj.getClass().getName().equals("java.util.ArrayList")){
+                            mapList = new ArrayList();
+                            mapList.add(obj);
+                            mapList.add(m);
+                        }
+                        if(obj.getClass().getName().equals("java.util.ArrayList")){
+                            mapList = (List) obj;
+                            mapList.add(m);
+                        }
+                        map.put(iter.getName(), mapList);
+                    }else
+                        map.put(iter.getName(), m);
+                }
+                else{
+                    if(map.get(iter.getName()) != null){
+                        Object obj = map.get(iter.getName());
+                        if(!obj.getClass().getName().equals("java.util.ArrayList")){
+                            mapList = new ArrayList();
+                            mapList.add(obj);
+                            mapList.add(iter.getText());
+                        }
+                        if(obj.getClass().getName().equals("java.util.ArrayList")){
+                            mapList = (List) obj;
+                            mapList.add(iter.getText());
+                        }
+                        map.put(iter.getName(), mapList);
+                    }else
+                        map.put(iter.getName(), iter.getText());
+                }
+            }
+        }else
+            map.put(e.getName(), e.getText());
+        return map;
+    }
+}

src/main/resources/application-context.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+						http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+						http://www.springframework.org/schema/mvc
+						http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+						http://www.springframework.org/schema/aop 
+						http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
+						http://www.springframework.org/schema/context
+						http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+
+	<!-- 初始化静态资源类 -->
+	<bean id="applicationProperties"
+		class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+		<property name="ignoreResourceNotFound" value="true" />
+		<property name="locations">
+			<list>
+				<value>classpath:application.properties</value>
+				<value>classpath:application-custom.properties</value>
+			</list>
+		</property>
+	</bean>
+
+	<bean class="com.dashitech.utils.PropertiesUtil" lazy-init="false">
+		<property name="properties" ref="applicationProperties" />
+	</bean>
+
+	<bean class="com.dashitech.utils.SpringContextHolder" lazy-init="false" />
+</beans>

src/main/resources/application-custom.properties

@@ -0,0 +1 @@
+custom.redis.expire=60

src/main/resources/application.properties

@@ -0,0 +1,41 @@
+mysql2.spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#\u8F6C\u8FD0\u4E1A\u52A1\u5E93\u6570\u636E\u6E90
+mysql2.spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+mysql2.spring.datasource.url=jdbc:mysql://localhost:3306/hsms2_1129?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+#mysql2.spring.datasource.url=jdbc:mysql://192.168.3.108:3306/hsms2_tjzy_0622?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+mysql2.spring.datasource.username=root
+mysql2.spring.datasource.password=100100
+
+
+# \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
+# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
+mysql2.spring.datasource.initialSize=5
+mysql2.spring.datasource.minIdle=1
+mysql2.spring.datasource.maxActive=150
+# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+mysql2.spring.datasource.maxWait=60000
+# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+mysql2.spring.datasource.timeBetweenEvictionRunsMillis=60000
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+mysql2.spring.datasource.minEvictableIdleTimeMillis=300000
+# Oracle\u8BF7\u4F7F\u7528select 1 from dual
+mysql2.spring.datasource.validationQuery=SELECT 'x'
+mysql2.spring.datasource.testWhileIdle=true
+mysql2.spring.datasource.testOnBorrow=true
+mysql2.spring.datasource.testOnReturn=true
+
+
+spring.redis.host=192.168.245.108
+#spring.redis.host=localhost
+spring.redis.port=6379
+spring.redis.password=Redis@#6379pwD
+spring.redis.pool.max-total=100
+spring.redis.pool.max-idle=20
+spring.redis.pool.max-wait-millis=10000
+spring.profiles.active=custom
+
+server.port=29999
+spring.jps.showsql=true
+server.tomcat.compression=on
+
+spring.jackson.parser.allow-numeric-leading-zeros=true

src/main/resources/banner.txt

@@ -0,0 +1,22 @@
+////////////////////////////////////////////////////////////////////
+//                          _ooOoo_                               //
+//                         o8888888o                              //
+//                         88" . "88                              //
+//                         (| ^_^ |)                              //
+//                         O\  =  /O                              //
+//                      ____/`---'\____                           //
+//                    .'  \\|     |//  `.                         //
+//                   /  \\|||  :  |||//  \                        //
+//                  /  _||||| -卍-|||||-  \                       //
+//                  |   | \\\  -  /// |   |                       //
+//                  | \_|  ''\---/''  |   |                       //
+//                  \  .-\__  `-`  ___/-. /                       //
+//                ___`. .'  /--.--\  `. . ___                     //
+//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
+//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
+//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
+//      ========`-.____`-.___\_____/___.-`____.-'========         //
+//                           `=---='                              //
+//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
+//          佛祖保佑   永不宕机   永无BUG  大势雄起               //
+////////////////////////////////////////////////////////////////////

src/main/resources/log4j.properties

@@ -0,0 +1,37 @@
+log4j.rootLogger=INFO,conso,stdout
+
+log4j.appender.conso=org.apache.log4j.ConsoleAppender
+log4j.appender.conso.layout=org.apache.log4j.PatternLayout
+log4j.appender.conso.layout.ConversionPattern=%d %p [%c.%M_%L] - %m%n
+
+log4j.appender.stdout=org.apache.log4j.RollingFileAppender
+log4j.appender.stdout.File=logs/master.log
+log4j.appender.stdout.MaxFileSize=10240KB
+log4j.appender.stdout.Encoding=UTF-8
+#log4j.appender.stdout.MaxBackupIndex=3
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c.%M_%L] - %m%n
+
+
+log4j.appender.error=org.apache.log4j.RollingFileAppender
+log4j.appender.error.File=logs/error.log
+log4j.appender.error.MaxFileSize=10240KB
+log4j.appender.error.Encoding=UTF-8
+log4j.appender.error.layout=org.apache.log4j.PatternLayout
+log4j.appender.error.layout.ConversionPattern=%d %p [%c.%M_%L] - %m%n
+
+log4j.logger.com.dashitech.mc.core=TRACE
+
+log4j.logger.org.springframework=ERROR
+#log4j.logger.com.ibatis=debug
+#log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=debug
+#log4j.logger.com.ibatis.common.jdbc.ScriptRunner=debug
+#log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=debug
+#log4j.logger.org.hibernate.SQL=debug
+#log4j.logger.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+#log4j.logger.org.hibernate.tool.hbm2ddl=debug 
+#log4j.logger.java.sql=DEBUG
+#log4j.logger.java.sql.Connection=debug
+#log4j.logger.java.sql.Statement=debug
+#log4j.logger.java.sql.PreparedStatement=debug
+#log4j.logger.java.sql.ResultSet=debug

src/main/resources/start.bat

@@ -0,0 +1,5 @@
+echo "start ing"
+
+java -Xmx512m -XX:MaxPermSize=256m -jar C:/Users/Administrator/Desktop/hsmsV1-DataService-1.0.0.jar --server.port=8080 &
+
+echo "start end"

src/main/resources/start.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+HOME=`pwd`
+NAME=hsmsV1-CallSocket
+LOG=$HOME/logs/itsm.log
+
+echo "service $NAME start"
+echo ""
+
+
+
+nohup java -server -Xms256m -Djava.security.egd=file:/dev/./urandom -jar /home/itsm/itsm_v2/hsmsV1-CallSocket/HSMSV1-CallSocket-1.0.0.jar --server.port=29999 > $LOG 2>&1 &
+
+echo ""
+echo "service $NAME completed"

src/main/resources/startCollect.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+NAME=hsmsV1-DataService
+
+echo "service $NAME start"
+echo ""
+
+HOME=`pwd`
+LOG=$HOME/logs/itsm.log
+CONFS=$HOME/conf
+CLASSES=$HOME/classes
+LIBS=$HOME/lib
+JARS=`ls $LIBS|grep .jar|awk '{print "'$LIBS'/"$0}'|tr "\n" ":"`
+JAVA_OPTS=" -server -Xms10g -Xmx20g -XX:PermSize=2g -XX:SurvivorRatio=2 -XX:+UseParallelGC "
+CLASS_PATH=$CONFS:$CLASSES:$JARS:$NAME
+
+nohup java $JAVA_OPTS -classpath $CLASS_PATH com.dashitech.Application > $LOG 2>&1 &
+
+echo ""
+echo "service $NAME completed"

src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+  <display-name></display-name>
+
+    <servlet>
+        <servlet-name>AtmosphereServlet</servlet-name>
+        <servlet-class>org.atmosphere.cpr.AtmosphereServlet</servlet-class>
+        <init-param>
+            <param-name>org.atmosphere.cpr.packages</param-name>
+            <param-value>com.dashitech.callcenter.webSocket.service</param-value>
+        </init-param>
+        <load-on-startup>0</load-on-startup>
+    </servlet>
+
+
+    <servlet-mapping>
+        <servlet-name>AtmosphereServlet</servlet-name>
+        <url-pattern>/webSocket/*</url-pattern>
+    </servlet-mapping>
+
+
+</web-app>