Commit 008c0a82 authored by mcb's avatar mcb

commit

parent d8b06dd8
package com.jz.dmp.modules.controller;
import com.jz.dmp.modules.model.DmpTableColumn;
import com.jz.dmp.modules.service.DmpTableColumnService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 项目表字段(DmpTableColumn)表控制层
*
* @author Bellamy
* @since 2020-12-23 16:34:56
*/
@RestController
@RequestMapping("/dmpTableColumn")
public class DmpTableColumnController {
/**
* 服务对象
*/
@Autowired
private DmpTableColumnService dmpTableColumnService;
}
\ No newline at end of file
package com.jz.dmp.modules.controller;
import com.jz.dmp.modules.model.DmpTable;
import com.jz.dmp.modules.service.DmpTableService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 项目表信息(DmpTable)表控制层
*
* @author Bellamy
* @since 2020-12-23 15:32:57
*/
@RestController
@RequestMapping("dmpTable")
public class DmpTableController {
/**
* 服务对象
*/
@Resource
private DmpTableService dmpTableService;
}
\ No newline at end of file
package com.jz.dmp.modules.controller;
import com.jz.dmp.modules.model.DmpTableFieldMapping;
import com.jz.dmp.modules.service.DmpTableFieldMappingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 项目表字段类型映射(DmpTableFieldMapping)表控制层
*
* @author Bellamy
* @since 2020-12-23 16:34:55
*/
@RestController
@RequestMapping("dmpTableFieldMapping")
public class DmpTableFieldMappingController{
/**
* 服务对象
*/
@Autowired
private DmpTableFieldMappingService dmpTableFieldMappingService;
}
\ No newline at end of file
package com.jz.dmp.modules.controller;
import com.jz.dmp.modules.model.DmpTableFieldSchema;
import com.jz.dmp.modules.service.DmpTableFieldSchemaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 项目表字段类型(DmpTableFieldSchema)表控制层
*
* @author Bellamy
* @since 2020-12-23 16:34:56
*/
@RestController
@RequestMapping("dmpTableFieldSchema")
public class DmpTableFieldSchemaController{
/**
* 服务对象
*/
@Autowired
private DmpTableFieldSchemaService dmpTableFieldSchemaService;
}
\ No newline at end of file
package com.jz.dmp.modules.controller;
import com.jz.dmp.modules.service.DvRuleTService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* ???(DvRuleT)表控制层
*
* @author Bellamy
* @since 2020-12-24 10:56:18
*/
@RestController
@RequestMapping("/dvRuleT")
public class DvRuleTController {
/**
* 服务对象
*/
@Autowired
private DvRuleTService dvRuleTService;
}
\ No newline at end of file
...@@ -1248,7 +1248,7 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop ...@@ -1248,7 +1248,7 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
List<Map> list = executionFlowsMapper.queryExamplesLogByExecId(execId); List<Map> list = executionFlowsMapper.queryExamplesLogByExecId(execId);
if(list.size() > 0 && list != null) { if(list.size() > 0 && list != null) {
list.forEach(map -> { list.forEach(map -> {
map.put("log", map.get("log")); //map.put("log", map.get("log"));
}); });
} }
return JsonResult.ok(list); return JsonResult.ok(list);
......
...@@ -192,6 +192,13 @@ ...@@ -192,6 +192,13 @@
<if test="endTime != null and endTime != ''">#{endTime} >= and from_unixtime(submit_time/1000,'%Y-%m-%d %H:%i:%s')</if> <if test="endTime != null and endTime != ''">#{endTime} >= and from_unixtime(submit_time/1000,'%Y-%m-%d %H:%i:%s')</if>
</select> </select>
<!-- <resultMap type="java.util.HashMap" id="taskExamplesLog">
<result property="execId" column="exec_id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="log" column="log" jdbcType="BLOB" typeHandler="com.jz.common.persistence.CBTHandler"/>
<result property="uploadTime" column="upload_time" jdbcType="INTEGER"/>
</resultMap>-->
<!--获取执行实例的日志详情--> <!--获取执行实例的日志详情-->
<select id="queryExamplesLogByExecId" parameterType="string" resultType="java.util.Map"> <select id="queryExamplesLogByExecId" parameterType="string" resultType="java.util.Map">
select select
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment