From c2528fee65fa17a7434eb16deb782fd7c4e71523 Mon Sep 17 00:00:00 2001
From: his-uncles-father <88386378@qq.com>
Date: 星期二, 06 四月 2021 14:47:47 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/api/RepairApi.java | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 5 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/RepairApi.java b/service-community/src/main/java/com/java110/community/api/RepairApi.java
index 7650360..73a6fa8 100644
--- a/service-community/src/main/java/com/java110/community/api/RepairApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RepairApi.java
@@ -2,14 +2,18 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.community.bmo.repair.IAppraiseRepairBMO;
+import com.java110.community.bmo.repairReturnVisit.IDeleteRepairReturnVisitBMO;
+import com.java110.community.bmo.repairReturnVisit.IGetRepairReturnVisitBMO;
+import com.java110.community.bmo.repairReturnVisit.ISaveRepairReturnVisitBMO;
+import com.java110.community.bmo.repairReturnVisit.IUpdateRepairReturnVisitBMO;
import com.java110.dto.appraise.AppraiseDto;
+import com.java110.dto.repairReturnVisit.RepairReturnVisitDto;
+import com.java110.po.repairReturnVisit.RepairReturnVisitPo;
+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.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* 鎶ヤ慨 鎺у埗绫�
@@ -20,6 +24,17 @@
@Autowired
private IAppraiseRepairBMO appraiseRepairBMOImpl;
+ @Autowired
+ private ISaveRepairReturnVisitBMO saveRepairReturnVisitBMOImpl;
+ @Autowired
+ private IUpdateRepairReturnVisitBMO updateRepairReturnVisitBMOImpl;
+ @Autowired
+ private IDeleteRepairReturnVisitBMO deleteRepairReturnVisitBMOImpl;
+
+ @Autowired
+ private IGetRepairReturnVisitBMO getRepairReturnVisitBMOImpl;
+
+
/**
* 鎶ヤ慨璇勪环
*
@@ -28,7 +43,105 @@
*/
@RequestMapping(value = "/appraiseRepair", method = RequestMethod.POST)
public ResponseEntity<String> appraiseRepair(@RequestBody JSONObject reqJson) {
- AppraiseDto appraiseDto = BeanConvertUtil.covertBean(reqJson,AppraiseDto.class);
+ AppraiseDto appraiseDto = BeanConvertUtil.covertBean(reqJson, AppraiseDto.class);
return appraiseRepairBMOImpl.appraiseRepair(appraiseDto);
}
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /repair/saveRepairReturnVisit
+ * @path /app/repair/saveRepairReturnVisit
+ */
+ @RequestMapping(value = "/saveRepairReturnVisit", method = RequestMethod.POST)
+ public ResponseEntity<String> saveRepairReturnVisit(
+ @RequestHeader(value = "user-id") String userId,
+ @RequestHeader(value = "user-name") String userName,
+ @RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "repairId", "璇锋眰鎶ユ枃涓湭鍖呭惈repairId");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ Assert.hasKeyAndValue(reqJson, "visitType", "璇锋眰鎶ユ枃涓湭鍖呭惈婊℃剰搴�");
+ Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈context");
+
+
+ RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
+ repairReturnVisitPo.setVisitPersonId(userId);
+ repairReturnVisitPo.setVisitPersonName(userName);
+ return saveRepairReturnVisitBMOImpl.save(repairReturnVisitPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /repair/updateRepairReturnVisit
+ * @path /app/repair/updateRepairReturnVisit
+ */
+ @RequestMapping(value = "/updateRepairReturnVisit", method = RequestMethod.POST)
+ public ResponseEntity<String> updateRepairReturnVisit(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "repairId", "璇锋眰鎶ユ枃涓湭鍖呭惈repairId");
+ Assert.hasKeyAndValue(reqJson, "visitPersonId", "璇锋眰鎶ユ枃涓湭鍖呭惈visitPersonId");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈context");
+ Assert.hasKeyAndValue(reqJson, "visitId", "visitId涓嶈兘涓虹┖");
+
+
+ RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
+ return updateRepairReturnVisitBMOImpl.update(repairReturnVisitPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /repair/deleteRepairReturnVisit
+ * @path /app/repair/deleteRepairReturnVisit
+ */
+ @RequestMapping(value = "/deleteRepairReturnVisit", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteRepairReturnVisit(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+
+ Assert.hasKeyAndValue(reqJson, "visitId", "visitId涓嶈兘涓虹┖");
+
+
+ RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
+ return deleteRepairReturnVisitBMOImpl.delete(repairReturnVisitPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /repair/queryRepairReturnVisit
+ * @path /app/repair/queryRepairReturnVisit
+ */
+ @RequestMapping(value = "/queryRepairReturnVisit", method = RequestMethod.GET)
+ public ResponseEntity<String> queryRepairReturnVisit(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "repairId",required = false) String repairId,
+ @RequestParam(value = "repairName",required = false) String repairName,
+ @RequestParam(value = "tel",required = false) String tel,
+ @RequestParam(value = "repairType",required = false) String repairType,
+ @RequestParam(value = "state") String state,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ RepairReturnVisitDto repairReturnVisitDto = new RepairReturnVisitDto();
+ repairReturnVisitDto.setPage(page);
+ repairReturnVisitDto.setRow(row);
+ repairReturnVisitDto.setCommunityId(communityId);
+ repairReturnVisitDto.setRepairId(repairId);
+ repairReturnVisitDto.setRepairName(repairName);
+ repairReturnVisitDto.setTel(tel);
+ repairReturnVisitDto.setRepairType(repairType);
+ repairReturnVisitDto.setState(state);
+
+ return getRepairReturnVisitBMOImpl.get(repairReturnVisitDto);
+ }
}
--
Gitblit v1.8.0