Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ebei/screen/service/impl/CameraDeviceServiceImpl.java

src/main/java/com/ebei/screen/common/config/MyMvcConfig.java

@@ -1,8 +1,6 @@
 package com.ebei.screen.common.config;
 
-import com.alibaba.fastjson.serializer.SerializeConfig;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import com.ebei.screen.common.config.auth.LoginInterceptor;

src/main/java/com/ebei/screen/controller/video/VideoMonitorController.java

@@ -48,7 +48,7 @@ public class VideoMonitorController {
     @ApiOperation("修改项目")
     @PostMapping("/updateProject")
     public ResponseBean updateProject(@RequestBody Project project) {
-        if(BeanUtil.isEmpty(project.getId())) {
+        if (BeanUtil.isEmpty(project.getId())) {
             return ResponseBean.fail("id不能为空");
         }
         return projectService.updateProject(project);
@@ -56,11 +56,11 @@ public class VideoMonitorController {
 
     @ApiOperation("分页查询项目")
     @PostMapping("/queryProject/{page}/{pageSize}")
-    public ResponseBean queryProjectPage(@PathVariable("page")  Integer page,
-                                      @PathVariable("pageSize")  Integer pageSize,
-                                      @RequestBody Project project) {
+    public ResponseBean queryProjectPage(@PathVariable("page") Integer page,
+                                         @PathVariable("pageSize") Integer pageSize,
+                                         @RequestBody Project project) {
 
-        return projectService.queryProjectPage(page-1,pageSize,project.getName());
+        return projectService.queryProjectPage(page - 1, pageSize, project.getName());
     }
 
     @ApiOperation("同步萤石设备")
@@ -80,9 +80,9 @@ public class VideoMonitorController {
     @PostMapping("/queryYsDevice/{page}/{pageSize}")
     public ResponseBean queryYsDevice(@PathVariable("page") @NotNull(message = "URL参数：当前页的页码不能为空") Integer page,
                                       @PathVariable("pageSize") @NotNull(message = "URL参数：当前页的页数不能为空") Integer pageSize,
-                                       @RequestBody CameraDevice cameraDevice) {
+                                      @RequestBody CameraDevice cameraDevice) {
 
-        return cameraDeviceService.queryProjectPage(page-1,pageSize,cameraDevice.getDeviceName(),cameraDevice.getDeviceSerial(),cameraDevice.getStatus());
+        return cameraDeviceService.queryProjectPage(page - 1, pageSize, cameraDevice.getDeviceName(), cameraDevice.getDeviceSerial(), cameraDevice.getStatus());
     }
 
     @ApiOperation("保存机房")
@@ -95,7 +95,7 @@ public class VideoMonitorController {
     @ApiOperation("修改机房(可用于关联监控设备)")
     @PostMapping("/updateMachineRoom")
     public ResponseBean updateMachineRoom(@RequestBody MachineRoom machineRoom) {
-        if(BeanUtil.isEmpty(machineRoom.getId())) {
+        if (BeanUtil.isEmpty(machineRoom.getId())) {
             return ResponseBean.fail("id不能为空");
         }
         machineRoomService.updateMachineRoom(machineRoom);
@@ -105,9 +105,9 @@ public class VideoMonitorController {
     @ApiOperation("根据项目分页查询机房(视频大屏首页使用)")
     @PostMapping("/queryMachineRoom/{page}/{pageSize}")
     public ResponseBean queryMachineRoom(@PathVariable("page") @NotNull(message = "URL参数：当前页的页码不能为空") Integer page,
-                                      @PathVariable("pageSize") @NotNull(message = "URL参数：当前页的页数不能为空") Integer pageSize,
+                                         @PathVariable("pageSize") @NotNull(message = "URL参数：当前页的页数不能为空") Integer pageSize,
                                          @RequestBody MachineRoom machineRoom) {
-        return machineRoomService.queryMachineRoom(page-1,pageSize,machineRoom.getName(),machineRoom.getProjectId());
+        return machineRoomService.queryMachineRoom(page - 1, pageSize, machineRoom.getName(), machineRoom.getProjectId());
     }
 
     @ApiOperation("获取萤石token")
@@ -118,7 +118,7 @@ public class VideoMonitorController {
         try {
             ysAccessToken = cameraDeviceService.getYsAccessToken();
         } catch (Exception e) {
-            log.error("获取萤石token失败:",e);
+            log.error("获取萤石token失败:", e);
             return ResponseBean.fail("获取萤石token失败");
         }
         return ResponseBean.success(ysAccessToken);

src/main/java/com/ebei/screen/modules/po/BaseEntity.java

@@ -1,10 +1,9 @@
 package com.ebei.screen.modules.po;
 
-import cn.hutool.core.date.DatePattern;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 

src/main/java/com/ebei/screen/service/impl/MachineRoomServiceImpl.java

@@ -3,7 +3,6 @@ package com.ebei.screen.service.impl;
 import com.ebei.screen.common.response.ResponseBean;
 import com.ebei.screen.common.util.CommonUtil;
 import com.ebei.screen.modules.po.MachineRoom;
-import com.ebei.screen.modules.po.Project;
 import com.ebei.screen.service.MachineRoomService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -52,9 +51,9 @@ public class MachineRoomServiceImpl implements MachineRoomService {
         query.addCriteria(Criteria.where("_id").is(machineRoom.getId()));
         Update update = new Update();
         update.set("name", machineRoom.getName());
-        update.set("projectId",machineRoom.getProjectId());
-        update.set("type",machineRoom.getType());
-        update.set("cameraDeviceList",machineRoom.getCameraDeviceList());
+        update.set("projectId", machineRoom.getProjectId());
+        update.set("type", machineRoom.getType());
+        update.set("cameraDeviceList", machineRoom.getCameraDeviceList());
         update.set("updateTime", now);
         update.set("isDelete", machineRoom.getIsDelete());
         mongoTemplate.updateFirst(query, update, MachineRoom.class);
@@ -63,13 +62,13 @@ public class MachineRoomServiceImpl implements MachineRoomService {
     @Override
     public ResponseBean queryMachineRoom(int page, Integer pageSize, String name, String projectId) {
         Query query = new Query();
-        if(CommonUtil.isNotEmpty(name)) {
+        if (CommonUtil.isNotEmpty(name)) {
             Criteria criteria = new Criteria();
-            Pattern pattern=Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
+            Pattern pattern = Pattern.compile("^.*" + name + ".*$", Pattern.CASE_INSENSITIVE);
             criteria.where("name").regex(pattern);
             query.addCriteria(criteria);
         }
-        if(CommonUtil.isNotEmpty(projectId)) {
+        if (CommonUtil.isNotEmpty(projectId)) {
             query.addCriteria(Criteria.where("projectId").is(projectId));
         }
         query.addCriteria(Criteria.where("isDelete").is(0));

src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+server:
+  port: 30000
+logging:
+  level:
+    root: info
+    org.springframework.web: debug
+spring:
+  data:
+    mongodb:
+      database: eaglescreen
+      host: 10.81.51.7
+      port: 27017
+      username: eaglescreen
+      password: yibeitech@2019
+energy:
+  # 多个用逗号分隔开
+  grpId: 197069285991913100