diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2deec6f..2fe9d67 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -185,8 +185,8 @@ // jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); // jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); - jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < " + before180Days); - jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < " + before180Days); + jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < '" + before180Days+"'"); + jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < '" + before180Days+"'"); } @Transactional diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2deec6f..2fe9d67 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -185,8 +185,8 @@ // jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); // jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); - jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < " + before180Days); - jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < " + before180Days); + jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < '" + before180Days+"'"); + jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < '" + before180Days+"'"); } @Transactional diff --git a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java index 5fb17fc..e14f758 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -28,31 +28,36 @@ private String dcUser; @Value("${casic.video.dc.pwd:-1}") private String dcPwd; - + //*/20 * * * * /** - * 设备信息同步 - * 每30分钟采集一次 + * 设备信息同步0 + * 每30分钟采集一次 // */ - @Scheduled(cron = "0 */30 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.device}") public void device() { //更新组织机构信息 log.info("dc sdk 设备信息同步"); if (dc) { String token = ""; if (tokenMap.containsKey(dcUser)) { + log.info("dc user:{}",dcUser); token = tokenMap.get(token); } else { token = DcUtil.loginDc(dcUrl, dcUser, dcPwd); if (StrUtil.isNotEmpty(token)) { tokenMap.put(dcUser, token); + }else { + log.error("dc user login error: {}",dcUser); } } + deviceStatusService.syncDcDevices(token); } + log.info("dc sdk 设备同步结束：{}"); } - @Scheduled(cron = "0 */10 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.refreshToken}") public void deviceRefreshToken() { //更新组织机构信息 log.info("dc 用户token刷新"); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2deec6f..2fe9d67 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -185,8 +185,8 @@ // jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); // jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); - jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < " + before180Days); - jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < " + before180Days); + jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < '" + before180Days+"'"); + jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < '" + before180Days+"'"); } @Transactional diff --git a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java index 5fb17fc..e14f758 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -28,31 +28,36 @@ private String dcUser; @Value("${casic.video.dc.pwd:-1}") private String dcPwd; - + //*/20 * * * * /** - * 设备信息同步 - * 每30分钟采集一次 + * 设备信息同步0 + * 每30分钟采集一次 // */ - @Scheduled(cron = "0 */30 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.device}") public void device() { //更新组织机构信息 log.info("dc sdk 设备信息同步"); if (dc) { String token = ""; if (tokenMap.containsKey(dcUser)) { + log.info("dc user:{}",dcUser); token = tokenMap.get(token); } else { token = DcUtil.loginDc(dcUrl, dcUser, dcPwd); if (StrUtil.isNotEmpty(token)) { tokenMap.put(dcUser, token); + }else { + log.error("dc user login error: {}",dcUser); } } + deviceStatusService.syncDcDevices(token); } + log.info("dc sdk 设备同步结束：{}"); } - @Scheduled(cron = "0 */10 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.refreshToken}") public void deviceRefreshToken() { //更新组织机构信息 log.info("dc 用户token刷新"); diff --git a/casic-web/src/main/resources/config/application-shentong200.yml b/casic-web/src/main/resources/config/application-shentong200.yml index e834879..f9bdc85 100644 --- a/casic-web/src/main/resources/config/application-shentong200.yml +++ b/casic-web/src/main/resources/config/application-shentong200.yml @@ -13,16 +13,15 @@ web: resources: static-locations: /home/admin/casic/stay/data/tmp/ + redis: + host: localhost + port: 6379 + # password: ew5T4K3#203lwh + database: 3 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer jms: pub-sub-domain: true -# session: -# store-type: redis -# redis: -# host: 111.198.10.15 -# port: 11412 -# password: ew5T4K3#203lwh -# serializer: org.springframework.data.redis.serializer.StringRedisSerializer -# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources @@ -37,6 +36,17 @@ picPath: /home/admin/casic/stay/data/stay/ log: #百万日志存储量 total: 1000000 + video: + admin: + role: administrator + dc: + corn: + refreshToken: 0 */5 * * * * + device: 0 */20 * * * * + open: true + url: https://192.168.83.42:18080 + user: jtcsyh + pwd: logging: level.root: info level.com.casic: debug diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2deec6f..2fe9d67 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -185,8 +185,8 @@ // jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); // jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); - jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < " + before180Days); - jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < " + before180Days); + jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < '" + before180Days+"'"); + jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < '" + before180Days+"'"); } @Transactional diff --git a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java index 5fb17fc..e14f758 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -28,31 +28,36 @@ private String dcUser; @Value("${casic.video.dc.pwd:-1}") private String dcPwd; - + //*/20 * * * * /** - * 设备信息同步 - * 每30分钟采集一次 + * 设备信息同步0 + * 每30分钟采集一次 // */ - @Scheduled(cron = "0 */30 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.device}") public void device() { //更新组织机构信息 log.info("dc sdk 设备信息同步"); if (dc) { String token = ""; if (tokenMap.containsKey(dcUser)) { + log.info("dc user:{}",dcUser); token = tokenMap.get(token); } else { token = DcUtil.loginDc(dcUrl, dcUser, dcPwd); if (StrUtil.isNotEmpty(token)) { tokenMap.put(dcUser, token); + }else { + log.error("dc user login error: {}",dcUser); } } + deviceStatusService.syncDcDevices(token); } + log.info("dc sdk 设备同步结束：{}"); } - @Scheduled(cron = "0 */10 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.refreshToken}") public void deviceRefreshToken() { //更新组织机构信息 log.info("dc 用户token刷新"); diff --git a/casic-web/src/main/resources/config/application-shentong200.yml b/casic-web/src/main/resources/config/application-shentong200.yml index e834879..f9bdc85 100644 --- a/casic-web/src/main/resources/config/application-shentong200.yml +++ b/casic-web/src/main/resources/config/application-shentong200.yml @@ -13,16 +13,15 @@ web: resources: static-locations: /home/admin/casic/stay/data/tmp/ + redis: + host: localhost + port: 6379 + # password: ew5T4K3#203lwh + database: 3 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer jms: pub-sub-domain: true -# session: -# store-type: redis -# redis: -# host: 111.198.10.15 -# port: 11412 -# password: ew5T4K3#203lwh -# serializer: org.springframework.data.redis.serializer.StringRedisSerializer -# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources @@ -37,6 +36,17 @@ picPath: /home/admin/casic/stay/data/stay/ log: #百万日志存储量 total: 1000000 + video: + admin: + role: administrator + dc: + corn: + refreshToken: 0 */5 * * * * + device: 0 */20 * * * * + open: true + url: https://192.168.83.42:18080 + user: jtcsyh + pwd: logging: level.root: info level.com.casic: debug diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 37adb9c..89f95c0 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: centos + active: shentong200 servlet: multipart: max-file-size: 50MB @@ -46,9 +46,12 @@ admin: role: administrator dc: + corn: + refreshToken: 0 */5 * * * * + device: 0 */20 * * * * open: true url: https://192.168.83.42:18080 - user: 0715 + user: jtcsyh pwd: dh: open: true diff --git a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java index 2deec6f..2fe9d67 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/hik/service/impl/DeviceStatusServiceImpl.java @@ -185,8 +185,8 @@ // jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); // jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < NOW() - INTERVAL " + day + " DAY"); - jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < " + before180Days); - jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < " + before180Days); + jdbcTemplate.execute("DELETE FROM sys_operation_log WHERE create_time < '" + before180Days+"'"); + jdbcTemplate.execute("DELETE FROM sys_login_log WHERE create_time < '" + before180Days+"'"); } @Transactional diff --git a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java index 5fb17fc..e14f758 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/task/DcTask.java @@ -28,31 +28,36 @@ private String dcUser; @Value("${casic.video.dc.pwd:-1}") private String dcPwd; - + //*/20 * * * * /** - * 设备信息同步 - * 每30分钟采集一次 + * 设备信息同步0 + * 每30分钟采集一次 // */ - @Scheduled(cron = "0 */30 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.device}") public void device() { //更新组织机构信息 log.info("dc sdk 设备信息同步"); if (dc) { String token = ""; if (tokenMap.containsKey(dcUser)) { + log.info("dc user:{}",dcUser); token = tokenMap.get(token); } else { token = DcUtil.loginDc(dcUrl, dcUser, dcPwd); if (StrUtil.isNotEmpty(token)) { tokenMap.put(dcUser, token); + }else { + log.error("dc user login error: {}",dcUser); } } + deviceStatusService.syncDcDevices(token); } + log.info("dc sdk 设备同步结束：{}"); } - @Scheduled(cron = "0 */10 * * * *") + @Scheduled(cron = "${casic.video.dc.corn.refreshToken}") public void deviceRefreshToken() { //更新组织机构信息 log.info("dc 用户token刷新"); diff --git a/casic-web/src/main/resources/config/application-shentong200.yml b/casic-web/src/main/resources/config/application-shentong200.yml index e834879..f9bdc85 100644 --- a/casic-web/src/main/resources/config/application-shentong200.yml +++ b/casic-web/src/main/resources/config/application-shentong200.yml @@ -13,16 +13,15 @@ web: resources: static-locations: /home/admin/casic/stay/data/tmp/ + redis: + host: localhost + port: 6379 + # password: ew5T4K3#203lwh + database: 3 + serializer: org.springframework.data.redis.serializer.StringRedisSerializer + redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer jms: pub-sub-domain: true -# session: -# store-type: redis -# redis: -# host: 111.198.10.15 -# port: 11412 -# password: ew5T4K3#203lwh -# serializer: org.springframework.data.redis.serializer.StringRedisSerializer -# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources @@ -37,6 +36,17 @@ picPath: /home/admin/casic/stay/data/stay/ log: #百万日志存储量 total: 1000000 + video: + admin: + role: administrator + dc: + corn: + refreshToken: 0 */5 * * * * + device: 0 */20 * * * * + open: true + url: https://192.168.83.42:18080 + user: jtcsyh + pwd: logging: level.root: info level.com.casic: debug diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 37adb9c..89f95c0 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: centos + active: shentong200 servlet: multipart: max-file-size: 50MB @@ -46,9 +46,12 @@ admin: role: administrator dc: + corn: + refreshToken: 0 */5 * * * * + device: 0 */20 * * * * open: true url: https://192.168.83.42:18080 - user: 0715 + user: jtcsyh pwd: dh: open: true diff --git a/sql/VIDEO_USER_1721036244159.SQL b/sql/VIDEO_USER_1721036244159.SQL index dc7a0ae..6b9d493 100644 --- a/sql/VIDEO_USER_1721036244159.SQL +++ b/sql/VIDEO_USER_1721036244159.SQL @@ -409,10 +409,10 @@ ---------------------TABLE DDL: SYS_GROUP_DEVICE--------------------- CREATE TABLE VIDEO_USER.SYS_GROUP_DEVICE ( - ID numeric(18,0) NOT NULL, - GROUP_ID numeric(18,0) , + ID numeric(20,0) NOT NULL, + GROUP_ID numeric(20,0) , CREATE_TIME date , - DEVICE_ID numeric(18,0) , + DEVICE_ID numeric(20,0) , CONSTRAINT PK_SYS_GROUP_DEVICE PRIMARY KEY (ID) ) BINLOG ON ; @@ -420,9 +420,9 @@ ---------------------TABLE DDL: SYS_GROUP_REL_USER--------------------- CREATE TABLE VIDEO_USER.SYS_GROUP_REL_USER ( - ID numeric(18,0) NOT NULL, - GROUP_ID numeric(18,0) , - USER_ID numeric(18,0) , + ID numeric(20,0) NOT NULL, + GROUP_ID numeric(20,0) , + USER_ID numeric(20,0) , CREATE_TIME date , CONSTRAINT PK_SYS_GROUP_REL_USER PRIMARY KEY (ID) ) @@ -1075,7 +1075,7 @@ ---------------------TABLE DDL: SYS_USER_GROUP--------------------- CREATE TABLE VIDEO_USER.SYS_USER_GROUP ( - ID numeric(18,0) NOT NULL, + ID numeric(20,0) NOT NULL, GROUP_NAME character varying(256) , CREATE_TIME date , DEPT_ID numeric(18,0) ,