Browse Source

完善接口,单元测试

wangwei 7 years ago
parent
commit
edb860840f

+ 3 - 3
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/main/resources/hsweb-starter.js

@@ -59,10 +59,10 @@ function install(context) {
     database.createOrAlter("s_dyn_form_log")
         .addColumn().name("u_id").alias("id").comment("ID").jdbcType(java.sql.JDBCType.VARCHAR).length(32).primaryKey().commit()
         .addColumn().name("form_id").alias("formId").comment("表单ID").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
-        .addColumn().name("version").alias("version").comment("发布的版本").jdbcType(java.sql.JDBCType.NUMERIC).length(32).commit()
-        .addColumn().name("deploy_time").alias("deployTime").comment("发布时间").jdbcType(java.sql.JDBCType.DECIMAL).commit()
+        .addColumn().name("version").alias("version").comment("发布的版本").jdbcType(java.sql.JDBCType.NUMERIC).length(32,0).commit()
+        .addColumn().name("deploy_time").alias("deployTime").comment("发布时间").jdbcType(java.sql.JDBCType.DECIMAL).length(32,0).commit()
         .addColumn().name("meta_data").alias("metaData").comment("部署的元数据").jdbcType(java.sql.JDBCType.CLOB).commit()
-        .addColumn().name("status").alias("status").comment("状态").jdbcType(java.sql.JDBCType.NUMERIC).length(4).commit()
+        .addColumn().name("status").alias("status").comment("状态").jdbcType(java.sql.JDBCType.NUMERIC).length(4,0).commit()
         .comment("表单发布日志").commit();
 }
 //设置依赖

+ 0 - 30
hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-api/src/main/java/org/hswebframework/web/service/oauth2.client/request/definition/ResponseConvertForServerIdDefinition.java

@@ -1,30 +0,0 @@
-/*
- *  Copyright 2016 http://www.hswebframework.org
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *
- */
-
-package org.hswebframework.web.service.oauth2.client.request.definition;
-
-import org.hswebframework.web.service.oauth2.client.request.ResponseConvertHandler;
-
-/**
- * TODO 完成注释
- *
- * @author zhouhao
- */
-public interface ResponseConvertForServerIdDefinition extends ResponseConvertHandler {
-    String getServerId();
-}

+ 3 - 2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/service/imp/BpmTaskServiceImp.java

@@ -169,7 +169,8 @@ public class BpmTaskServiceImp extends FlowableAbstract implements BpmTaskServic
 
     @Override
     public Map<String,Object> getUserTasksByProcDefKey(String procDefKey){
-        List<ActivityImpl> activitiList = bpmActivityService.getUserTasksByProcDefKey(procDefKey);
+        String definitionId = repositoryService.createProcessDefinitionQuery().processDefinitionKey(procDefKey).orderByProcessDefinitionVersion().desc().list().get(0).getId();
+        List<ActivityImpl> activitiList = bpmActivityService.getUserTasks(definitionId);
         Map<String,Object> map = new HashMap<>();
         for(ActivityImpl activity:activitiList){
             map.put(activity.getId(),activity.getProperty("name"));
@@ -180,7 +181,7 @@ public class BpmTaskServiceImp extends FlowableAbstract implements BpmTaskServic
     @Override
     public Map<String, Object> getUserTasksByProcInstId(String procInstId) {
         String definitionId = runtimeService.createProcessInstanceQuery().processInstanceId(procInstId).singleResult().getProcessDefinitionId();
-        List<ActivityImpl> activitiList = bpmActivityService.getUserTasksByProcDefId(definitionId);
+        List<ActivityImpl> activitiList = bpmActivityService.getUserTasks(definitionId);
         Map<String,Object> map = new HashMap<>();
         for(ActivityImpl activity:activitiList){
             map.put(activity.getId(),activity.getProperty("name"));