diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index e08196e..a710c06 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -29,7 +28,6 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; - } @BussinessLog(value = "相机树查询") @@ -39,4 +37,4 @@ return ResponseDataDTO.success(busDeviceInfoService.tree()); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index e08196e..a710c06 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -29,7 +28,6 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; - } @BussinessLog(value = "相机树查询") @@ -39,4 +37,4 @@ return ResponseDataDTO.success(busDeviceInfoService.tree()); } -} +} \ No newline at end of file diff --git a/casic-warning-analysis/pom.xml b/casic-warning-analysis/pom.xml new file mode 100644 index 0000000..fea619f --- /dev/null +++ b/casic-warning-analysis/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.casic + casic-production-safety + 2.0.0 + ../pom.xml + + + casic-warning-analysis + 2.0.0 + jar + casic-warning-analysis + 预警分析 + + + + + com.hikvision.ga + artemis-http-client + 1.1.3 + + + + + + + + com.casic + casic-admin-group + ${admin.version} + + + com.casic + casic-core + ${core.version} + provided + + + + com.casic + casic-admin-support + ${admin.version} + provided + + + com.casic + casic-area-starter + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + + + org.springframework.boot + spring-boot-starter-web + ${boot.version} + provided + + + com.casic + casic-knife4j-boot-starter + ${extension.version} + + + com.casic + casic-video-sdk-support + ${pro.version} + + + com.casic + casic-job-quartz + ${extension.version} + + + + com.casic + casic-file-support + 2.0.0.alpha + compile + + + + + + + src/main/java + + **/*.xml + + + + ${project.basedir}/lib + + * + + + + src/main/resources/config/hiklib + + * + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index e08196e..a710c06 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -29,7 +28,6 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; - } @BussinessLog(value = "相机树查询") @@ -39,4 +37,4 @@ return ResponseDataDTO.success(busDeviceInfoService.tree()); } -} +} \ No newline at end of file diff --git a/casic-warning-analysis/pom.xml b/casic-warning-analysis/pom.xml new file mode 100644 index 0000000..fea619f --- /dev/null +++ b/casic-warning-analysis/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.casic + casic-production-safety + 2.0.0 + ../pom.xml + + + casic-warning-analysis + 2.0.0 + jar + casic-warning-analysis + 预警分析 + + + + + com.hikvision.ga + artemis-http-client + 1.1.3 + + + + + + + + com.casic + casic-admin-group + ${admin.version} + + + com.casic + casic-core + ${core.version} + provided + + + + com.casic + casic-admin-support + ${admin.version} + provided + + + com.casic + casic-area-starter + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + + + org.springframework.boot + spring-boot-starter-web + ${boot.version} + provided + + + com.casic + casic-knife4j-boot-starter + ${extension.version} + + + com.casic + casic-video-sdk-support + ${pro.version} + + + com.casic + casic-job-quartz + ${extension.version} + + + + com.casic + casic-file-support + 2.0.0.alpha + compile + + + + + + + src/main/java + + **/*.xml + + + + ${project.basedir}/lib + + * + + + + src/main/resources/config/hiklib + + * + + + + + \ No newline at end of file diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c9adf31..87bd14b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -131,6 +131,12 @@ spring-boot-starter-tomcat + compile + + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.81 com.casic diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index e08196e..a710c06 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -29,7 +28,6 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; - } @BussinessLog(value = "相机树查询") @@ -39,4 +37,4 @@ return ResponseDataDTO.success(busDeviceInfoService.tree()); } -} +} \ No newline at end of file diff --git a/casic-warning-analysis/pom.xml b/casic-warning-analysis/pom.xml new file mode 100644 index 0000000..fea619f --- /dev/null +++ b/casic-warning-analysis/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.casic + casic-production-safety + 2.0.0 + ../pom.xml + + + casic-warning-analysis + 2.0.0 + jar + casic-warning-analysis + 预警分析 + + + + + com.hikvision.ga + artemis-http-client + 1.1.3 + + + + + + + + com.casic + casic-admin-group + ${admin.version} + + + com.casic + casic-core + ${core.version} + provided + + + + com.casic + casic-admin-support + ${admin.version} + provided + + + com.casic + casic-area-starter + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + + + org.springframework.boot + spring-boot-starter-web + ${boot.version} + provided + + + com.casic + casic-knife4j-boot-starter + ${extension.version} + + + com.casic + casic-video-sdk-support + ${pro.version} + + + com.casic + casic-job-quartz + ${extension.version} + + + + com.casic + casic-file-support + 2.0.0.alpha + compile + + + + + + + src/main/java + + **/*.xml + + + + ${project.basedir}/lib + + * + + + + src/main/resources/config/hiklib + + * + + + + + \ No newline at end of file diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c9adf31..87bd14b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -131,6 +131,12 @@ spring-boot-starter-tomcat + compile + + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.81 com.casic diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 45190f5..75ea0fd 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -45,8 +45,8 @@ mdm: wsdl: http://localhost:6909/safe-server/ws/mdmService?wsdl mqId: 123456 #h后缀需添加 -UUM - open: true - corn: 0 */2 * * * * + open: false + corn: 0 */60 * * * * video: admin: role: administrator #安全管理员角色标识 安全管理员可看未定密数据 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java index e08196e..a710c06 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VideoInfoController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -29,7 +28,6 @@ public VideoInfoController(IBusDeviceInfoService busDeviceInfoService) { this.busDeviceInfoService = busDeviceInfoService; - } @BussinessLog(value = "相机树查询") @@ -39,4 +37,4 @@ return ResponseDataDTO.success(busDeviceInfoService.tree()); } -} +} \ No newline at end of file diff --git a/casic-warning-analysis/pom.xml b/casic-warning-analysis/pom.xml new file mode 100644 index 0000000..fea619f --- /dev/null +++ b/casic-warning-analysis/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.casic + casic-production-safety + 2.0.0 + ../pom.xml + + + casic-warning-analysis + 2.0.0 + jar + casic-warning-analysis + 预警分析 + + + + + com.hikvision.ga + artemis-http-client + 1.1.3 + + + + + + + + com.casic + casic-admin-group + ${admin.version} + + + com.casic + casic-core + ${core.version} + provided + + + + com.casic + casic-admin-support + ${admin.version} + provided + + + com.casic + casic-area-starter + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + + + org.springframework.boot + spring-boot-starter-web + ${boot.version} + provided + + + com.casic + casic-knife4j-boot-starter + ${extension.version} + + + com.casic + casic-video-sdk-support + ${pro.version} + + + com.casic + casic-job-quartz + ${extension.version} + + + + com.casic + casic-file-support + 2.0.0.alpha + compile + + + + + + + src/main/java + + **/*.xml + + + + ${project.basedir}/lib + + * + + + + src/main/resources/config/hiklib + + * + + + + + \ No newline at end of file diff --git a/casic-web/pom.xml b/casic-web/pom.xml index c9adf31..87bd14b 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -131,6 +131,12 @@ spring-boot-starter-tomcat + compile + + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.81 com.casic diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 45190f5..75ea0fd 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -45,8 +45,8 @@ mdm: wsdl: http://localhost:6909/safe-server/ws/mdmService?wsdl mqId: 123456 #h后缀需添加 -UUM - open: true - corn: 0 */2 * * * * + open: false + corn: 0 */60 * * * * video: admin: role: administrator #安全管理员角色标识 安全管理员可看未定密数据 diff --git a/pom.xml b/pom.xml index ab76b0e..da71148 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ casic-web casic-server + casic-warning-analysis casic-server-sync casic-device-sync casic-video-sdk