修改配置配置redis

fiveep-controller/src/main/java/com/bizmatics/controller/web/es/RtAnalogControllerWeb.java

@@ -1,59 +1,59 @@
-package com.bizmatics.controller.web.es;
-
-import com.bizmatics.model.es.RtAnalog;
-import com.bizmatics.service.es.RtAnalogService;
-import com.bizmatics.service.job.RatAnalogTask;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author yq
- * @date 2021/7/17 19:22
- */
-@RestController
-@RequestMapping("rtAnalog")
-public class RtAnalogControllerWeb {
-
-    @Autowired
-    private RtAnalogService rtAnalogService;
-    @Autowired
-    private RatAnalogTask ratAnalogTask;
-
-    @GetMapping("/init")
-    public void init(){
-        rtAnalogService.createIndex();
-    }
-
-    @GetMapping("/all")
-    public Iterator<RtAnalog> all(){
-        return rtAnalogService.findAll();
-    }
-
-    @GetMapping("/delete")
-    public void delete(){
-        rtAnalogService.deleteIndex("fiveep");
-    }
-
-    @GetMapping("/addAll")
-    public void addAll(Date startTime,Date endTime){
-        ratAnalogTask.addAll(startTime,endTime);
-    }
-
-    @GetMapping("/list")
-    public List<RtAnalog> list(Integer userId, Date startTime,Date endTime){
-        return rtAnalogService.list(startTime,endTime,userId);
-    }
-
-
-    @GetMapping("/page")
-    public List<RtAnalog> page(){
-        return rtAnalogService.page();
-    }
-
-}
+//package com.bizmatics.controller.web.es;
+//
+//import com.bizmatics.model.es.RtAnalog;
+//import com.bizmatics.service.es.RtAnalogService;
+//import com.bizmatics.service.job.RatAnalogTask;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.Date;
+//import java.util.Iterator;
+//import java.util.List;
+//
+///**
+// * @author yq
+// * @date 2021/7/17 19:22
+// */
+//@RestController
+//@RequestMapping("rtAnalog")
+//public class RtAnalogControllerWeb {
+//
+//    @Autowired
+//    private RtAnalogService rtAnalogService;
+//    @Autowired
+//    private RatAnalogTask ratAnalogTask;
+//
+//    @GetMapping("/init")
+//    public void init(){
+//        rtAnalogService.createIndex();
+//    }
+//
+//    @GetMapping("/all")
+//    public Iterator<RtAnalog> all(){
+//        return rtAnalogService.findAll();
+//    }
+//
+//    @GetMapping("/delete")
+//    public void delete(){
+//        rtAnalogService.deleteIndex("fiveep");
+//    }
+//
+//    @GetMapping("/addAll")
+//    public void addAll(Date startTime,Date endTime){
+//        ratAnalogTask.addAll(startTime,endTime);
+//    }
+//
+//    @GetMapping("/list")
+//    public List<RtAnalog> list(Integer userId, Date startTime,Date endTime){
+//        return rtAnalogService.list(startTime,endTime,userId);
+//    }
+//
+//
+//    @GetMapping("/page")
+//    public List<RtAnalog> page(){
+//        return rtAnalogService.page();
+//    }
+//
+//}

fiveep-controller/src/main/resources/application-dev.properties

@@ -65,9 +65,9 @@ server.compression.mime-types=application/javascript,text/css,application/json,a
 
 
 #https://blog.csdn.net/haohaifeng002/article/details/102887921
-spring.elasticsearch.rest.uris=http://124.71.174.104:9200
-spring.elasticsearch.rest.username=
-spring.elasticsearch.rest.password=
+#spring.elasticsearch.rest.uris=http://124.71.174.104:9200
+#spring.elasticsearch.rest.username=
+#spring.elasticsearch.rest.password=
 
 # ehcache
 spring.cache.ehcache.enabled=true
@@ -75,9 +75,9 @@ spring.cache.ehcache.config=classpath:ehcache.xml
 # redis
 spring.cache.redis.enabled=true
 spring.redis.database=0
-spring.redis.host=124.71.174.104
+spring.redis.host=47.111.81.118
 spring.redis.port=6379
-spring.redis.password=123456
+spring.redis.password=uskyredis
 spring.redis.timeout=10000
 spring.redis.jedis.pool.max-active=1000
 spring.redis.jedis.pool.max-idle=300

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/es/ElasticRepository.java

@@ -1,27 +1,27 @@
-package com.bizmatics.persistence.mapper.es;
-
-
-import com.bizmatics.model.es.RtAnalog;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.annotations.Query;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-
-
-/**
- * @author yq
- * @date 2021/7/17 19:14
- */
-public interface ElasticRepository extends ElasticsearchRepository<RtAnalog, Long> {
-
-//    //默认的注释
-//    //@Query("{\"bool\" : {\"must\" : {\"field\" : {\"content\" : \"?\"}}}}")
-//    Page<RtAnalog> findByContent(String content, Pageable pageable);
+//package com.bizmatics.persistence.mapper.es;
 //
-//    @Query("{\"bool\" : {\"must\" : {\"field\" : {\"firstCode.keyword\" : \"?\"}}}}")
-//    Page<RtAnalog> findByFirstCode(String firstCode, Pageable pageable);
 //
-//    @Query("{\"bool\" : {\"must\" : {\"field\" : {\"secordCode.keyword\" : \"?\"}}}}")
-//    Page<RtAnalog> findBySecordCode(String secordCode, Pageable pageable);
-
-}
+//import com.bizmatics.model.es.RtAnalog;
+//import org.springframework.data.domain.Page;
+//import org.springframework.data.domain.Pageable;
+//import org.springframework.data.elasticsearch.annotations.Query;
+//import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+//
+//
+///**
+// * @author yq
+// * @date 2021/7/17 19:14
+// */
+//public interface ElasticRepository extends ElasticsearchRepository<RtAnalog, Long> {
+//
+////    //默认的注释
+////    //@Query("{\"bool\" : {\"must\" : {\"field\" : {\"content\" : \"?\"}}}}")
+////    Page<RtAnalog> findByContent(String content, Pageable pageable);
+////
+////    @Query("{\"bool\" : {\"must\" : {\"field\" : {\"firstCode.keyword\" : \"?\"}}}}")
+////    Page<RtAnalog> findByFirstCode(String firstCode, Pageable pageable);
+////
+////    @Query("{\"bool\" : {\"must\" : {\"field\" : {\"secordCode.keyword\" : \"?\"}}}}")
+////    Page<RtAnalog> findBySecordCode(String secordCode, Pageable pageable);
+//
+//}

fiveep-service/src/main/java/com/bizmatics/service/es/RtAnalogService.java

@@ -1,32 +1,32 @@
-package com.bizmatics.service.es;
-
-import com.bizmatics.model.es.RtAnalog;
-import org.springframework.data.domain.Page;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author yq
- * @date 2021/7/17 19:18
- */
-public interface RtAnalogService {
-
-    void createIndex();
-
-    void deleteIndex(String index);
-
-    void save(RtAnalog rtAnalog);
-
-    void saveAll(List<RtAnalog> list);
-
-    Iterator<RtAnalog> findAll();
-
-
-    List<RtAnalog> list(Date startTime, Date endTime, Integer userId);
-
-
-    List<RtAnalog> page();
-
-}
+//package com.bizmatics.service.es;
+//
+//import com.bizmatics.model.es.RtAnalog;
+//import org.springframework.data.domain.Page;
+//
+//import java.util.Date;
+//import java.util.Iterator;
+//import java.util.List;
+//
+///**
+// * @author yq
+// * @date 2021/7/17 19:18
+// */
+//public interface RtAnalogService {
+//
+//    void createIndex();
+//
+//    void deleteIndex(String index);
+//
+//    void save(RtAnalog rtAnalog);
+//
+//    void saveAll(List<RtAnalog> list);
+//
+//    Iterator<RtAnalog> findAll();
+//
+//
+//    List<RtAnalog> list(Date startTime, Date endTime, Integer userId);
+//
+//
+//    List<RtAnalog> page();
+//
+//}

fiveep-service/src/main/java/com/bizmatics/service/es/impl/RtAnalogServiceImpl.java

@@ -1,93 +1,92 @@
-package com.bizmatics.service.es.impl;
-
-import com.bizmatics.model.Device;
-import com.bizmatics.model.es.RtAnalog;
-import com.bizmatics.persistence.mapper.DeviceMapper;
-import com.bizmatics.persistence.mapper.es.ElasticRepository;
-import com.bizmatics.service.es.RtAnalogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import org.springframework.data.elasticsearch.core.query.SearchQuery;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
-
-/**
- * @author yq
- * @date 2021/7/17 19:18
- */
-@Service
-public class RtAnalogServiceImpl implements RtAnalogService {
-
-    @Autowired
-    private ElasticsearchRestTemplate elasticsearchTemplate;
-    @Autowired
-    private ElasticRepository elasticRepository;
-    @Autowired
-    private DeviceMapper deviceMapper;
-
-    private Pageable pageable = PageRequest.of(0,10);
-
-    @Override
-    public void createIndex() {
-        elasticsearchTemplate.createIndex(RtAnalog.class);
-    }
-
-    @Override
-    public void deleteIndex(String index) {
-        elasticsearchTemplate.deleteIndex(index);
-    }
-
-    @Override
-    public void save(RtAnalog docBean) {
-        elasticRepository.save(docBean);
-    }
-
-    @Override
-    public void saveAll(List<RtAnalog> list) {
-        elasticRepository.saveAll(list);
-    }
-
-    @Override
-    public Iterator<RtAnalog> findAll() {
-        return elasticRepository.findAll().iterator();
-    }
-
-    @Override
-    public List<RtAnalog> list(Date startTime,Date endTime,Integer userId) {
-        List<Device> list = deviceMapper.list(userId, null, null, null, null, null);
-        System.out.println(list.size());
-        List<String> deviceCodes = list.stream().map(Device::getDeviceCode).collect(Collectors.toList());
-        SearchQuery searchQuery = new NativeSearchQueryBuilder()
-                .withQuery(boolQuery()
-                        .must(termsQuery("deviceName", deviceCodes))
-                        ).build();
-        List<RtAnalog> rtAnalogs = elasticsearchTemplate.queryForList(searchQuery, RtAnalog.class);
-        System.out.println(rtAnalogs.size());
-        return rtAnalogs;
-
-    }
-
-    @Override
-    public List<RtAnalog> page() {
-        //构建查询
-        SearchQuery query = new NativeSearchQueryBuilder()
-                .withPageable(pageable)
-                .build();
-        Page<RtAnalog> searchResponse = elasticRepository.search(query);
-        System.out.println(searchResponse.getTotalPages());
-        return searchResponse.getContent();
-    }
-
-
-}
+//package com.bizmatics.service.es.impl;
+//
+//import com.bizmatics.model.Device;
+//import com.bizmatics.model.es.RtAnalog;
+//import com.bizmatics.persistence.mapper.DeviceMapper;
+//import com.bizmatics.persistence.mapper.es.ElasticRepository;
+//import com.bizmatics.service.es.RtAnalogService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.data.domain.Page;
+//import org.springframework.data.domain.PageRequest;
+//import org.springframework.data.domain.Pageable;
+//import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+//import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+//import org.springframework.data.elasticsearch.core.query.SearchQuery;
+//
+//import java.util.Date;
+//import java.util.Iterator;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+//import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
+//
+///**
+// * @author yq
+// * @date 2021/7/17 19:18
+// */
+////@Service
+//public class RtAnalogServiceImpl implements RtAnalogService {
+//
+//    @Autowired
+//    private ElasticsearchRestTemplate elasticsearchTemplate;
+//    @Autowired
+//    private ElasticRepository elasticRepository;
+//    @Autowired
+//    private DeviceMapper deviceMapper;
+//
+//    private Pageable pageable = PageRequest.of(0,10);
+//
+//    @Override
+//    public void createIndex() {
+//        elasticsearchTemplate.createIndex(RtAnalog.class);
+//    }
+//
+//    @Override
+//    public void deleteIndex(String index) {
+//        elasticsearchTemplate.deleteIndex(index);
+//    }
+//
+//    @Override
+//    public void save(RtAnalog docBean) {
+//        elasticRepository.save(docBean);
+//    }
+//
+//    @Override
+//    public void saveAll(List<RtAnalog> list) {
+//        elasticRepository.saveAll(list);
+//    }
+//
+//    @Override
+//    public Iterator<RtAnalog> findAll() {
+//        return elasticRepository.findAll().iterator();
+//    }
+//
+//    @Override
+//    public List<RtAnalog> list(Date startTime,Date endTime,Integer userId) {
+//        List<Device> list = deviceMapper.list(userId, null, null, null, null, null);
+//        System.out.println(list.size());
+//        List<String> deviceCodes = list.stream().map(Device::getDeviceCode).collect(Collectors.toList());
+//        SearchQuery searchQuery = new NativeSearchQueryBuilder()
+//                .withQuery(boolQuery()
+//                        .must(termsQuery("deviceName", deviceCodes))
+//                        ).build();
+//        List<RtAnalog> rtAnalogs = elasticsearchTemplate.queryForList(searchQuery, RtAnalog.class);
+//        System.out.println(rtAnalogs.size());
+//        return rtAnalogs;
+//
+//    }
+//
+//    @Override
+//    public List<RtAnalog> page() {
+//        //构建查询
+//        SearchQuery query = new NativeSearchQueryBuilder()
+//                .withPageable(pageable)
+//                .build();
+//        Page<RtAnalog> searchResponse = elasticRepository.search(query);
+//        System.out.println(searchResponse.getTotalPages());
+//        return searchResponse.getContent();
+//    }
+//
+//
+//}

fiveep-service/src/main/java/com/bizmatics/service/job/PatrolTask.java

@@ -13,7 +13,6 @@ import com.bizmatics.service.PatrolInspectionRecordService;
 import com.bizmatics.service.PatrolInspectionRouteService;
 import com.bizmatics.service.PatrolInspectionSchemeService;
 import com.bizmatics.service.PatrolRecordRouteService;
-import com.bizmatics.service.es.RtAnalogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;