From 2b08d0e01bc5218e03112d52144175c163f123c9 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 24 May 2021 09:21:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=92=8C=E6=8F=92=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=90=8D=E7=A7=B0=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java | 4 ++++ .../src/main/java/com/ccsens/tall/web/PluginController.java | 5 +++-- tall/src/main/resources/mapper_dao/TaskPluginDao.xml | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java index 3fbc1f3f..2e57d621 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java @@ -138,6 +138,10 @@ public class PluginVo { private String description; @ApiModelProperty("插件作者") private Long pluginAuthor; + @ApiModelProperty("插件类型") + private Byte pluginClass; + @ApiModelProperty("插件类型名称") + private String typeName; @ApiModelProperty("插件预览图片") private List previewImgs = new ArrayList<>(); @JsonIgnore diff --git a/tall/src/main/java/com/ccsens/tall/web/PluginController.java b/tall/src/main/java/com/ccsens/tall/web/PluginController.java index ea600c3d..ce96a1bc 100644 --- a/tall/src/main/java/com/ccsens/tall/web/PluginController.java +++ b/tall/src/main/java/com/ccsens/tall/web/PluginController.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.List; @Slf4j @@ -27,9 +28,9 @@ import java.util.List; @RestController @RequestMapping("/plugins") public class PluginController { - @Autowired + @Resource private ITaskPluginService taskPluginService; - @Autowired + @Resource private ISysPluginService sysPluginService; diff --git a/tall/src/main/resources/mapper_dao/TaskPluginDao.xml b/tall/src/main/resources/mapper_dao/TaskPluginDao.xml index b75acc90..bd5b2338 100644 --- a/tall/src/main/resources/mapper_dao/TaskPluginDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskPluginDao.xml @@ -10,6 +10,8 @@ tf.visit_location AS iconUrl, sp.description AS description, sp.plugin_author AS pluginAuthor, + sp.plugin_class AS pluginClass, + pt.type_name AS typeName, ptp.task_detail_id, ptp.member_role_id, CONCAT_WS(',',GROUP_CONCAT(DISTINCT sp.plugin_icon),GROUP_CONCAT(DISTINCT pppf.file_id)) AS fileIdList @@ -17,6 +19,7 @@ t_pro_task_plugin AS ptp LEFT JOIN t_sys_plugin AS sp ON ptp.plugin_id = sp.id AND sp.rec_status = 0 LEFT JOIN t_file AS tf ON sp.plugin_icon = tf.id AND tf.rec_status = 0 + LEFT JOIN t_sys_plugin_type AS pt ON pt.plugin_code = sp.plugin_class AND pt.rec_status = 0 LEFT JOIN t_pro_plugin_preview_file AS pppf ON sp.id = pppf.plugin_id AND pppf.rec_status = 0 AND sp.rec_status = 0 WHERE @@ -39,11 +42,14 @@ sp.plugin_icon AS pluginIcon, tf.visit_location AS iconUrl, sp.description AS description, + sp.plugin_class AS pluginClass, + pt.type_name AS typeName, sp.plugin_author AS pluginAuthor, CONCAT_WS(',',GROUP_CONCAT(DISTINCT sp.plugin_icon),GROUP_CONCAT(DISTINCT pppf.file_id)) AS fileIdList FROM t_sys_plugin AS sp LEFT JOIN t_file AS tf ON sp.plugin_icon = tf.id + LEFT JOIN t_sys_plugin_type AS pt ON pt.plugin_code = sp.plugin_class AND pt.rec_status = 0 LEFT JOIN t_pro_plugin_preview_file AS pppf ON sp.id = pppf.plugin_id AND pppf.rec_status = 0 WHERE sp.id NOT IN (