diff --git a/src/main/java/com/msdw/tms/config/SwaggerConfig.java b/src/main/java/com/msdw/tms/config/SwaggerConfig.java index 4a3fe69..ff3bc49 100644 --- a/src/main/java/com/msdw/tms/config/SwaggerConfig.java +++ b/src/main/java/com/msdw/tms/config/SwaggerConfig.java @@ -28,7 +28,7 @@ public class SwaggerConfig { } private ApiInfo apiInfo() { - return new ApiInfoBuilder().title("网站管理").description("网站管理") + return new ApiInfoBuilder().title("测评管理").description("测评管理") .version("1.0").build(); } diff --git a/src/main/java/com/msdw/tms/dao/UserDao.java b/src/main/java/com/msdw/tms/dao/UserDao.java index 47a096e..c615395 100644 --- a/src/main/java/com/msdw/tms/dao/UserDao.java +++ b/src/main/java/com/msdw/tms/dao/UserDao.java @@ -9,7 +9,4 @@ import org.apache.ibatis.annotations.Mapper; public interface UserDao extends BaseMapper { UserEntityVo getByUserId(UserEntity userEntity); - - - } diff --git a/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java index 95fa03f..da0d1a2 100644 --- a/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/EvaluationRecordServiceImpl.java @@ -155,20 +155,23 @@ public class EvaluationRecordServiceImpl extends ServiceImpl submitCurrentQuestionFuture = CompletableFuture.runAsync(() - -> submitCurrentQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer), executor); + submitCurrentQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer); +// CompletableFuture submitCurrentQuestionFuture = CompletableFuture.runAsync(() +// -> submitCurrentQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer), executor); //修改测评记录表当前题目顺序号 - CompletableFuture updateCurrentSortNoFuture = CompletableFuture.runAsync(() - -> updateCurrentSortNo(changeSortNo, evaluationRecordId), executor); + updateCurrentSortNo(changeSortNo, evaluationRecordId); +// CompletableFuture updateCurrentSortNoFuture = CompletableFuture.runAsync(() +// -> updateCurrentSortNo(changeSortNo, evaluationRecordId), executor); - CompletableFuture future = CompletableFuture.supplyAsync(() - -> this.getBaseMapper().selectVOByInfo(evaluationRecordId, changeSortNo), executor); +// CompletableFuture future = CompletableFuture.supplyAsync(() +// -> this.getBaseMapper().selectVOByInfo(evaluationRecordId, changeSortNo), executor); + EvaluationRecordVO evaluationRecordVO = this.getBaseMapper().selectVOByInfo(evaluationRecordId, changeSortNo); - CompletableFuture.allOf(submitCurrentQuestionFuture, updateCurrentSortNoFuture, future).get(); +// CompletableFuture.allOf(submitCurrentQuestionFuture, updateCurrentSortNoFuture, future).get(); - EvaluationRecordVO evaluationRecordVO = future.get(); +// EvaluationRecordVO evaluationRecordVO = future.get(); //查询下一题信息 evaluationRecordVO.setQuestionTypeName(getQuestionTypeName(evaluationRecordVO.getQuestionType())); return evaluationRecordVO; diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java index 8f262a1..ca6ac75 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.util.List; +import java.util.function.Function; import java.util.stream.Collectors; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 266eacf..3193dfa 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,14 +2,21 @@ spring: jackson: default-property-inclusion: non_null datasource: - url: jdbc:mysql://www.liuwanr.cn:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: super - password: huoran888 +# url: jdbc:mysql://www.liuwanr.cn:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +# username: super +# password: huoran888 + url: jdbc:mysql://localhost:3306/msdw_tms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: root + password: root driver-class-name: com.mysql.jdbc.Driver +# redis: +# host: www.liuwanr.cn +# port: 6379 +# password: huoran redis: - host: www.liuwanr.cn + host: 47.102.214.131 port: 6379 - password: huoran + password: mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 @@ -21,7 +28,7 @@ mybatis-plus: logic-delete-value: 0 logic-not-delete-value: 1 server: - port: 7000 + port: 8080 tms: thread: diff --git a/src/test/java/com/msdw/tms/IdWorker.java b/src/test/java/com/msdw/tms/IdWorker.java new file mode 100644 index 0000000..6c89e6f --- /dev/null +++ b/src/test/java/com/msdw/tms/IdWorker.java @@ -0,0 +1,146 @@ +package com.msdw.tms; + +/** + * @Author: gongsj. + * @Description: 自定义id生成器 + * @Date:Created in 2020/09/09 09:33. + * @Modified By: + */ +public class IdWorker { + + //因为二进制里第一个 bit 为如果是 1，那么都是负数，但是我们生成的 id 都是正数，所以第一个 bit 统一都是 0。 + + //机器ID 2进制5位 32位减掉1位 31个 + private long workerId; + //机房ID 2进制5位 32位减掉1位 31个 + private long datacenterId; + //代表一毫秒内生成的多个id的最新序号 12位 4096 -1 = 4095 个 + private long sequence; + //设置一个时间初始值 2^41 - 1 差不多可以用69年 + private long twepoch = 1585644268888L; + //5位的机器id + private long workerIdBits = 5L; + //5位的机房id + private long datacenterIdBits = 5L; + //每毫秒内产生的id数 2 的 12次方 + private long sequenceBits = 12L; + // 这个是二进制运算，就是5 bit最多只能有31个数字，也就是说机器id最多只能是32以内 + private long maxWorkerId = -1L ^ (-1L << workerIdBits); + // 这个是一个意思，就是5 bit最多只能有31个数字，机房id最多只能是32以内 + private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); + + private long workerIdShift = sequenceBits; + private long datacenterIdShift = sequenceBits + workerIdBits; + private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; + private long sequenceMask = -1L ^ (-1L << sequenceBits); + //记录产生时间毫秒数，判断是否是同1毫秒 + private long lastTimestamp = -1L; + + public long getWorkerId() { + return workerId; + } + + public long getDatacenterId() { + return datacenterId; + } + + public long getTimestamp() { + return System.currentTimeMillis(); + } + + + public IdWorker(long workerId, long datacenterId, long sequence) { + + // 检查机房id和机器id是否超过31 不能小于0 + if (workerId > maxWorkerId || workerId < 0) { + throw new IllegalArgumentException( + String.format("worker Id can't be greater than %d or less than 0", maxWorkerId)); + } + + if (datacenterId > maxDatacenterId || datacenterId < 0) { + + throw new IllegalArgumentException( + String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId)); + } + this.workerId = workerId; + this.datacenterId = datacenterId; + this.sequence = sequence; + } + + // 这个是核心方法，通过调用nextId()方法，让当前这台机器上的snowflake算法程序生成一个全局唯一的id + public synchronized long nextId() { + // 这儿就是获取当前时间戳，单位是毫秒 + long timestamp = timeGen(); + if (timestamp < lastTimestamp) { + + System.err.printf( + "clock is moving backwards. Rejecting requests until %d.", lastTimestamp); + throw new RuntimeException( + String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", + lastTimestamp - timestamp)); + } + + // 下面是说假设在同一个毫秒内，又发送了一个请求生成一个id + // 这个时候就得把seqence序号给递增1，最多就是4096 + if (lastTimestamp == timestamp) { + + // 这个意思是说一个毫秒内最多只能有4096个数字，无论你传递多少进来， + //这个位运算保证始终就是在4096这个范围内，避免你自己传递个sequence超过了4096这个范围 + sequence = (sequence + 1) & sequenceMask; + //当某一毫秒的时间，产生的id数 超过4095，系统会进入等待，直到下一毫秒，系统继续产生ID + if (sequence == 0) { + timestamp = tilNextMillis(lastTimestamp); + } + + } else { + sequence = 0; + } + // 这儿记录一下最近一次生成id的时间戳，单位是毫秒 + lastTimestamp = timestamp; + // 这儿就是最核心的二进制位运算操作，生成一个64bit的id + // 先将当前时间戳左移，放到41 bit那儿；将机房id左移放到5 bit那儿；将机器id左移放到5 bit那儿；将序号放最后12 bit + // 最后拼接起来成一个64 bit的二进制数字，转换成10进制就是个long型 + return ((timestamp - twepoch) << timestampLeftShift) | + (datacenterId << datacenterIdShift) | + (workerId << workerIdShift) | sequence; + } + + /** + * 当某一毫秒的时间，产生的id数 超过4095，系统会进入等待，直到下一毫秒，系统继续产生ID + * + * @param lastTimestamp + * @return + */ + private long tilNextMillis(long lastTimestamp) { + + long timestamp = timeGen(); + + while (timestamp <= lastTimestamp) { + timestamp = timeGen(); + } + return timestamp; + } + + //获取当前时间戳 + private long timeGen() { + return System.currentTimeMillis(); + } + + /** + * main 测试类 + * + * @param args + */ + public static void main(String[] args) { +// System.out.println(1&4596); +// System.out.println(2&4596); +// System.out.println(6&4596); +// System.out.println(6&4596); +// System.out.println(6&4596); +// System.out.println(6&4596); + IdWorker worker = new IdWorker(1, 1, 1); + for (int i = 0; i < 22; i++) { + System.out.println(worker.nextId()); + } + } +} \ No newline at end of file diff --git a/src/test/java/com/msdw/tms/SnowflakeIdUtils.java b/src/test/java/com/msdw/tms/SnowflakeIdUtils.java new file mode 100644 index 0000000..cf43898 --- /dev/null +++ b/src/test/java/com/msdw/tms/SnowflakeIdUtils.java @@ -0,0 +1,174 @@ +package com.msdw.tms; + +/** + * @Author：JCccc + * @Description： + * @Date： created in 15:31 2019/6/12 + */ +public class SnowflakeIdUtils { + // ==============================Fields=========================================== + /** + * 开始时间截 (2015-01-01) + */ + private final long twepoch = 1420041600000L; + + /** + * 机器id所占的位数 + */ + private final long workerIdBits = 5L; + + /** + * 数据标识id所占的位数 + */ + private final long datacenterIdBits = 5L; + + /** + * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) + */ + private final long maxWorkerId = -1L ^ (-1L << workerIdBits); + + /** + * 支持的最大数据标识id，结果是31 + */ + private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); + + /** + * 序列在id中占的位数 + */ + private final long sequenceBits = 12L; + + /** + * 机器ID向左移12位 + */ + private final long workerIdShift = sequenceBits; + + /** + * 数据标识id向左移17位(12+5) + */ + private final long datacenterIdShift = sequenceBits + workerIdBits; + + /** + * 时间截向左移22位(5+5+12) + */ + private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; + + /** + * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) + */ + private final long sequenceMask = -1L ^ (-1L << sequenceBits); + + /** + * 工作机器ID(0~31) + */ + private long workerId; + + /** + * 数据中心ID(0~31) + */ + private long datacenterId; + + /** + * 毫秒内序列(0~4095) + */ + private long sequence = 0L; + + /** + * 上次生成ID的时间截 + */ + private long lastTimestamp = -1L; + + //==============================Constructors===================================== + + /** + * 构造函数 + * + * @param workerId 工作ID (0~31) + * @param datacenterId 数据中心ID (0~31) + */ + public SnowflakeIdUtils(long workerId, long datacenterId) { + if (workerId > maxWorkerId || workerId < 0) { + throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId)); + } + if (datacenterId > maxDatacenterId || datacenterId < 0) { + throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId)); + } + this.workerId = workerId; + this.datacenterId = datacenterId; + } + + // ==============================Methods========================================== + + /** + * 获得下一个ID (该方法是线程安全的) + * + * @return SnowflakeId + */ + public synchronized long nextId() { + long timestamp = timeGen(); + + //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常 + if (timestamp < lastTimestamp) { + throw new RuntimeException( + String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp)); + } + + //如果是同一时间生成的，则进行毫秒内序列 + if (lastTimestamp == timestamp) { + sequence = (sequence + 1) & sequenceMask; + //毫秒内序列溢出 + if (sequence == 0) { + //阻塞到下一个毫秒,获得新的时间戳 + timestamp = tilNextMillis(lastTimestamp); + } + } + //时间戳改变，毫秒内序列重置 + else { + sequence = 0L; + } + + //上次生成ID的时间截 + lastTimestamp = timestamp; + + //移位并通过或运算拼到一起组成64位的ID + return ((timestamp - twepoch) << timestampLeftShift) // + | (datacenterId << datacenterIdShift) // + | (workerId << workerIdShift) // + | sequence; + } + + /** + * 阻塞到下一个毫秒，直到获得新的时间戳 + * + * @param lastTimestamp 上次生成ID的时间截 + * @return 当前时间戳 + */ + protected long tilNextMillis(long lastTimestamp) { + long timestamp = timeGen(); + while (timestamp <= lastTimestamp) { + timestamp = timeGen(); + } + return timestamp; + } + + /** + * 返回以毫秒为单位的当前时间 + * + * @return 当前时间(毫秒) + */ + protected long timeGen() { + return System.currentTimeMillis(); + } + + //==============================Test============================================= + + /** + * 测试 + */ + public static void main(String[] args) { + SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1); +// System.out.println(idWorker.nextId()); + for (int i = 0; i < 20; i++) { + System.out.println(idWorker.nextId()); + } + } +} \ No newline at end of file diff --git a/src/test/java/com/msdw/tms/TmsApplicationTests.java b/src/test/java/com/msdw/tms/TmsApplicationTests.java index cc8570c..96873a1 100644 --- a/src/test/java/com/msdw/tms/TmsApplicationTests.java +++ b/src/test/java/com/msdw/tms/TmsApplicationTests.java @@ -1,7 +1,12 @@ package com.msdw.tms; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.msdw.tms.entity.request.QuestionsImportRequest; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -20,6 +25,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import java.util.stream.Collectors; @SpringBootTest @@ -445,4 +451,67 @@ class TmsApplicationTests { } + @Test + public void test100() { + + List list = new ArrayList<>(); + list.add(new UserTest(1, "张三", "男", "深圳", "123456")); + list.add(new UserTest(2, "李四", "男", "深圳", "123456")); + list.add(new UserTest(3, "张三", "男", "杭州", "123456")); + list.add(new UserTest(4, "张三", "男", "深圳", "123456")); + list.add(new UserTest(5, "王五", "男", "深圳", "123456")); + list.add(new UserTest(6, "张三", "男", "深圳", "123456")); + list.add(new UserTest(7, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(8, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(9, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(10, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(11, "赵六", "女", "深圳", "123456")); + list.add(new UserTest(12, "张三", "男", "菲律宾", "123456")); + list.add(new UserTest(13, "张三", "男", "深圳", "123456")); + list.add(new UserTest(14, "张三", "男", "马来西亚", "123456")); + + Page page = new Page<>(1, 10); + +// page.setTotal(list.size()); +// page.setRecords(list); + + IPage convert = page.convert(new Function() { + @Override + public UserTest apply(Object o) { + + return new UserTest(1, "张三", "男", "深圳", "123456"); + } + }); + + System.out.println(convert); + + + } + + @Data + @NoArgsConstructor + @AllArgsConstructor + class T { + boolean b; + String s; + } + + @Test + public void t101() { + String[] s = new String[]{"5", "-2", "4", "C", "D", "9", "+", "+"}; + + List list = new ArrayList<>(); + + for (int i = 0; i < s.length; i++) { + + list.add(new T(true, s[i])); + + if (s[i].equalsIgnoreCase("c")) { + + } + } + + System.out.println(); + } + }