Skip to content

S
SolrDataComparison
Commit dc4549e9 by chentian
Options

基站去重修改，webscoket调用先注释

parent 58239f66
Showing with 66 additions and 44 deletions
src/main/java/com/cc/solr/controller/TaskController.java
......@@ -5,7 +5,6 @@ import com.cc.solr.util.SolrUpdateJobTask;
import com.cc.solr.util.TestTask;
import com.cc.solr.util.propertiesUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -24,8 +23,8 @@ import java.util.concurrent.Future;
public class TaskController {
@Autowired
private SolrUpdateJobTask solrUpdateJobTask;
@Autowired
private SimpMessagingTemplate template;
/* @Autowired
private SimpMessagingTemplate template;*/
@Autowired
private ServletContext servletContext;
@ResponseBody
......@@ -66,7 +65,7 @@ public class TaskController {
solrdata.setFlag("1");//原数据
solrdatalist.add(solrdata);
}
this.template.convertAndSend("/topic/getResponse", solrdatalist);
//this.template.convertAndSend("/topic/getResponse", solrdatalist);
return solrdatalist.toString();
}
@ResponseBody
......@@ -112,7 +111,7 @@ public class TaskController {
solrdata.setFlag("2");//原数据
solrdatalist.add(solrdata);
}
this.template.convertAndSend("/topic/getResponse2", solrdatalist);
//this.template.convertAndSend("/topic/getResponse2", solrdatalist);
return solrdatalist.toString();
}
@ResponseBody
......
src/main/java/com/cc/solr/job/TrackDataJob.java
......@@ -57,13 +57,16 @@ public class TrackDataJob implements BaseJob {
Date date = new Date();//创建时间
String importdate = bf.format(date);//格式化 bf.format(date);
System.out.println("TrackData Job执行时间: " + new Date());
// _log.info("TrackData Job执行时间: " + new Date());
//查询track表增量，track表djsj>当前任务执行时间-1小时的数据，减一小时是为了避免丢失数据。
System.out.println("lallalalalalalalalImportdate:"+importdate);
_log.info("lallalalalalalalalImportdate:"+importdate);
List<Track> trackList= trackService.selectTrackList(importdate);
List<Track> trackList=new ArrayList<Track>();
try {
trackList = trackService.selectTrackList(importdate);
}catch (Exception e){
_log.error("Search trackList error: " + e.getMessage());
e.printStackTrace();
}
System.out.println("1:增量总数："+trackList.size());
// _log.info("1:增量总数："+trackList.size());
Properties properties = propertiesUtil.propertiesUtil("solr.properties");
......@@ -90,10 +93,6 @@ public class TrackDataJob implements BaseJob {
total=Runtime.getRuntime().totalMemory();
free=Runtime.getRuntime().freeMemory();
usememory=max-total+free;
System.out.println("1:max"+max);
System.out.println("2:total"+total);
System.out.println("3:free"+free);
System.out.println("4:usememory"+usememory);
_log.info("1:max"+max);
_log.info("2:total"+total);
_log.info("3:free"+free);
......@@ -108,6 +107,7 @@ public class TrackDataJob implements BaseJob {
queryResponse = client.query(core, params);
} catch(Exception e){
solrflag=1;
_log.error("Solr search error: " + e.getMessage());
e.printStackTrace();
}finally {
//搜索结果
......@@ -120,12 +120,18 @@ public class TrackDataJob implements BaseJob {
}
if(solrSize==0){//0表示数据源里没有
//再去基站信息表里查询一次，确保确定没有这条数据
list = tbStJzxxService.selectJzxxByAddressJW(trackList.get(i).getAddress(),trackList.get(i).getJ(),trackList.get(i).getW());
if(list.size()==0){
this.saveJzxx(trackList.get(i),core, client);//25则入库oracle，把数据写入数据源，确保每次任务结束之后，数据源与比对源的数据一致
jzxxcount++;
try{
list = tbStJzxxService.selectJzxxByAddressJW(trackList.get(i).getAddress(),trackList.get(i).getJ(),trackList.get(i).getW());
if(list.size()==0){
this.saveJzxx(trackList.get(i),core, client);//25则入库oracle，把数据写入数据源，确保每次任务结束之后，数据源与比对源的数据一致
jzxxcount++;
}
savecount++;
}catch (Exception e){
_log.error("SelectJzxxByAddressJW error: " + e.getMessage());
e.printStackTrace();
}
savecount++;
}
}
......@@ -172,6 +178,7 @@ public class TrackDataJob implements BaseJob {
//手动add数据到数据源里
}
}catch(Exception e){
_log.error("Save jzxx error: " + e.getMessage());
e.printStackTrace();
}
......
src/main/java/com/cc/solr/mapper/xzxt/TbStJzxxMapper.java
......@@ -10,7 +10,7 @@ import java.util.List;
//@Mapper
public interface TbStJzxxMapper {
@Select("select * from tb_st_jzxx where address=#{arg0} and lon=#{arg1} and lat=#{arg2}")
public List<TbStJzxx> selectJzxxByAddressJW(String address,String lon,String lat);
@Select("select * from tb_st_jzxx where address=#{address} and lon=#{lon} and lat=#{lat}")
public List<TbStJzxx> selectJzxxByAddressJW(@Param("address")String address,@Param("lon")String lon,@Param("lat")String lat);
}
src/main/java/com/cc/solr/util/RedisUtil.java
......@@ -187,9 +187,21 @@ public class RedisUtil {
public static void main(String[] args){
RedisUtil t =new RedisUtil();
// t.hmSet("chent","test","123");
//t.hmSet("chent","test","123");
t.set("4","4");
System.out.println("-------------");
/* for(int i=0;i<3;i++){
int count=0;
try{
throw new Exception();
}catch(Exception e){
count=1;
e.printStackTrace();
}
System.out.println(count);
}
*/
}
}
src/main/resources/application.properties
......@@ -2,10 +2,11 @@ person.last-name=2222
server.port=8081
swagger.enable=true
spring.thymeleaf.cache=false
websocketurl=http://localhost:9022/alldata
websocketurl=http://127.0.0.1:9022/alldata
dataReportingurl=http://192.168.1.113:8080/sjjh-control
logging.level.com.cc.solr.job.TrackDataJob=DEBUG
#logging.path=d:/logs/joblog
#logging.file=joblog.log
#\u04B2\uFFFD\uFFFD\uFFFD\uFFFD\u02F5\uFFFD\uFFFD\uFFFD\u07F3\u0333\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04AA\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0333\u0634\uFFFD\u0421\uFFFD\uFFFDcorePoolSize\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
#\u00FB\uFFFD\u0434\uFD7D\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\u00FF\uFFFD\uFFFD\uFFFD\u1F7B\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uD99B\uDF3B\uFFFD\u05B1\uFFFD\u04F4\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0323\uFFFD
#\uFFFD\uFFFD\uFFFD\uFD7D\uFFFD\u02FB\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uD997\uDF74\uF8EC\uFFFD\uFFFD\uFFFD\u0237\uFFFD\uFFFD\uFFFD\u0234\uFFFD\uFFFD\uFFFD\uFFFD\u0423\uFFFD
......@@ -21,11 +22,11 @@ ThreadPool.queueCapacity: 10
# Redis\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA0\uFFFD\uFFFD
spring.redis.database=0
# Redis\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B7
spring.redis.host=47.92.48.137
spring.redis.host=127.0.0.1
# Redis\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04F6\u02FF\uFFFD
spring.redis.port=6379
# Redis\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uB8E8\u012C\uFFFD\uFFFD\u03AA\uFFFD\u0563\uFFFD
spring.redis.password=123456
spring.redis.password=
# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\u00F8\uFFFD\u05B5\uFFFD\uFFFD\u02BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD
spring.redis.pool.max-active=8
# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0234\uFFFD\u02B1\uFFFD\u48E8\u02B9\uFFFD\u00F8\uFFFD\u05B5\uFFFD\uFFFD\u02BE\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD
......
src/main/resources/application.yml
......@@ -6,9 +6,9 @@ spring:
mysql:
driverClassName: com.mysql.jdbc.Driver
username: root
password: 123
password: 123456
# mysql
jdbc-url: jdbc:mysql://192.168.1.114:3306/mybatis
jdbc-url: jdbc:mysql://127.0.0.1:3306/mybatis
type: com.alibaba.druid.pool.DruidDataSource
xzxt:
driverClassName: oracle.jdbc.driver.OracleDriver
......@@ -16,4 +16,6 @@ spring:
password: XZXT
# oracle
jdbc-url: jdbc:oracle:thin:@127.0.0.1:1521:xzxtcp
type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file
type: com.alibaba.druid.pool.DruidDataSource
logging:
file: d:/joblogs
\ No newline at end of file
src/main/resources/quartz.properties
# 固定前缀org.quartz
# 主要分为scheduler、threadPool、jobStore、plugin等部分
# \u56FA\u5B9A\u524D\u7F00org.quartz
# \u4E3B\u8981\u5206\u4E3Ascheduler\u3001threadPool\u3001jobStore\u3001plugin\u7B49\u90E8\u5206
#
#
org.quartz.scheduler.instanceName = DefaultQuartzScheduler
......@@ -7,22 +7,22 @@ org.quartz.scheduler.rmi.export = false
org.quartz.scheduler.rmi.proxy = false
org.quartz.scheduler.wrapJobExecutionInUserTransaction = false
# 实例化ThreadPool时，使用的线程类为SimpleThreadPool
# \u5B9E\u4F8B\u5316ThreadPool\u65F6\uFF0C\u4F7F\u7528\u7684\u7EBF\u7A0B\u7C7B\u4E3ASimpleThreadPool
org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
# threadCount和threadPriority将以setter的形式注入ThreadPool实例
# 并发个数
org.quartz.threadPool.threadCount = 5
# 优先级
# threadCount\u548CthreadPriority\u5C06\u4EE5setter\u7684\u5F62\u5F0F\u6CE8\u5165ThreadPool\u5B9E\u4F8B
# \u5E76\u53D1\u4E2A\u6570
org.quartz.threadPool.threadCount = 10
# \u4F18\u5148\u7EA7
org.quartz.threadPool.threadPriority = 5
org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread = true
org.quartz.jobStore.misfireThreshold = 5000
# 默认存储在内存中
# \u9ED8\u8BA4\u5B58\u50A8\u5728\u5185\u5B58\u4E2D
#org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
#持久化
#\u6301\u4E45\u5316
org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
org.quartz.jobStore.tablePrefix = QRTZ_
......@@ -35,6 +35,6 @@ org.quartz.dataSource.qzDS.URL = jdbc:mysql://127.0.0.1:3306/mybatis?useUnicode=
org.quartz.dataSource.qzDS.user = root
org.quartz.dataSource.qzDS.password = 123
org.quartz.dataSource.qzDS.password = 123456
org.quartz.dataSource.qzDS.maxConnections = 10
\ No newline at end of file
src/main/resources/templates/comparisonecharts.html
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="/jquery/jquery.min.js"></script>
<script type="text/javascript" src="js/layer/layer.js" charset="utf-8"></script>
<script type="text/javascript" src="/js/echarts/echarts.min.js"></script>
<script type="text/javascript" src="js/webSocket2.js" charset="utf-8"></script>
<!-- <script type="text/javascript" src="js/webSocket2.js" charset="utf-8"></script>-->
<script type="text/javascript" src="js/sockjs.min.js" charset="utf-8"></script>
<script type="text/javascript" src="js/stomp.min.js" charset="utf-8"></script>
<script type="text/javascript" src="layui/layui.all.js" charset="utf-8"></script>
......
src/main/resources/templates/solrdata.html
......@@ -31,7 +31,7 @@
<!-- 独立JS -->
<script type="text/javascript" src="js/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript" src="js/webSocket.js" charset="utf-8"></script>
<!--<script type="text/javascript" src="js/webSocket.js" charset="utf-8"></script>-->
<script type="text/javascript" src="js/sockjs.min.js" charset="utf-8"></script>
<script type="text/javascript" src="js/stomp.min.js" charset="utf-8"></script>
<script src="layui/layui.js" charset="utf-8"></script>
......
src/main/resources/templates/sourceecharts.html
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="/jquery/jquery.min.js"></script>
<script type="text/javascript" src="js/layer/layer.js" charset="utf-8"></script>
<script type="text/javascript" src="/js/echarts/echarts.min.js"></script>
<script type="text/javascript" src="js/webSocket.js" charset="utf-8"></script>
<!-- <script type="text/javascript" src="js/webSocket.js" charset="utf-8"></script>-->
<script type="text/javascript" src="js/sockjs.min.js" charset="utf-8"></script>
<script type="text/javascript" src="js/stomp.min.js" charset="utf-8"></script>
<script type="text/javascript" src="layui/layui.all.js" charset="utf-8"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment