优化添加

java110-generator/src/main/resources/web/template_1.json

@@ -1,70 +1,109 @@
 {
-  "templateName": "问卷题目",
+  "templateName": "活动规则",
   "directories": "property",
-  "templateCode": "questionAnswerTitle",
-  "templateKey": "titleId",
-  "templateKeyName": "题目ID",
-  "searchCode": "titleId",
-  "searchName": "题目ID",
+  "templateCode": "activitiesRule",
+  "templateKey": "ruleId",
+  "templateKeyName": "规则ID",
+  "searchCode": "ruleId",
+  "searchName": "规则ID",
   "conditions": [
     {
-      "name": "题目类型",
+      "name": "活动类型",
       "inputType": "select",
-      "selectValue": "1001,2002,3003",
-      "selectValueName": "单选,多选,简答题",
-      "code": "titleType",
+      "selectValue": "6666",
+      "selectValueName": "最美员工",
+      "code": "ruleType",
       "whereCondition": "equal"
     },
     {
-      "name": "问卷名称",
+      "name": "规则名称",
       "inputType": "input",
-      "code": "qaTitle",
+      "code": "ruleName",
       "whereCondition": "equal"
     },
     {
-      "name": "题目ID",
-      "inputType": "input",
-      "code": "titleId",
+      "name": "活动对象",
+      "inputType": "select",
+      "selectValue": "2222,3333,4444",
+      "selectValueName": "大众,业主,员工",
+      "code": "activitiesObj",
       "whereCondition": "equal"
     }
   ],
   "columns": [
     {
-      "code": "titleType",
-      "cnCode": "题目类型",
-      "desc": "必填，请选择题目类型",
+      "code": "ruleType",
+      "cnCode": "活动类型",
+      "desc": "必填，请填写活动类型",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "select",
-      "selectValue": "1001,2002,3003",
-      "selectValueName": "单选,多选,简答题",
+      "selectValue": "6666",
+      "selectValueName": "最美员工",
       "limit": "num",
       "limitParam": "",
-      "limitErrInfo": "题目类型格式错误",
+      "limitErrInfo": "活动类型格式错误",
       "show": true
     },
     {
-      "code": "qaTitle",
-      "cnCode": "问卷题目",
-      "desc": "必填，请填写问卷题目",
+      "code": "ruleName",
+      "cnCode": "规则名称",
+      "desc": "必填，请填写规则名称",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "maxLength",
-      "limitParam": "256",
-      "limitErrInfo": "问卷题目太长",
+      "limitParam": "128",
+      "limitErrInfo": "规则名称太长",
       "show": true
     },
     {
-      "code": "seq",
-      "cnCode": "顺序",
-      "desc": "必填，请填写顺序",
+      "code": "startTime",
+      "cnCode": "开始时间",
+      "desc": "必填，请填写开始时间",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "datetime",
+      "limitParam": "128",
+      "limitErrInfo": "开始时间格式错误",
+      "show": true
+    },{
+      "code": "endTime",
+      "cnCode": "结束时间",
+      "desc": "必填，请填写结束时间",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
+      "limit": "datetime",
+      "limitParam": "",
+      "limitErrInfo": "结束时间格式错误",
+      "show": true
+    },
+    {
+      "code": "activitiesObj",
+      "cnCode": "活动对象",
+      "desc": "必填，请选择活动对象",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "select",
+      "selectValue": "2222,3333,4444",
+      "selectValueName": "大众,业主,员工",
       "limit": "num",
       "limitParam": "",
-      "limitErrInfo": "顺序必须是数字",
+      "limitErrInfo": "活动对象格式错误",
+      "show": true
+    },
+    {
+      "code": "remark",
+      "cnCode": "规则说明",
+      "desc": "必填，请填写规则说明",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "1024",
+      "limitErrInfo": "规则说明太长",
       "show": true
     }
   ]

service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java

@@ -2,6 +2,7 @@ package com.java110.user.api;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.activitiesRule.ActivitiesRuleDto;
+import com.java110.dto.questionAnswer.QuestionAnswerDto;
 import com.java110.po.activitiesRule.ActivitiesRulePo;
 import com.java110.user.bmo.activitiesRule.IDeleteActivitiesRuleBMO;
 import com.java110.user.bmo.activitiesRule.IGetActivitiesRuleBMO;
@@ -11,7 +12,12 @@ import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping(value = "/activitiesRule")
@@ -36,7 +42,10 @@ public class ActivitiesRuleApi {
      * @path /app/activitiesRule/saveActivitiesRule
      */
     @RequestMapping(value = "/saveActivitiesRule", method = RequestMethod.POST)
-    public ResponseEntity<String> saveActivitiesRule(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> saveActivitiesRule(
+            @RequestHeader(value = "store-id", required = false) String storeId,
+            @RequestParam(value = "communityId", required = false) String communityId,
+            @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "ruleName", "请求报文中未包含ruleName");
         Assert.hasKeyAndValue(reqJson, "ruleType", "请求报文中未包含ruleType");
@@ -45,8 +54,17 @@ public class ActivitiesRuleApi {
         Assert.hasKeyAndValue(reqJson, "activitiesObj", "请求报文中未包含activitiesObj");
         Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
 
+        String activitiesObj = reqJson.getString("activitiesObj");
+
 
         ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
+        if ("4444".equals(activitiesObj)) {
+            activitiesRulePo.setObjType(QuestionAnswerDto.QA_TYPE_STORE);
+            activitiesRulePo.setObjId(storeId);
+        } else {
+            activitiesRulePo.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
+            activitiesRulePo.setObjId(communityId);
+        }
         return saveActivitiesRuleBMOImpl.save(activitiesRulePo);
     }