build: 调整结构和配置

src/main/java/com/xydl/cac/CacBackendApplication.java

@@ -1,4 +1,4 @@
-package com.xydl.demo;
+package com.xydl.cac;
 
 
 import org.springframework.boot.SpringApplication;

src/main/java/com/xydl/cac/controller/BasicController.java

@@ -1,4 +1,4 @@
-package com.xydl.demo.controller;
+package com.xydl.cac.controller;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/xydl/cac/controller/NiecSensorController.java

@@ -1,13 +1,14 @@
-package com.xydl.demo.controller;
+package com.xydl.cac.controller;
 
-import com.xydl.demo.entity.NiecSensor;
+import com.xydl.cac.entity.NiecSensor;
-import com.xydl.demo.model.ConditionModel;
+import com.xydl.cac.model.ConditionModel;
-import com.xydl.demo.model.Response;
+import com.xydl.cac.model.Response;
-import com.xydl.demo.model.SensorDetail;
+import com.xydl.cac.model.SensorDetail;
-import com.xydl.demo.service.NiecSensorService;
+import com.xydl.cac.service.NiecSensorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +22,7 @@ import java.util.List;
 @RestController
 @Api(tags = {"装置表相关接口"})
 @RequestMapping("sensor")
+@Slf4j
 public class NiecSensorController extends BasicController {
 
     @Resource
@@ -58,6 +60,7 @@ public class NiecSensorController extends BasicController {
             List<NiecSensor> result = service.getTree();
             return Response.success(result);
         } catch (Exception ex) {
+            log.error("getTree Exception.", ex);
             return Response.fail(ex.getMessage());
         }
     }
@@ -73,6 +76,7 @@ public class NiecSensorController extends BasicController {
             SensorDetail result = service.getDetail(model);
             return Response.success(result);
         } catch (Exception ex) {
+            log.error("getDetail Exception.", ex);
             return Response.fail(ex.getMessage());
         }
     }

src/main/java/com/xydl/cac/entity/NiecPoint.java

@@ -1,4 +1,4 @@
-package com.xydl.demo.entity;
+package com.xydl.cac.entity;
 
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;

src/main/java/com/xydl/cac/entity/NiecSensor.java

@@ -1,7 +1,6 @@
-package com.xydl.demo.entity;
+package com.xydl.cac.entity;
 
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/xydl/cac/model/ConditionModel.java

@@ -1,4 +1,4 @@
-package com.xydl.demo.model;
+package com.xydl.cac.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +7,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 

src/main/java/com/xydl/cac/model/Response.java

@@ -1,4 +1,4 @@
-package com.xydl.demo.model;
+package com.xydl.cac.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

src/main/java/com/xydl/cac/model/SensorDetail.java

@@ -1,6 +1,6 @@
-package com.xydl.demo.model;
+package com.xydl.cac.model;
 
-import com.xydl.demo.entity.NiecPoint;
+import com.xydl.cac.entity.NiecPoint;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/xydl/cac/repository/NiecPointRepository.java

@@ -1,6 +1,6 @@
-package com.xydl.demo.repository;
+package com.xydl.cac.repository;
 
-import com.xydl.demo.entity.NiecPoint;
+import com.xydl.cac.entity.NiecPoint;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/xydl/cac/repository/NiecSensorRepository.java

@@ -1,6 +1,6 @@
-package com.xydl.demo.repository;
+package com.xydl.cac.repository;
 
-import com.xydl.demo.entity.NiecSensor;
+import com.xydl.cac.entity.NiecSensor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/xydl/cac/service/NiecPointService.java

@@ -1,6 +1,6 @@
-package com.xydl.demo.service;
+package com.xydl.cac.service;
 
-import com.xydl.demo.entity.NiecPoint;
+import com.xydl.cac.entity.NiecPoint;
 
 import java.util.List;
 

src/main/java/com/xydl/cac/service/NiecSensorService.java

@@ -1,8 +1,8 @@
-package com.xydl.demo.service;
+package com.xydl.cac.service;
 
-import com.xydl.demo.entity.NiecSensor;
+import com.xydl.cac.entity.NiecSensor;
-import com.xydl.demo.model.ConditionModel;
+import com.xydl.cac.model.ConditionModel;
-import com.xydl.demo.model.SensorDetail;
+import com.xydl.cac.model.SensorDetail;
 import org.springframework.data.domain.Page;
 
 import java.util.List;

src/main/java/com/xydl/cac/service/impl/NiecPointServiceImpl.java

@@ -1,10 +1,8 @@
-package com.xydl.demo.service.impl;
+package com.xydl.cac.service.impl;
 
-import com.xydl.demo.entity.NiecPoint;
+import com.xydl.cac.entity.NiecPoint;
-import com.xydl.demo.entity.NiecSensor;
+import com.xydl.cac.repository.NiecPointRepository;
-import com.xydl.demo.repository.NiecPointRepository;
+import com.xydl.cac.service.NiecPointService;
-import com.xydl.demo.repository.NiecSensorRepository;
-import com.xydl.demo.service.NiecPointService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
@@ -12,7 +10,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import java.util.List;
 

src/main/java/com/xydl/cac/service/impl/NiecSensorServiceImpl.java

@@ -1,14 +1,13 @@
-package com.xydl.demo.service.impl;
+package com.xydl.cac.service.impl;
-
+
-import com.xydl.demo.entity.NiecPoint;
+import com.xydl.cac.entity.NiecPoint;
-import com.xydl.demo.entity.NiecSensor;
+import com.xydl.cac.entity.NiecSensor;
-import com.xydl.demo.model.ConditionModel;
+import com.xydl.cac.model.ConditionModel;
-import com.xydl.demo.model.SensorDetail;
+import com.xydl.cac.model.SensorDetail;
-import com.xydl.demo.repository.NiecSensorRepository;
+import com.xydl.cac.repository.NiecSensorRepository;
-import com.xydl.demo.service.NiecPointService;
+import com.xydl.cac.service.NiecPointService;
-import com.xydl.demo.service.NiecSensorService;
+import com.xydl.cac.service.NiecSensorService;
-import com.xydl.demo.service.impl.NiecPointServiceImpl;
+import com.xydl.cac.util.DateUtil;
-import com.xydl.demo.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;

src/main/java/com/xydl/cac/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.xydl.demo.util;
+package com.xydl.cac.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/main/resources/application-dev.yml

@@ -0,0 +1,39 @@
+server:
+  port: 8099
+  servlet:
+    context-path: /
+
+spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.50.200:3306/iec104?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
+    username: root
+    password: 123456
+  jpa:
+    show-sql: true
+  mvc:
+    format:
+      date: yyyy-MM-dd HH:mm:ss
+    pathmatch:
+      matching-strategy: ant_path_matcher
+
+logging:
+  level:
+    root: info
+    com:
+      xydl:
+        controller:
+          TestControler: info
+        service:
+          impl: debug
+        schedule: info
+  file:
+    name: /root/log/mqtt.log
+
+
+
+
+

src/main/resources/application-prod.yml

@@ -0,0 +1,39 @@
+server:
+  port: 8099
+  servlet:
+    context-path: /
+
+spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/iec104?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
+    username: iec
+    password: Iec@1043
+  jpa:
+    show-sql: true
+  mvc:
+    format:
+      date: yyyy-MM-dd HH:mm:ss
+    pathmatch:
+      matching-strategy: ant_path_matcher
+
+logging:
+  level:
+    root: info
+    com:
+      xydl:
+        controller:
+          TestControler: info
+        service:
+          impl: debug
+        schedule: info
+  file:
+    name: /home/xydl/ncac/logs/ncac.log
+
+
+
+
+

src/main/resources/application.yml

@@ -1,22 +1,3 @@
-server:
-  port: 8099
-  servlet:
-    context-path: /
-
 spring:
-  jackson:
+  profiles:
-    date-format: yyyy-MM-dd HH:mm:ss
+    active: prod
-    time-zone: GMT+8
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/iec104?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-#    url: jdbc:mysql://192.168.50.200:3306/iec104?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-  jpa:
-    show-sql: true
-  mvc:
-    format:
-      date: yyyy-MM-dd HH:mm:ss
-    pathmatch:
-      matching-strategy: ant_path_matcher