From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-user/src/main/java/com/java110/user/api/OwnerApi.java | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/OwnerApi.java b/service-user/src/main/java/com/java110/user/api/OwnerApi.java
old mode 100644
new mode 100755
index 5ec1122..29a68b2
--- a/service-user/src/main/java/com/java110/user/api/OwnerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/OwnerApi.java
@@ -1,18 +1,13 @@
package com.java110.user.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.owner.OwnerDto;
import com.java110.po.owner.OwnerPo;
-import com.java110.user.bmo.owner.IChangeOwnerPhone;
-import com.java110.user.bmo.owner.IQueryTenants;
-import com.java110.user.bmo.owner.IVisitorRecord;
+import com.java110.user.bmo.owner.*;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
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.*;
@RestController
@RequestMapping(value = "/ownerApi")
@@ -26,6 +21,13 @@
@Autowired
private IChangeOwnerPhone changeOwnerPhoneImpl;
+
+
+ @Autowired
+ private IComprehensiveQuery comprehensiveQueryImpl;
+
+ @Autowired
+ private IQueryShopsHireLog queryShopsHireLogImpl;
@RequestMapping(value = "/tenants")
public ResponseEntity<String> tenants(@RequestBody JSONObject reqJson) {
@@ -49,10 +51,10 @@
*/
@RequestMapping(value = "/changeOwnerPhone", method = RequestMethod.POST)
public ResponseEntity<String> changeOwnerPhone(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson,"link","璇锋眰鎶ユ枃涓湭鍖呭惈鎵嬫満鍙�");
- Assert.hasKeyAndValue(reqJson,"userId","璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛ID");
- Assert.hasKeyAndValue(reqJson,"memberId","璇锋眰鎶ユ枃涓湭鍖呭惈涓氫富淇℃伅");
- Assert.hasKeyAndValue(reqJson,"communityId","璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈鎵嬫満鍙�");
+ Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛ID");
+ Assert.hasKeyAndValue(reqJson, "memberId", "璇锋眰鎶ユ枃涓湭鍖呭惈涓氫富淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
OwnerPo ownerPo = new OwnerPo();
ownerPo.setLink(reqJson.getString("link"));
ownerPo.setMemberId(reqJson.getString("memberId"));
@@ -61,4 +63,42 @@
return changeOwnerPhoneImpl.change(ownerPo);
}
+
+ /**
+ * 缁煎悎鏌ヨ
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @service /ownerApi/comprehensiveQuery
+ * @path /app/ownerApi/comprehensiveQuery
+ */
+ @RequestMapping(value = "/comprehensiveQuery", method = RequestMethod.GET)
+ public ResponseEntity<String> comprehensiveQuery(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "searchValue") String searchValue,
+ @RequestParam(value = "searchType") String searchType,
+ @RequestHeader(value = "user-id") String userId,
+ @RequestHeader(value = "store-id") String storeId) {
+ return comprehensiveQueryImpl.query(communityId, searchValue, searchType, userId,storeId);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /ownerApi/queryShopsHireLog
+ * @path /app/ownerApi/queryShopsHireLog
+ */
+ @RequestMapping(value = "/queryShopsHireLog", method = RequestMethod.GET)
+ public ResponseEntity<String> queryShopsHireLog(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "roomId") String roomId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setPage(page);
+ ownerDto.setRow(row);
+ ownerDto.setCommunityId(communityId);
+ ownerDto.setRoomId(roomId);
+ return queryShopsHireLogImpl.query(ownerDto);
+ }
}
--
Gitblit v1.8.0