Skip to content

T
training-project
Commit 3fa8e1ed by 阳浪
Options

配置信息

parent 2ecd36c5
Showing with 10 additions and 256 deletions
cloud-training-project-service/src/main/java/com/yizhi/training/application/TrainingProjectApplication.java
...@@ -4,6 +4,7 @@ import com.yizhi.util.application.constant.QueueConstant; ...@@ -4,6 +4,7 @@ import com.yizhi.util.application.constant.QueueConstant;
import org.springframework.amqp.core.Queue; import org.springframework.amqp.core.Queue;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
...@@ -13,7 +14,7 @@ import org.springframework.context.annotation.ComponentScan; ...@@ -13,7 +14,7 @@ import org.springframework.context.annotation.ComponentScan;
* @Author: shengchenglong * @Author: shengchenglong
* @Date: 2018/3/23 22:01 * @Date: 2018/3/23 22:01
*/ */
@SpringBootApplication @SpringBootApplication(exclude = {RabbitAutoConfiguration.class})
@EnableDiscoveryClient @EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yizhi"}) @EnableFeignClients(basePackages = {"com.yizhi"})
@ComponentScan(basePackages = {"com.yizhi"}) @ComponentScan(basePackages = {"com.yizhi"})
......
cloud-training-project-service/src/main/java/com/yizhi/training/application/event/TpEventHandler.java
...@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils; ...@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -65,8 +64,8 @@ public class TpEventHandler { ...@@ -65,8 +64,8 @@ public class TpEventHandler {
private TpStudentProjectRecordMapper tpStudentProjectRecordMapper; private TpStudentProjectRecordMapper tpStudentProjectRecordMapper;
@Autowired @Autowired
private PointRedisFeignClients pointRedisFeignClients; private PointRedisFeignClients pointRedisFeignClients;
@Autowired /*@Autowired
private AmqpTemplate amqpTemplate; private AmqpTemplate amqpTemplate;*/
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@Autowired @Autowired
...@@ -389,7 +388,7 @@ public class TpEventHandler { ...@@ -389,7 +388,7 @@ public class TpEventHandler {
String sitePointId = pointRedisFeignClients.addPointRedis(pointParamVO); String sitePointId = pointRedisFeignClients.addPointRedis(pointParamVO);
// 发送积分 // 发送积分
if (StringUtils.isNotBlank(sitePointId)) { if (StringUtils.isNotBlank(sitePointId)) {
amqpTemplate.convertAndSend("trainingProject", sitePointId); //amqpTemplate.convertAndSend("trainingProject", sitePointId);
} }
} }
......
cloud-training-project-service/src/main/resources/bootstrap.properties
server.port=35000 server.port=35001
spring.application.name=trainingProject spring.application.name=trainingProject
ACTIVE=${spring.profiles.active} ACTIVE=${spring.profiles.active}
spring.profiles.active=dev spring.profiles.active=prod
# nacos # nacos
spring.cloud.nacos.config.shared-dataids=common-${spring.profiles.active}.properties spring.cloud.nacos.config.shared-dataids=common-${spring.profiles.active}.properties
spring.cloud.nacos.config.namespace=${spring.profiles.active} spring.cloud.nacos.config.namespace=${spring.profiles.active}
spring.cloud.nacos.config.prefix=${spring.application.name} spring.cloud.nacos.config.prefix=${spring.application.name}
spring.cloud.nacos.config.file-extension=properties spring.cloud.nacos.config.file-extension=properties
spring.cloud.nacos.config.server-addr=192.168.1.22:3333,192.168.1.22:4444,192.168.1.22:5555 spring.cloud.nacos.config.server-addr=10.23.1.183:8848
#spring.cloud.nacos.config.server-addr=192.168.1.13:3333,192.168.1.24:4444,192.168.1.38:5555 #spring.cloud.nacos.config.server-addr=192.168.1.13:3333,192.168.1.24:4444,192.168.1.38:5555
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
cloud-training-project-service/src/test/java/com/fulan/application/TrainingProjectVoTest.java deleted 100644 → 0
package com.fulan.application;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.core.application.cache.RedisCache;
import com.yizhi.core.application.context.RequestContext;
import com.yizhi.core.application.event.EventWrapper;
import com.yizhi.training.application.domain.TpAuthorizationRange;
import com.yizhi.training.application.domain.TrainingProject;
import com.yizhi.training.application.event.TpEventHandler;
import com.yizhi.training.application.job.Process2PlatTrainingProject;
import com.yizhi.training.application.job.ProcessFinishedRecordCacheJob;
import com.yizhi.training.application.mapper.TpAuthorizationRangeMapper;
import com.yizhi.training.application.mapper.TpCommentMapper;
import com.yizhi.training.application.mapper.TpStudentEnrollPassedMapper;
import com.yizhi.training.application.mapper.TrainingProjectMapper;
import com.yizhi.training.application.model.BaseModel;
import com.yizhi.training.application.service.ITpPlanService;
import com.yizhi.training.application.service.ITrainingProjectService;
import com.yizhi.training.application.vo.api.TrainingProjectParamVo;
import com.yizhi.training.application.vo.manage.TrainingProjectStepThreeVo;
import com.yizhi.util.application.event.TrainingProjectEvent;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.test.context.junit4.SpringRunner;
import redis.clients.jedis.util.SafeEncoder;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.text.ParseException;
import java.util.*;
/**
* @Author: shengchenglong
* @Date: 2018/3/28 16:01
*/
@SpringBootTest
@RunWith(SpringRunner.class)
public class TrainingProjectVoTest {
@Autowired
private TrainingProjectMapper trainingProjectMapper;
@Autowired
private ITrainingProjectService trainingProjectService;
@Autowired
private TpAuthorizationRangeMapper tpAuthorizationRangeMapper;
@Autowired
private TpStudentEnrollPassedMapper tpStudentEnrollPassedMapper;
@Autowired
private ITpPlanService tpPlanService;
@Autowired
private TpCommentMapper tpCommentMapper;
@Autowired
private Process2PlatTrainingProject process2PlatTrainingProject;
@Autowired
private ProcessFinishedRecordCacheJob processFinishedRecordCacheJob;
@Autowired
private RedisConnectionFactory redisConnectionFactory;
@Autowired
private TpEventHandler tpEventHandler;
@Autowired
private RedisCache redisCache;
@Test
public void joinSchema() throws IOException {
BufferedReader br = new BufferedReader(new FileReader(new File("/Users/shengchenglong/Documents/IdeaProjects/wmy_workspace/training-project/cloud-training-project/src/test/java/com/fulan/application/relationIds")));
List<Long> relationIds = new ArrayList<>();
String s = null;
while ((s = br.readLine()) != null) {
relationIds.add(Long.valueOf(s));
}
Long start = System.currentTimeMillis();
// List<TrainingProjectVo> list = trainingProjectMapper.apiPageList(1111111111111111111L, 551893122703726319L, relationIds, new Date(), new RowBounds(0, 50));
System.out.println("用时：" + (System.currentTimeMillis() - start));
// for (TrainingProjectVo tp : list) {
// System.out.println(tp.toString());
// }
}
@Test
public void sepratorQuery() {
}
@Test
public void test1() throws IOException {
// trainingProjectMapper.apiPageList(0L, 0L, new Date());
BaseModel<TrainingProjectParamVo> model = new BaseModel<>();
TrainingProjectParamVo vo = new TrainingProjectParamVo();
vo.setNow(new Date());
vo.setPageNo(1);
vo.setPageSize(10);
model.setObj(vo);
RequestContext context = new RequestContext();
context.setAccountId(0L);
context.setOrgId(0L);
context.setSiteId(0L);
// model.setContext(context);
trainingProjectService.apiPageList(model);
}
@Test
public void test2() {
BaseModel model = new BaseModel();
RequestContext context = new RequestContext();
context.setAccountId(0L);
context.setOrgId(0L);
context.setSiteId(0L);
Page<TrainingProject> page = new Page(1, 10);
// model.setContext(context);
model.setObj(page);
page = trainingProjectService.apiPageListNoCondition(model);
System.out.println(page);
}
@Test
public void test3() throws Exception {
Set<Long> tpIds = new HashSet<>();
BufferedReader br = new BufferedReader(new FileReader(new File("/Users/shengchenglong/Documents/IdeaProjects/wmy_workspace/training-project/cloud-training-project/src/test/java/com/fulan/application/relationIds")));
List<Long> relationIds = new ArrayList<>();
String s = null;
while ((s = br.readLine()) != null) {
relationIds.add(Long.valueOf(s));
}
Long start = System.currentTimeMillis();
// 可见范围内
List<Long> visibleRangeIds = tpAuthorizationRangeMapper.selectBizIdByRelationId(relationIds, 0L);
System.out.println("用时：" + (System.currentTimeMillis() - start));
// 报名通过
List<Long> passEnrollIds = tpStudentEnrollPassedMapper.selectTpIds(551893122703726319L);
System.out.println("用时：" + (System.currentTimeMillis() - start));
visibleRangeIds.addAll(passEnrollIds);
// List<TrainingProjectVo> result = trainingProjectMapper.apiPageList2(visibleRangeIds, new Date(), 1111111111111111111L, new RowBounds(0, 50));
System.out.println("用时：" + (System.currentTimeMillis() - start));
}
@Test
public void test4() throws ParseException {
List<TpAuthorizationRange> list = new ArrayList<>();
TpAuthorizationRange range = new TpAuthorizationRange();
range.setBizId(111L);
range.setType(1);
range.setRelationId(111L);
range.setId(111L);
list.add(range);
tpAuthorizationRangeMapper.batchInsert(list);
}
@Test
public void testtt() {
RedisConnection redisConnection = redisConnectionFactory.getConnection();
byte[] bytes = redisConnection.hGet(SafeEncoder.encode("COMPANY_STRUCTURE"), SafeEncoder.encode("91"));
System.out.println(bytes);
}
@Test
public void saveStepThreeTest() {
BaseModel<TrainingProjectStepThreeVo> model = new BaseModel<>();
}
@Test
public void getTpDetailTest() throws Exception {
// trainingProjectService.getTpDetail(1012177669667659776L, 1314L, new Date(), false);
}
@Test
public void eventTest() throws Exception {
// id=1026397573038694400, type=0, accountId=1314, now=Tue Aug 07 10:36:04 CST 2018,
// examScore=null, trainingProjectId=null, courseSeconds=0, courseFinished=true, siteId=1314
EventWrapper ew = new EventWrapper(1026397573038694400L, TrainingProjectEvent.getInstanceCourse(1026397573038694400L, 1314L, new Date(), Long.valueOf(0), true, 1314L));
tpEventHandler.handle(ew);
}
@Test
public void getTpDetail() throws ParseException {
// trainingProjectService.getTpDetail(1045878214633119744L, 1314L, new Date(), false);
// tpPlanService.viewDetail(1044426182201925632L);
}
@Test
public void testt() {
// process2PlatTrainingProject.startProcess(null);
processFinishedRecordCacheJob.processActivityFinished(null);
processFinishedRecordCacheJob.processActivityUnfinished(null);
processFinishedRecordCacheJob.processClicked(null);
processFinishedRecordCacheJob.processPlan(null);
processFinishedRecordCacheJob.processTrainingProject(null);
}
/* @Test
public void redisTest() {
// redisCache.getRedisTemplate().opsForZSet().add("queue:task:scheduler:trainingProject", "method1", System.nanoTime());
// Long score = redisCache.getRedisTemplate().opsForZSet().rank("queue:task:scheduler:trainingProject", "method1");
Long size = null;
while ((size = redisCache.getRedisTemplate().opsForZSet().size("queue:task:scheduler:trainingProject")) > 0) {
System.out.println(size);
Set set = redisCache.getRedisTemplate().opsForZSet().range("queue:task:scheduler:trainingProject", 0L, 0L);
System.out.println(set);
redisCache.getRedisTemplate().opsForZSet().removeRange("queue:task:scheduler:trainingProject", 0L, 0L);
}
}*/
@Test
public void logicDelTest() {
TpAuthorizationRange range = new TpAuthorizationRange();
range.setName("hahahahahahah");
range.delete(new EntityWrapper(range));
}
}
pom.xml
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<repositories> <repositories>
<repository> <repository>
<id>learning-data-group</id> <id>hqzhdj-data-group</id>
<url>http://192.168.0.15:8081/repository/learning-data-group/</url> <url>http://192.168.0.15:8081/repository/hqzhdj-data-group/</url>
<releases> <releases>
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
......
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