From 0593108084bd368d512290053d81454df79e06e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 14:41:28 +0800
Subject: [PATCH] chore:小程序查询提交
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 35 +++++++++++
screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java | 5 +
screen-api/src/main/java/com/moral/api/pojo/vo/device/OrganizationVO.java | 14 ++++
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 14 ++++
screen-api/src/main/java/com/moral/api/service/OrganizationService.java | 9 +++
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 21 +++++++
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 2
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 7 --
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java | 66 ++++++++++++++++++++++
9 files changed, 166 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
new file mode 100644
index 0000000..c92f3cf
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
@@ -0,0 +1,66 @@
+package com.moral.api.controller;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+import com.moral.api.entity.Device;
+import com.moral.api.entity.Organization;
+import com.moral.api.service.DeviceService;
+import com.moral.api.service.OrganizationService;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.constant.ResultMessage;
+import com.sun.org.apache.regexp.internal.RE;
+
+@Slf4j
+@Api(tags = {"���������������������"})
+@RestController
+@RequestMapping("/AppDevice")
+public class AppDevicController {
+
+ @Autowired
+ private OrganizationService organizationService;
+
+ @Autowired
+ private DeviceService deviceService;
+
+
+
+ @GetMapping("selectOrganization")
+ @ApiOperation(value = "���������������������")
+ public ResultMessage selectOrganization(){
+ List<Organization> organizations = organizationService.getOrganizations();
+ return ResultMessage.ok(organizations);
+ }
+
+
+ @GetMapping("selectDevice")
+ @ApiOperation(value = "���������������������")
+ public ResultMessage selectDevice(@RequestParam @ApiParam(value = "organizationId",name = "������ID") Integer organizationId){
+ List<Device> organizationDevice = deviceService.getOrganizationDevice(organizationId);
+ if (ObjectUtils.isEmpty(organizationDevice)){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return ResultMessage.ok(organizationDevice);
+ }
+
+ @GetMapping("fuzzySearch")
+ @ApiOperation(value = "���������������������")
+ public ResultMessage fuzzySearch(@RequestParam @ApiParam(value = "mac",name = "������mac���") String mac){
+ List<Device> devices = deviceService.getFuzzySearch(mac);
+ return ResultMessage.ok(devices);
+ }
+
+}
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 9215b71..e06aadb 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -364,13 +364,6 @@
map.put("date2",params.get("date2").toString());
// map.put("data",params.get("data").toString());
compile.render(map);
-// response.addHeader("Access-Contro1-Allow-Origin", "*");
-
- response.setHeader("Access-Control-Allow-Origin","*");//������������������������
- response.setHeader("Access-Control-Allow-Methods", "*");//���������������������������GET, POST, HEAD ���
- response.setHeader("Access-Control-Allow-Headers", "*");//������������������������
- response.setHeader("Access-Control-Allow-Credentials", "true");//������������cooki
-
compile.write(response.getOutputStream());
compile.close();
} catch (IOException e) {
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/device/OrganizationVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/device/OrganizationVO.java
new file mode 100644
index 0000000..3bd825b
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/device/OrganizationVO.java
@@ -0,0 +1,14 @@
+package com.moral.api.pojo.vo.device;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrganizationVO implements Serializable {
+
+ private Integer id;
+
+ private String name;
+}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java b/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java
index 2f6c656..8fa43a7 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java
@@ -31,4 +31,9 @@
* ������������������������
*/
private Integer unitId;
+
+ /**
+ * ������id
+ */
+ private Integer organizationId;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
index 923d79b..605b619 100644
--- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
@@ -51,4 +51,18 @@
*/
Device getDeviceUnitAlramInforByMac(String mac);
+ /**
+ * ������������
+ * @param mac
+ * @return
+ */
+ List<Device> getFuzzySearch(String mac);
+
+ /**
+ * ������������������������
+ * @param id
+ * @return
+ */
+ List<Device> getOrganizationDevice(Integer id);
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
index c7f33b8..d55d9b4 100644
--- a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
@@ -33,4 +33,13 @@
*/
Organization getOrganizationById(Integer id);
+ /**
+ * ������������������������
+ * @return
+ */
+
+ List<Organization> getOrganizations();
+
+
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index ea2d2a4..c5c8aac 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.entity.*;
@@ -495,6 +496,40 @@
return device;
}
+ /**
+ * ������������
+ *
+ * @param mac
+ * @return
+ */
+ @Override
+ public List<Device> getFuzzySearch(String mac) {
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
+ if (ObjectUtils.isEmpty(mac)){
+ return null;
+ }
+ wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
+ wrapper.like(Device::getMac,mac);
+ List<Device> devices = deviceMapper.selectList(wrapper);
+ return devices;
+ }
+
+ /**
+ * ������������������������
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public List<Device> getOrganizationDevice(Integer id) {
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Device::getOrganizationId,id);
+ wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
+ wrapper.orderByAsc(Device::getCreateTime);
+ List<Device> devices = deviceMapper.selectList(wrapper);
+ return devices;
+ }
+
private Device getDeviceUnitAlramInforByMacFromDb(String mac){
QueryWrapper<Device> wrapper = new QueryWrapper<>();
wrapper.eq("mac",mac);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 0e406e1..6458feb 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -1,8 +1,10 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.Organization;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -40,6 +42,25 @@
return organizationMapper.selectById(id);
}
+ /**
+ * ������������������������
+ *
+ * @return
+ */
+ @Override
+ public List<Organization> getOrganizations() {
+ QueryWrapper<Organization> wrapper = new QueryWrapper<>();
+ wrapper.select("id","name");
+ QxUser user = UserHelper.getCurrentUser();
+ Integer organizationId = user.getOrganizationId();
+ if (organizationId!=24){
+ wrapper.eq("id",user.getOrganizationId());
+ }
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Organization> organizations = organizationMapper.selectList(wrapper);
+ return organizations;
+ }
+
/**
* @Description: ���������������������������������������������������children���
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index fc63bce..2d1e465 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -105,6 +105,7 @@
userInfo.put("wechat", userBo.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
+ userInfo.put("organizationId",userBo.getOrganizationId());
userInfo.put("openid", openId);
try {
@@ -173,6 +174,7 @@
userInfo.put("mobile", user.getMobile());
userInfo.put("unitId",user.getUnitId());
// userInfo.put("unName",user.getAreaName());
+ userInfo.put("organizationId",user.getOrganizationId());
userInfo.put("wechat", user.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime()));
userInfo.put("isAdmin", user.getIsAdmin());
--
Gitblit v1.8.0