平台功能优化，移除通用缓存服务

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -159,13 +159,6 @@ public class Pager {
     }
 
     public int getEndRow() {
-        if(pageSize > 0){
-            if(currentPage > 1){
-                return currentPage * pageSize;
-            }else {
-                return pageSize;
-            }
-        }
         return endRow;
     }
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 
 /**
  * @Description :
@@ -1573,7 +1574,7 @@ public class CommonEnumUtil {
         BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null),
         BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null),
-        DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss");
+        DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", Timestamp.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss");
 
         /**
          * 属性类型值
@@ -1911,6 +1912,19 @@ public class CommonEnumUtil {
             return null;
         }
 
+        public String getJDBCUrl(String database,String host,Integer port,String instanceName){
+            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
+                return getJDBCUrlMySQL(database,host,port);
+            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
+                return getJDBCUrlOracle(database,host,port);
+            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
+                return getJDBCUrlPostgreSQL(database,host,port);
+            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
+                return getJDBCUrlSQLServer(database,host,port,instanceName);
+            }
+            return null;
+        }
+
         public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
             if(StringUtils.isNotBlank(databaseProductName)){
                 if(databaseProductName.indexOf(":mysql:") != -1){
@@ -1941,6 +1955,22 @@ public class CommonEnumUtil {
         private String getJDBCUrlSQLServer(String database,String host,Integer port){
             return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
         }
+
+        private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
+            StringBuffer sb = new StringBuffer();
+            sb.append("jdbc:sqlserver://").append(host);
+            // 实例
+            if (StringUtils.isNotBlank(instanceName)) {
+                sb.append("\\").append(instanceName);
+            }
+            //  端口
+            sb.append(":").append(port);
+            // 数据库
+            sb.append(";database=").append(database);
+            // 自动重连
+            sb.append(";autoReconnect=true");
+            return sb.toString();
+        }
     }
 
     /**

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -345,8 +345,8 @@ public class CoreHqlPack {
     public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) {
         DdlPackBean result = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result);
         DdlPreparedPack.getStringEqualPack(role.getName(), "name", result);
-        DdlPreparedPack.getNumEqualPack(role.getId(), "id", result);
         return result;
     }