优化升级ezorm

shangyi0102 · Mar 22, 2017 · 22a15ab · 22a15ab
1 parent 5e61f68
commit 22a15ab
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/CoreAutoConfiguration.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/CoreAutoConfiguration.java
@@ -40,7 +40,7 @@ public void init() {
 
     private void initScript() {
         Map<String, Object> vars = new HashMap<>(expressionScopeBeanMap);
-        vars.put("LoginUser", (Supplier) () -> WebUtil.getLoginUser());
+        vars.put("LoginUser", (Supplier<User>) WebUtil::getLoginUser);
         vars.put("StringUtils", StringUtils.class);
         vars.put("User", User.class);
 

diff --git a/...o/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/builder/InsertSqlBuilder.java b/...o/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/builder/InsertSqlBuilder.java
@@ -23,7 +23,7 @@ public SQL render(RDBTableMetaData metaData, InsertParam param) {
     }
 
     @Override
-    protected SqlAppender getParamString(String paramName, RDBColumnMetaData rdbColumnMetaData) {
+    protected SqlAppender getParamString(String prefix, String paramName, RDBColumnMetaData rdbColumnMetaData) {
         return new SqlAppender().add("#{", paramName,
                 ",javaType=", EasyOrmSqlBuilder.getJavaType(rdbColumnMetaData.getJavaType()),
                 ",jdbcType=", rdbColumnMetaData.getJdbcType(), "}");

diff --git a/...-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/DeleteService.java b/...-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/DeleteService.java
@@ -17,7 +17,7 @@ public interface DeleteService<Pk> {
      */
     int delete(Pk pk);
 
-    Delete createDelete();
+    Delete<DeleteParam> createDelete();
 
     /**
      * 指定一个dao映射接口,接口需继承{@link GenericMapper}创建dsl数据删除操作对象<br>
@@ -32,10 +32,9 @@ public interface DeleteService<Pk> {
      * @see org.hsweb.ezorm.core.Conditional
      * @since 2.2
      */
-    static Delete createDelete(DeleteMapper mapper) {
-        Delete update = new Delete();
-        update.setParam(new DeleteParam());
-        update.setExecutor(param -> mapper.delete(((DeleteParam) param)));
+    static Delete<DeleteParam> createDelete(DeleteMapper mapper) {
+        Delete<DeleteParam> update = new Delete<>(new DeleteParam());
+        update.setExecutor(mapper::delete);
         return update;
     }
 
@@ -46,10 +45,9 @@ static Delete createDelete(DeleteMapper mapper) {
      * @return {@link Delete}
      * @since 2.2
      */
-    static Delete createDelete(Delete.Executor<DeleteParam> executor) {
-        Delete update = new Delete();
-        update.setParam(new DeleteParam());
-        update.setExecutor(param -> executor.doExecute(((DeleteParam) param)));
+    static Delete<DeleteParam> createDelete(Delete.Executor<DeleteParam> executor) {
+        Delete<DeleteParam> update = new Delete<>(new DeleteParam());
+        update.setExecutor(executor::doExecute);
         return update;
     }
 

diff --git a/...b-web-service-simple/src/main/java/org/hsweb/web/service/commons/SimpleDeleteService.java b/...b-web-service-simple/src/main/java/org/hsweb/web/service/commons/SimpleDeleteService.java
@@ -24,7 +24,7 @@ default int delete(Pk pk) {
      * @see Delete
      * @see GenericService#createDelete(DeleteMapper)
      */
-    default Delete createDelete() {
+    default Delete<DeleteParam> createDelete() {
         return DeleteService.createDelete(getDeleteMapper());
     }
 

diff --git a/...service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java b/...service-simple/src/main/java/org/hsweb/web/service/impl/module/ModuleMetaServiceImpl.java
@@ -50,7 +50,7 @@ public int delete(String s) {
         return super.delete(s);
     }
 
-    static final Function<Object, Object> roleIdValueMapper = (value) -> "," + value + ",";
+    static final Function<String, String> roleIdValueMapper = (value) -> "," + value + ",";
 
     protected QueryParam createSelectByKeyAndRoleIdParam(String key, List<String> roleIds) {
         // (id = ? or key = ? or module_id = ? ) and (role_id like ? or .....) and (role_id is null or role_id ='')
@@ -61,8 +61,8 @@ protected QueryParam createSelectByKeyAndRoleIdParam(String key, List<String> ro
                 //遍历roleId,使用 like %% 并将值转为 ,value, 格式进行查询
                 //如果有条件,应该写sql函数,将数据库中的值转为结果集和参数进行对比
                 .nest()
-                    .nest().each(roleId, roleIds, query -> query::$like$, roleIdValueMapper).end()
-                    .orNest().isNull(roleId).or().isEmpty(roleId).end()
+                .nest().each(roleId, roleIds, query -> query::$like$, roleIdValueMapper).end()
+                .orNest().isNull(roleId).or().isEmpty(roleId).end()
                 .end()
                 .getParam();
     }