gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Syncredis方法名修改和来配置统计sql增加审核时间属性

Browse Source
This commit is contained in:
doufenghu
2019-02-21 16:29:39 +06:00
parent c3c81ca8b8
commit e78cf4b0e3
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
db/init/galaxy_stru_ui_mysql.sql
View File

@@ -2,7 +2,7 @@
drop table if exists ui_asn_ip_cfg; drop table if exists ui_asn_ip_cfg;
drop table if exists ui_sys_dict_info; drop table if exists ui_sys_dict_info;
drop table if exists ui_code_app_dic; drop table if exists ui_code_app_dic;
drop table if exists ui_cfg_num_statistics;
drop table if exists ui_request_num_statistics; drop table if exists ui_request_num_statistics;
drop table if exists ui_sys_data_dictionary_item; drop table if exists ui_sys_data_dictionary_item;
drop table if exists ui_code_behavior_type_dic; drop table if exists ui_code_behavior_type_dic;
@@ -95,7 +95,7 @@ CREATE TABLE `ui_sys_dict_info` (
) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@10.0.4.6:3306/ntc_db/code_app_dic'; ) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@10.0.4.6:3306/ntc_db/code_app_dic';
drop table if exists ui_cfg_num_statistics;
CREATE TABLE `ui_cfg_num_statistics` ( CREATE TABLE `ui_cfg_num_statistics` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`function_id` int(11) NOT NULL, `function_id` int(11) NOT NULL,
@@ -104,6 +104,7 @@ CREATE TABLE `ui_cfg_num_statistics` (
`cfg_state` int(11) NOT NULL COMMENT '0未审核，1已审核，2审核未通过，3审核取消，-1删除', `cfg_state` int(11) NOT NULL COMMENT '0未审核，1已审核，2审核未通过，3审核取消，-1删除',
`compile_id` int(11) DEFAULT 0, `compile_id` int(11) DEFAULT 0,
`statistic_time` datetime DEFAULT NULL COMMENT '统计时间', `statistic_time` datetime DEFAULT NULL COMMENT '统计时间',
`audit_time` datetime DEFAULT null COMMENT '审核时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@10.0.4.6:3306/ntc_db/cfg_num_statistics'; ) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@10.0.4.6:3306/ntc_db/cfg_num_statistics';

33
src/main/java/com/nis/web/task/SyncRedisToCluster.java
View File

@@ -1,20 +1,5 @@
package com.nis.web.task; package com.nis.web.task;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.PropertySource;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import com.nis.restful.RestBusinessCode; import com.nis.restful.RestBusinessCode;
import com.nis.restful.ServiceRuntimeException; import com.nis.restful.ServiceRuntimeException;
import com.nis.util.Configurations; import com.nis.util.Configurations;
@@ -23,16 +8,16 @@ import com.nis.util.ExceptionUtil;
import com.nis.util.JedisUtils; import com.nis.util.JedisUtils;
import com.nis.web.service.SpringContextHolder; import com.nis.web.service.SpringContextHolder;
import com.nis.web.service.restful.ConfigJedisServiceimpl; import com.nis.web.service.restful.ConfigJedisServiceimpl;
import org.slf4j.Logger;
import redis.clients.jedis.Jedis; import org.slf4j.LoggerFactory;
import redis.clients.jedis.JedisCluster; import org.springframework.context.annotation.PropertySource;
import redis.clients.jedis.JedisPool; import org.springframework.stereotype.Component;
import redis.clients.jedis.ScanParams; import redis.clients.jedis.*;
import redis.clients.jedis.ScanResult;
import redis.clients.jedis.Tuple;
import redis.clients.jedis.exceptions.JedisException; import redis.clients.jedis.exceptions.JedisException;
import redis.clients.util.JedisClusterCRC16; import redis.clients.util.JedisClusterCRC16;
import java.util.*;
@Component @Component
@PropertySource(value = { "classpath:nis.properties", "classpath:jdbc.properties" }) @PropertySource(value = { "classpath:nis.properties", "classpath:jdbc.properties" })
public class SyncRedisToCluster { public class SyncRedisToCluster {
@@ -72,8 +57,8 @@ public class SyncRedisToCluster {
} }
} }
// @Scheduled(cron = "${syncRedisToClusterCron}") //@Scheduled(cron = "${syncRedisToClusterCron}")
public void syncRedisToCluster1() { public void syncRedisToCluster() {
JedisCluster jedisCluster = getResource(); JedisCluster jedisCluster = getResource();
String requestId = UUID.randomUUID().toString(); String requestId = UUID.randomUUID().toString();
try { try {