diff --git a/common/common-association/pom.xml b/common/common-association/pom.xml
index 1b9cc10..2226fb4 100644
--- a/common/common-association/pom.xml
+++ b/common/common-association/pom.xml
@@ -23,17 +23,16 @@
javacv-platform
1.5.13
-
-
-
-
-
+
+ apelet
+ common-msg-notice
+ 1.0.0
+
apelet
common-core
1.0.0
-
apelet
common-generator
@@ -49,14 +48,11 @@
apelet
1.0.0
-
common-msg-notice
apelet
1.0.0
-
-
com.google.zxing
core
@@ -67,18 +63,6 @@
javase
3.5.1
-
- apelet
- common-core
- 1.0.0
- compile
-
-
- apelet
- common-core
- 1.0.0
- compile
-
diff --git a/common/common-association/src/main/java/apelet/association/plugin/active/ActivityInfoUpdatePlugin.java b/common/common-association/src/main/java/apelet/association/plugin/active/ActivityInfoUpdatePlugin.java
new file mode 100644
index 0000000..c4533b8
--- /dev/null
+++ b/common/common-association/src/main/java/apelet/association/plugin/active/ActivityInfoUpdatePlugin.java
@@ -0,0 +1,36 @@
+package apelet.association.plugin.active;
+
+import apelet.common.core.object.ObjectValue;
+import apelet.common.core.util.ApplicationContextHolder;
+import apelet.common.generator.utils.OrmGenDataSourceUtil;
+import apelet.common.online.abstractplugin.ListPlugin;
+import apelet.common.online.model.constant.AttributeEnum;
+
+/**
+ * 活动编辑插件
+ */
+public class ActivityInfoUpdatePlugin extends ListPlugin {
+
+ private OrmGenDataSourceUtil ormGenDataSourceUtil;
+
+ public ActivityInfoUpdatePlugin() {
+ ormGenDataSourceUtil = ApplicationContextHolder.getBean(OrmGenDataSourceUtil.class);
+ }
+
+
+ @Override
+ public void formCreated(String widgetVariableName, ObjectValue objectValue) {
+ setWidgetAttribute("id", AttributeEnum.SHOW, false);
+
+ }
+
+ @Override
+ public void change(String widgetVariableName, ObjectValue objectValue) {
+
+ }
+
+ @Override
+ public void buttonTriggered(String widgetVariableName, ObjectValue objectValue) {
+
+ }
+}
diff --git a/common/common-association/src/main/java/apelet/association/plugin/active/ActivitySignConfigPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/active/ActivitySignConfigPlugin.java
index 31ed774..f147a63 100644
--- a/common/common-association/src/main/java/apelet/association/plugin/active/ActivitySignConfigPlugin.java
+++ b/common/common-association/src/main/java/apelet/association/plugin/active/ActivitySignConfigPlugin.java
@@ -63,10 +63,9 @@ public class ActivitySignConfigPlugin extends ListPlugin {
this.setWidgetAttribute("activityId", AttributeEnum.VALUE_CHANGE, parentParams);
Filter filter = new Filter();
filter.add(new FilterItem("activity_id", FilterItem.equals, activityId));
- Object data = ormGenDataSourceUtil.queryData("orm", "activity_sign_config", filter, new Selector(), new Sorter(), new HashMap<>());
- if (data instanceof ObjectCollection) {
- ObjectCollection collection = (ObjectCollection) data;
- ObjectValue object = collection.getObject(0);
+ ObjectCollection data = ormGenDataSourceUtil.query( "activity_sign_config", filter, new Selector(), new Sorter());
+ if (data != null && !data.isEmpty()) {
+ ObjectValue object = data.getObject(0);
this.setWidgetAttribute("id", AttributeEnum.VALUE_CHANGE, object.get("id"));
this.setWidgetAttribute("checkAction", AttributeEnum.VALUE_CHANGE, object.get("check_action"));
@@ -87,7 +86,6 @@ public class ActivitySignConfigPlugin extends ListPlugin {
log.error("二维码数据转换失败!!!");
ee.printStackTrace();
}
-
}
this.setWidgetAttribute("id", AttributeEnum.SHOW, false);
this.setWidgetAttribute("activityId", AttributeEnum.SHOW, false);
diff --git a/common/common-association/src/main/java/apelet/association/plugin/active/CompetitionActivitiesListPlugin.java b/common/common-association/src/main/java/apelet/association/plugin/active/CompetitionActivitiesListPlugin.java
new file mode 100644
index 0000000..5502993
--- /dev/null
+++ b/common/common-association/src/main/java/apelet/association/plugin/active/CompetitionActivitiesListPlugin.java
@@ -0,0 +1,69 @@
+package apelet.association.plugin.active;
+
+import apelet.common.core.object.ObjectCollection;
+import apelet.common.core.object.ObjectValue;
+import apelet.common.core.util.ApplicationContextHolder;
+import apelet.common.generator.utils.OrmGenDataSourceUtil;
+import apelet.common.online.abstractplugin.ListPlugin;
+import apelet.common.online.model.ShowParameter;
+import apelet.common.online.model.constant.ShowTypeEnum;
+import apelet.common.online.model.constant.ViewStatus;
+import apelet.common.orm.impl.Filter;
+import apelet.common.orm.impl.FilterItem;
+import apelet.common.orm.impl.Selector;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 大赛活动列表 插件
+ */
+public class CompetitionActivitiesListPlugin extends ListPlugin {
+
+ private OrmGenDataSourceUtil ormGenDataSourceUtil;
+
+ public CompetitionActivitiesListPlugin() {
+ ormGenDataSourceUtil = ApplicationContextHolder.getBean(OrmGenDataSourceUtil.class);
+ }
+
+ @Override
+ protected Filter getFilter() {
+ Filter filter = new Filter();
+ filter.add(new FilterItem("name", FilterItem.equals, "大赛"));
+ ObjectCollection collection = ormGenDataSourceUtil.query("activity_tags", filter, new Selector());
+ Filter filter1 = new Filter();
+ if (collection != null && !collection.isEmpty()) {
+ ObjectValue object = collection.getObject(0);
+ String labelId = object != null &&
+ StringUtils.isNotEmpty(object.getString("id")) ? object.getString("id") : "0";
+ filter1.add(new FilterItem("label", FilterItem.equals, labelId));
+ }else{
+ filter1.add(new FilterItem("label", FilterItem.equals, -1));
+ }
+ return filter1;
+ }
+
+ @Override
+ public void buttonTriggered(String widgetVariableName, ObjectValue objectValue) {
+ if(widgetVariableName.equals("作品投稿")){
+ List