From e62a227ec48c9ee1f738a469480c6e59d436ed3d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 21 六月 2022 09:02:21 +0800
Subject: [PATCH] 业主相关 功能 从listener 迁移为 cmd 模式
---
service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java | 143 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 128 insertions(+), 15 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
old mode 100644
new mode 100755
index 47b8fed..2b0a4d0
--- a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
+++ b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
@@ -1,8 +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;
@@ -11,7 +18,12 @@
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")
@@ -19,13 +31,28 @@
@Autowired
private ISaveActivitiesRuleBMO saveActivitiesRuleBMOImpl;
+
@Autowired
private IUpdateActivitiesRuleBMO updateActivitiesRuleBMOImpl;
+
@Autowired
private IDeleteActivitiesRuleBMO deleteActivitiesRuleBMOImpl;
@Autowired
private IGetActivitiesRuleBMO getActivitiesRuleBMOImpl;
+
+ @Autowired
+ private ISaveActivitiesBeautifulStaffBMO saveActivitiesBeautifulStaffBMOImpl;
+
+ @Autowired
+ private IUpdateActivitiesBeautifulStaffBMO updateActivitiesBeautifulStaffBMOImpl;
+
+ @Autowired
+ private IDeleteActivitiesBeautifulStaffBMO deleteActivitiesBeautifulStaffBMOImpl;
+
+ @Autowired
+ private IGetActivitiesBeautifulStaffBMO getActivitiesBeautifulStaffBMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -36,17 +63,25 @@
* @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,
+ @RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "ruleName", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleName");
Assert.hasKeyAndValue(reqJson, "ruleType", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleType");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
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 {
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
+ activitiesRulePo.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
+ activitiesRulePo.setObjId(reqJson.getString("communityId"));
+ }
return saveActivitiesRuleBMOImpl.save(activitiesRulePo);
}
@@ -60,7 +95,6 @@
*/
@RequestMapping(value = "/updateActivitiesRule", method = RequestMethod.POST)
public ResponseEntity<String> updateActivitiesRule(@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "ruleName", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleName");
Assert.hasKeyAndValue(reqJson, "ruleType", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleType");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
@@ -68,8 +102,6 @@
Assert.hasKeyAndValue(reqJson, "activitiesObj", "璇锋眰鎶ユ枃涓湭鍖呭惈activitiesObj");
Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
Assert.hasKeyAndValue(reqJson, "ruleId", "ruleId涓嶈兘涓虹┖");
-
-
ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
return updateActivitiesRuleBMOImpl.update(activitiesRulePo);
}
@@ -85,10 +117,7 @@
@RequestMapping(value = "/deleteActivitiesRule", method = RequestMethod.POST)
public ResponseEntity<String> deleteActivitiesRule(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
-
Assert.hasKeyAndValue(reqJson, "ruleId", "ruleId涓嶈兘涓虹┖");
-
-
ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
return deleteActivitiesRuleBMOImpl.delete(activitiesRulePo);
}
@@ -102,13 +131,97 @@
* @path /app/activitiesRule/queryActivitiesRule
*/
@RequestMapping(value = "/queryActivitiesRule", method = RequestMethod.GET)
- public ResponseEntity<String> queryActivitiesRule(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ public ResponseEntity<String> queryActivitiesRule(
+ @RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ActivitiesRuleDto activitiesRuleDto = new ActivitiesRuleDto();
activitiesRuleDto.setPage(page);
activitiesRuleDto.setRow(row);
- activitiesRuleDto.setObjId(communityId);
+ 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(
+ @RequestHeader(value = "store-id") String storeId,
+ @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);
+ activitiesBeautifulStaffPo.setStoreId(storeId);
+ 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 = "ruleId", required = false) String ruleId,
+ @RequestParam(value = "activitiesNum", required = false) String activitiesNum,
+ @RequestParam(value = "staffName", required = false) String staffName,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ActivitiesBeautifulStaffDto activitiesBeautifulStaffDto = new ActivitiesBeautifulStaffDto();
+ activitiesBeautifulStaffDto.setStaffName(staffName);
+ activitiesBeautifulStaffDto.setRuleId(ruleId);
+ activitiesBeautifulStaffDto.setActivitiesNum(activitiesNum);
+ activitiesBeautifulStaffDto.setPage(page);
+ activitiesBeautifulStaffDto.setRow(row);
+ activitiesBeautifulStaffDto.setStoreId(storeId);
+ return getActivitiesBeautifulStaffBMOImpl.get(activitiesBeautifulStaffDto);
+ }
}
--
Gitblit v1.8.0