diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java index a79d370..6ff7098 100644 --- a/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java +++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java @@ -260,7 +260,6 @@ public class EventApiController { os.close(); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/PreItemDalImpl.java b/radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/PreItemDalImpl.java index 247da7e..97d1ba3 100644 --- a/radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/PreItemDalImpl.java +++ b/radar-dal/src/main/java/com.pgmmers.radar/dal/model/impl/PreItemDalImpl.java @@ -35,7 +35,8 @@ public class PreItemDalImpl implements PreItemDal { PreItemPO preItem = preItemMapper.selectByPrimaryKey(id); if (preItem != null) { PreItemVO preItemVO = new PreItemVO(); - BeanUtils.copyProperties(preItem, preItemVO); + //BeanUtils.copyProperties(preItem, preItemVO); + preItemVO = POVOUtils.copyFromPreItemPO(preItem); return preItemVO; } return null; diff --git a/radar-dal/src/main/java/com.pgmmers.radar/vo/model/PreItemVO.java b/radar-dal/src/main/java/com.pgmmers.radar/vo/model/PreItemVO.java index 1fecb19..9923ada 100644 --- a/radar-dal/src/main/java/com.pgmmers.radar/vo/model/PreItemVO.java +++ b/radar-dal/src/main/java/com.pgmmers.radar/vo/model/PreItemVO.java @@ -25,6 +25,7 @@ public class PreItemVO implements Serializable{ private String plugin; + private String reqType = "GET"; @JsonProperty private JsonNode configJson; @@ -156,4 +157,13 @@ public class PreItemVO implements Serializable{ public void setConfigJson(JsonNode configJson) { this.configJson = configJson; } + + + public String getReqType() { + return reqType; + } + + public void setReqType(String reqType) { + this.reqType = reqType; + } } diff --git a/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java b/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java index 2f4f109..e5c9186 100644 --- a/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java +++ b/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java @@ -52,6 +52,12 @@ public class PreItemPO { @Column(name = "CONFIG_JSON") private String configJson; + /** + * 请求方式 + */ + @Column(name = "REQ_TYPE") + private String reqType; + @Column(name = "STATUS") private Integer status; @@ -211,6 +217,24 @@ public class PreItemPO { this.configJson = configJson; } + /** + * 获取请求方式 + * + * @return REQ_TYPE - 请求方式 + */ + public String getReqType() { + return reqType; + } + + /** + * 设置请求方式 + * + * @param reqType 请求方式 + */ + public void setReqType(String reqType) { + this.reqType = reqType; + } + /** * @return STATUS */ diff --git a/radar-dao/src/main/resources/mapping/PreItemMapper.xml b/radar-dao/src/main/resources/mapping/PreItemMapper.xml index a9b56f0..6eb20b6 100644 --- a/radar-dao/src/main/resources/mapping/PreItemMapper.xml +++ b/radar-dao/src/main/resources/mapping/PreItemMapper.xml @@ -14,6 +14,7 @@ + diff --git a/sql/radar-1.0.2.sql b/sql/radar-1.0.2.sql index 9b07006..2879725 100644 --- a/sql/radar-1.0.2.sql +++ b/sql/radar-1.0.2.sql @@ -1,2 +1,7 @@ ALTER TABLE `engine_pre_item` -ADD COLUMN `CONFIG_JSON` varchar(150) NULL AFTER `PLUGIN`; \ No newline at end of file + MODIFY COLUMN `ARGS` varchar(128) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT '' COMMENT '参数' AFTER `LABEL`; +ALTER TABLE `engine_pre_item` +ADD COLUMN `CONFIG_JSON` varchar(150) NULL COMMENT '响应字段配置信息' AFTER `PLUGIN`; +ALTER TABLE `engine_pre_item` + ADD COLUMN `REQ_TYPE` varchar(16) NULL COMMENT '请求方式' AFTER `CONFIG_JSON`; + diff --git a/webapp/note.txt b/webapp/note.txt index 479acad..e62c34a 100644 --- a/webapp/note.txt +++ b/webapp/note.txt @@ -1 +1 @@ -//TODO: 项目前后端分离,此目录用于存放前端代码 \ No newline at end of file +//项目前后端分离,此目录用于存放前端代码 \ No newline at end of file