From f202fd9cf5ab399e8d34812ab44163af3ac78672 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 28 May 2021 14:47:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java | 21 +++++-
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 4
screen-api/src/main/resources/application-dev.yml | 56 +++++++++---------
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 26 ++++++--
screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java | 3
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 32 ++++++++--
6 files changed, 93 insertions(+), 49 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
index 836ef67..dec9b13 100644
--- a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
+++ b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
@@ -1,18 +1,31 @@
package com.moral.api.config.Interceptor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.moral.api.interceptor.AuthenticationInterceptor;
+import java.util.ArrayList;
+
+import com.moral.api.interceptor.WebInterceptor;
@Configuration
public class WebAppConfiguration implements WebMvcConfigurer {
+ //������������������������
+ @Bean
+ @ConfigurationProperties("mvc.interceptor.exclude")
+ public ArrayList<String> getExcludePath(){
+ return new ArrayList<>();
+ }
+
@Override
public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(new AuthenticationInterceptor())
- .addPathPatterns("/**")
- .excludePathPatterns("/**/login/**", "/**/logout/**", "/swagger-ui.html/**", "/swagger-resources/**","/**/verificationCode/**","/**/user/**");
+ InterceptorRegistration regisration = registry.addInterceptor(new WebInterceptor());
+ ArrayList<String> excludePath = getExcludePath();
+ regisration.addPathPatterns("/**/**");//������������������
+ regisration.excludePathPatterns(excludePath);//���������������������
}
}
diff --git a/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java b/screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java
similarity index 89%
rename from screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java
rename to screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java
index 74e3059..90feb05 100644
--- a/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java
+++ b/screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java
@@ -7,11 +7,10 @@
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
-import com.moral.redis.RedisUtil;
import com.moral.util.TokenUtils;
@Component
-public class AuthenticationInterceptor implements HandlerInterceptor {
+public class WebInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 968569c..3ec8fff 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -14,32 +14,28 @@
profiles:
active: dev
application:
- name: screen-api
+ name: screen-manage
redis:
- #cluster:
- #nodes: 47.112.126.78:7001,47.112.126.78:7002,47.112.126.132:7003,47.112.126.132:7004,47.112.132.193:7005,47.112.132.193:7006
- #password: test
- #timeout: 500
- host: 39.97.177.149
- port: 6379
- password: chenkaiyu111
- timeout: 30000
- jedis:
- pool:
- max-active: 256
- max-wait: 30000
- max-idle: 64
- min-idle: 32
- lettuce:
- pool:
- max-active: 256
- max-idle: 64
- max-wait: 30000
- min-idle: 32
- tokenRedis:
- host: 39.97.177.149
+ host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
port: 6379
- password: chenkaiyu111
+ password: moral_123456
+ timeout: 30000
+ jedis:
+ pool:
+ max-active: 256
+ max-wait: 30000
+ max-idle: 64
+ min-idle: 32
+ lettuce:
+ pool:
+ max-active: 256
+ max-idle: 64
+ max-wait: 30000
+ min-idle: 32
+ tokenRedis:
+ host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ port: 6379
+ password: moral_123456
timeout: 30000
database: 15
pool:
@@ -57,9 +53,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: chenkaiyu111
+ password: moral_123456
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -113,7 +109,13 @@
mvc:
interceptor:
exclude:
- - /account/login
+ - /login
+ - /swagger-ui.html
+ - /swagger-resources/**
+ - /swagger-ui.html/**
+ - /webjars/**
+ - /verificationCode/**
+
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
index 27bef1f..8b0f88e 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
@@ -148,21 +148,41 @@
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "organizationId", value = "������id", required = false, paramType = "query", dataType = "int"),
})
@RequestMapping(value = "devicesByOrgId", method = RequestMethod.GET)
- public ResultMessage selectDevicesByOrg(Integer orgId) {
- List<Map<String, Object>> devices = deviceService.selectDevicesByOrgId(orgId);
+ public ResultMessage selectDevicesByOrg(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (parameters.get("organizationId") == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> devices = deviceService.selectDevicesByOrgId(parameters);
return ResultMessage.ok(devices);
}
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPointId", value = "������id", required = false, paramType = "query", dataType = "int"),
})
@RequestMapping(value = "devicesByMpId", method = RequestMethod.GET)
- public ResultMessage selectDevicesByMp(Integer mpId) {
- List<Map<String, Object>> devices = deviceService.selectDevicesByMpId(mpId);
+ public ResultMessage selectDevicesByMp(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if (parameters.get("monitorPointId") == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> devices = deviceService.selectDevicesByMpId(parameters);
return ResultMessage.ok(devices);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
index a377a42..eb68f0a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
@@ -41,10 +41,10 @@
List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId);
//������������������������
- List<Map<String, Object>> selectDevicesByOrgId(Integer orgId);
+ Map<String, Object> selectDevicesByOrgId(Map<String, Object> parameters);
//������������������������
- List<Map<String, Object>> selectDevicesByMpId(Integer orgId);
+ Map<String, Object> selectDevicesByMpId(Map<String, Object> parameters);
//������������������������������
Map<String, Object> selectDevices(Map<String, Object> parameters);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index c5573f4..b34ad91 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -177,17 +177,13 @@
}
@Override
- public List<Map<String, Object>> selectDevicesByOrgId(Integer orgId) {
- QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("organization_id", orgId);
- return deviceMapper.selectMaps(queryWrapper);
+ public Map<String, Object> selectDevicesByOrgId(Map<String, Object> parameters) {
+ return selectDevices(parameters);
}
@Override
- public List<Map<String, Object>> selectDevicesByMpId(Integer mpId) {
- QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("monitor_point_id", mpId);
- return deviceMapper.selectMaps(queryWrapper);
+ public Map<String, Object> selectDevicesByMpId(Map<String, Object> parameters) {
+ return selectDevices(parameters);
}
@Override
@@ -199,6 +195,19 @@
Object orderType = parameters.get("orderType");
Object name = parameters.get("name");
Object mac = parameters.get("mac");
+ Object orgId = parameters.get("organizationId");
+ Object mpId = parameters.get("monitorPointId");
+
+ //������������������������������
+ if (orgId != null) {
+ queryWrapper.eq("organization_id", orgId);
+ }
+
+ //������������������������������
+ if (mpId != null) {
+ queryWrapper.eq("monitor_point_id", mpId);
+ }
+
if (name != null) {
queryWrapper.like("name", name);
}
@@ -206,6 +215,7 @@
queryWrapper.like("mac", mac);
}
+
//������������,������create_time������
if (order != null && orderType != null) {
if (Constants.ORDER_ASC.equals(orderType)) {
--
Gitblit v1.8.0