java110 лет назад: 5
Родитель
Сommit
ac0558fd1b

+ 29 - 56
java110-generator/src/main/resources/web/template_1.json

@@ -1,40 +1,38 @@
 {
-  "templateName": "活动规则",
+  "templateName": "最美员工",
   "directories": "property",
-  "templateCode": "activitiesRule",
-  "templateKey": "ruleId",
-  "templateKeyName": "规则ID",
-  "searchCode": "ruleId",
-  "searchName": "规则ID",
+  "templateCode": "activitiesBeautifulStaff",
+  "templateKey": "beId",
+  "templateKeyName": "ID",
+  "searchCode": "beId",
+  "searchName": "ID",
   "conditions": [
     {
-      "name": "活动类型",
+      "name": "活动规则",
       "inputType": "select",
       "selectValue": "6666",
       "selectValueName": "最美员工",
-      "code": "ruleType",
+      "code": "ruleId",
       "whereCondition": "equal"
     },
     {
-      "name": "规则名称",
+      "name": "员工名称",
       "inputType": "input",
-      "code": "ruleName",
+      "code": "staffName",
       "whereCondition": "equal"
     },
     {
-      "name": "活动对象",
-      "inputType": "select",
-      "selectValue": "2222,3333,4444",
-      "selectValueName": "大众,业主,员工",
-      "code": "activitiesObj",
+      "name": "员工编号",
+      "inputType": "input",
+      "code": "activitiesNum",
       "whereCondition": "equal"
     }
   ],
   "columns": [
     {
-      "code": "ruleType",
-      "cnCode": "活动类型",
-      "desc": "必填,请填写活动类型",
+      "code": "ruleId",
+      "cnCode": "活动规则",
+      "desc": "必填,请选择活动规则",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "select",
@@ -42,68 +40,43 @@
       "selectValueName": "最美员工",
       "limit": "num",
       "limitParam": "",
-      "limitErrInfo": "活动类型格式错误",
+      "limitErrInfo": "活动规则格式错误",
       "show": true
     },
     {
-      "code": "ruleName",
-      "cnCode": "规则名称",
-      "desc": "必填,请填写规则名称",
+      "code": "staffId",
+      "cnCode": "员工",
+      "desc": "必填,请填写员工",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "maxLength",
       "limitParam": "128",
-      "limitErrInfo": "规则名称太长",
+      "limitErrInfo": "员工名称太长",
       "show": true
     },
     {
-      "code": "startTime",
-      "cnCode": "开始时间",
-      "desc": "必填,请填写开始时间",
-      "required": true,
-      "hasDefaultValue": false,
-      "inputType": "input",
-      "limit": "datetime",
-      "limitParam": "128",
-      "limitErrInfo": "开始时间格式错误",
-      "show": true
-    },{
-      "code": "endTime",
-      "cnCode": "结束时间",
-      "desc": "必填,请填写结束时间",
+      "code": "activitiesNum",
+      "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": "必填,请填写规则说明",
+      "code": "workContent",
+      "cnCode": "工作简介",
+      "desc": "必填,请填写工作简介",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "maxLength",
       "limitParam": "1024",
-      "limitErrInfo": "规则说明太长",
+      "limitErrInfo": "工作简介说明太长",
       "show": true
     }
   ]

+ 0 - 110
service-user/src/main/java/com/java110/user/api/ActivitiesBeautifulStaffApi.java

@@ -1,110 +0,0 @@
-package com.java110.user.api;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.activitiesBeautifulStaff.ActivitiesBeautifulStaffDto;
-import com.java110.po.activitiesBeautifulStaff.ActivitiesBeautifulStaffPo;
-import com.java110.user.bmo.activitiesBeautifulStaff.IDeleteActivitiesBeautifulStaffBMO;
-import com.java110.user.bmo.activitiesBeautifulStaff.IGetActivitiesBeautifulStaffBMO;
-import com.java110.user.bmo.activitiesBeautifulStaff.ISaveActivitiesBeautifulStaffBMO;
-import com.java110.user.bmo.activitiesBeautifulStaff.IUpdateActivitiesBeautifulStaffBMO;
-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.*;
-
-@RestController
-@RequestMapping(value = "/activitiesBeautifulStaff")
-public class ActivitiesBeautifulStaffApi {
-
-    @Autowired
-    private ISaveActivitiesBeautifulStaffBMO saveActivitiesBeautifulStaffBMOImpl;
-    @Autowired
-    private IUpdateActivitiesBeautifulStaffBMO updateActivitiesBeautifulStaffBMOImpl;
-    @Autowired
-    private IDeleteActivitiesBeautifulStaffBMO deleteActivitiesBeautifulStaffBMOImpl;
-
-    @Autowired
-    private IGetActivitiesBeautifulStaffBMO getActivitiesBeautifulStaffBMOImpl;
-
-    /**
-     * 微信保存消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /activitiesBeautifulStaff/saveActivitiesBeautifulStaff
-     * @path /app/activitiesBeautifulStaff/saveActivitiesBeautifulStaff
-     */
-    @RequestMapping(value = "/saveActivitiesBeautifulStaff", method = RequestMethod.POST)
-    public ResponseEntity<String> saveActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
-        Assert.hasKeyAndValue(reqJson, "activitiesNum", "请求报文中未包含activitiesNum");
-        Assert.hasKeyAndValue(reqJson, "workContent", "请求报文中未包含workContent");
-        Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
-
-
-        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
-        return saveActivitiesBeautifulStaffBMOImpl.save(activitiesBeautifulStaffPo);
-    }
-
-    /**
-     * 微信修改消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /activitiesBeautifulStaff/updateActivitiesBeautifulStaff
-     * @path /app/activitiesBeautifulStaff/updateActivitiesBeautifulStaff
-     */
-    @RequestMapping(value = "/updateActivitiesBeautifulStaff", method = RequestMethod.POST)
-    public ResponseEntity<String> updateActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
-        Assert.hasKeyAndValue(reqJson, "activitiesNum", "请求报文中未包含activitiesNum");
-        Assert.hasKeyAndValue(reqJson, "workContent", "请求报文中未包含workContent");
-        Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
-        Assert.hasKeyAndValue(reqJson, "beId", "beId不能为空");
-
-
-        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
-        return updateActivitiesBeautifulStaffBMOImpl.update(activitiesBeautifulStaffPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param reqJson
-     * @return
-     * @serviceCode /activitiesBeautifulStaff/deleteActivitiesBeautifulStaff
-     * @path /app/activitiesBeautifulStaff/deleteActivitiesBeautifulStaff
-     */
-    @RequestMapping(value = "/deleteActivitiesBeautifulStaff", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-        Assert.hasKeyAndValue(reqJson, "beId", "beId不能为空");
-
-
-        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
-        return deleteActivitiesBeautifulStaffBMOImpl.delete(activitiesBeautifulStaffPo);
-    }
-
-    /**
-     * 微信删除消息模板
-     *
-     * @param storeId 小区ID
-     * @return
-     * @serviceCode /activitiesBeautifulStaff/queryActivitiesBeautifulStaff
-     * @path /app/activitiesBeautifulStaff/queryActivitiesBeautifulStaff
-     */
-    @RequestMapping(value = "/queryActivitiesBeautifulStaff", method = RequestMethod.GET)
-    public ResponseEntity<String> queryActivitiesBeautifulStaff(@RequestHeader(value = "store-id", required = false) String storeId,
-                                                                @RequestParam(value = "page") int page,
-                                                                @RequestParam(value = "row") int row) {
-        ActivitiesBeautifulStaffDto activitiesBeautifulStaffDto = new ActivitiesBeautifulStaffDto();
-        activitiesBeautifulStaffDto.setPage(page);
-        activitiesBeautifulStaffDto.setRow(row);
-        activitiesBeautifulStaffDto.setStoreId(storeId);
-        return getActivitiesBeautifulStaffBMOImpl.get(activitiesBeautifulStaffDto);
-    }
-}

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

@@ -1,9 +1,15 @@
 package com.java110.user.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.activitiesBeautifulStaff.ActivitiesBeautifulStaffDto;
 import com.java110.dto.activitiesRule.ActivitiesRuleDto;
 import com.java110.dto.questionAnswer.QuestionAnswerDto;
+import com.java110.po.activitiesBeautifulStaff.ActivitiesBeautifulStaffPo;
 import com.java110.po.activitiesRule.ActivitiesRulePo;
+import com.java110.user.bmo.activitiesBeautifulStaff.IDeleteActivitiesBeautifulStaffBMO;
+import com.java110.user.bmo.activitiesBeautifulStaff.IGetActivitiesBeautifulStaffBMO;
+import com.java110.user.bmo.activitiesBeautifulStaff.ISaveActivitiesBeautifulStaffBMO;
+import com.java110.user.bmo.activitiesBeautifulStaff.IUpdateActivitiesBeautifulStaffBMO;
 import com.java110.user.bmo.activitiesRule.IDeleteActivitiesRuleBMO;
 import com.java110.user.bmo.activitiesRule.IGetActivitiesRuleBMO;
 import com.java110.user.bmo.activitiesRule.ISaveActivitiesRuleBMO;
@@ -33,6 +39,17 @@ public class ActivitiesRuleApi {
     @Autowired
     private IGetActivitiesRuleBMO getActivitiesRuleBMOImpl;
 
+    @Autowired
+    private ISaveActivitiesBeautifulStaffBMO saveActivitiesBeautifulStaffBMOImpl;
+    @Autowired
+    private IUpdateActivitiesBeautifulStaffBMO updateActivitiesBeautifulStaffBMOImpl;
+    @Autowired
+    private IDeleteActivitiesBeautifulStaffBMO deleteActivitiesBeautifulStaffBMOImpl;
+
+    @Autowired
+    private IGetActivitiesBeautifulStaffBMO getActivitiesBeautifulStaffBMOImpl;
+
+
     /**
      * 微信保存消息模板
      *
@@ -131,4 +148,87 @@ public class ActivitiesRuleApi {
         activitiesRuleDto.setObjIds(new String[]{storeId, communityId});
         return getActivitiesRuleBMOImpl.get(activitiesRuleDto);
     }
+
+
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /activitiesRule/saveActivitiesBeautifulStaff
+     * @path /app/activitiesRule/saveActivitiesBeautifulStaff
+     */
+    @RequestMapping(value = "/saveActivitiesBeautifulStaff", method = RequestMethod.POST)
+    public ResponseEntity<String> saveActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
+        Assert.hasKeyAndValue(reqJson, "activitiesNum", "请求报文中未包含activitiesNum");
+        Assert.hasKeyAndValue(reqJson, "workContent", "请求报文中未包含workContent");
+        Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
+
+
+        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
+        return saveActivitiesBeautifulStaffBMOImpl.save(activitiesBeautifulStaffPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /activitiesRule/updateActivitiesBeautifulStaff
+     * @path /app/activitiesRule/updateActivitiesBeautifulStaff
+     */
+    @RequestMapping(value = "/updateActivitiesBeautifulStaff", method = RequestMethod.POST)
+    public ResponseEntity<String> updateActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
+        Assert.hasKeyAndValue(reqJson, "activitiesNum", "请求报文中未包含activitiesNum");
+        Assert.hasKeyAndValue(reqJson, "workContent", "请求报文中未包含workContent");
+        Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
+        Assert.hasKeyAndValue(reqJson, "beId", "beId不能为空");
+
+
+        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
+        return updateActivitiesBeautifulStaffBMOImpl.update(activitiesBeautifulStaffPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /activitiesRule/deleteActivitiesBeautifulStaff
+     * @path /app/activitiesRule/deleteActivitiesBeautifulStaff
+     */
+    @RequestMapping(value = "/deleteActivitiesBeautifulStaff", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "beId", "beId不能为空");
+
+
+        ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
+        return deleteActivitiesBeautifulStaffBMOImpl.delete(activitiesBeautifulStaffPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /activitiesRule/queryActivitiesBeautifulStaff
+     * @path /app/activitiesRule/queryActivitiesBeautifulStaff
+     */
+    @RequestMapping(value = "/queryActivitiesBeautifulStaff", method = RequestMethod.GET)
+    public ResponseEntity<String> queryActivitiesBeautifulStaff(@RequestHeader(value = "store-id", required = false) String storeId,
+                                                                @RequestParam(value = "page") int page,
+                                                                @RequestParam(value = "row") int row) {
+        ActivitiesBeautifulStaffDto activitiesBeautifulStaffDto = new ActivitiesBeautifulStaffDto();
+        activitiesBeautifulStaffDto.setPage(page);
+        activitiesBeautifulStaffDto.setRow(row);
+        activitiesBeautifulStaffDto.setStoreId(storeId);
+        return getActivitiesBeautifulStaffBMOImpl.get(activitiesBeautifulStaffDto);
+    }
 }